upgrade to vert.x 2.1.2

isaiah · Jul 24, 2014 · 79a7741 · 79a7741
1 parent 206e880
commit 79a7741
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 6 deletions.
diff --git a/Rakefile b/Rakefile
@@ -86,7 +86,7 @@ desc "Compile the extension, need jdk7 because vertx relies on it"
 task :compile => [DEST_PATH, "#{DEST_PATH}/META-INF"] do |t|
   ant.javac :srcdir => "java", :destdir => t.prerequisites.first,
     :source => "1.7", :target => "1.7", :debug => true, :includeantruntime => false,
-    :classpath => "${java.class.path}:${sun.boot.class.path}:jars/vertx-core-2.1.1.jar:jars/netty-all-4.0.20.Final.jar:jars/jackson-core-2.2.2.jar:jars/jackson-databind-2.2.2.jar:jars/jackson-annotations-2.2.2.jar:jars/hazelcast-3.2.3.jar:jars/vertx-platform-2.1.1.jar:jars/vertx-hazelcast-2.1.1.jar"
+    :classpath => "${java.class.path}:${sun.boot.class.path}:jars/vertx-core-2.1.2.jar:jars/netty-all-4.0.20.Final.jar:jars/jackson-core-2.2.2.jar:jars/jackson-databind-2.2.2.jar:jars/jackson-annotations-2.2.2.jar:jars/hazelcast-3.2.3.jar:jars/vertx-platform-2.1.2.jar:jars/vertx-hazelcast-2.1.2.jar"
 end
 
 desc "Copy META-INF"

diff --git a/jars/vertx-core-2.1.1.jar b/jars/vertx-core-2.1.1.jar
diff --git a/jars/vertx-core-2.1.2.jar b/jars/vertx-core-2.1.2.jar
diff --git a/jars/vertx-hazelcast-2.1.1.jar → jars/vertx-hazelcast-2.1.2.jar b/jars/vertx-hazelcast-2.1.1.jar → jars/vertx-hazelcast-2.1.2.jar
diff --git a/jars/vertx-platform-2.1.1.jar → jars/vertx-platform-2.1.2.jar b/jars/vertx-platform-2.1.1.jar → jars/vertx-platform-2.1.2.jar
diff --git a/lib/jubilee.rb b/lib/jubilee.rb
@@ -2,9 +2,9 @@
 require File.join(File.dirname(__FILE__), "../jars/jackson-databind-2.2.2.jar")
 require File.join(File.dirname(__FILE__), "../jars/jackson-annotations-2.2.2.jar")
 require File.join(File.dirname(__FILE__), "../jars/hazelcast-3.2.3.jar")
-require File.join(File.dirname(__FILE__), "../jars/vertx-core-2.1.1.jar")
-require File.join(File.dirname(__FILE__), "../jars/vertx-hazelcast-2.1.1.jar")
-require File.join(File.dirname(__FILE__), "../jars/vertx-platform-2.1.1.jar")
+require File.join(File.dirname(__FILE__), "../jars/vertx-core-2.1.2.jar")
+require File.join(File.dirname(__FILE__), "../jars/vertx-hazelcast-2.1.2.jar")
+require File.join(File.dirname(__FILE__), "../jars/vertx-platform-2.1.2.jar")
 require File.join(File.dirname(__FILE__), "../jars/netty-all-4.0.20.Final.jar")
 
 require 'jubilee/jubilee.jar'

diff --git a/lib/jubilee/cli.rb b/lib/jubilee/cli.rb
@@ -129,7 +129,7 @@ def setup_options
         end
 
         o.on "-v", "--version", "Print the version information" do
-          puts "jubilee version #{Jubilee::Version::STRING} on Vert.x 2.1.1"
+          puts "jubilee version #{Jubilee::Version::STRING} on Vert.x 2.1.2"
           exit 0
         end
       end

diff --git a/test/jubilee/test_upload.rb b/test/jubilee/test_upload.rb
@@ -128,7 +128,9 @@ def test_put_excessive_overwrite_closed
     assert_raises(Errno::ECONNRESET, Errno::EPIPE) do
       16384.times { sock.syswrite(buf) }
     end
-    sock.gets
+    assert_raises(Errno::ECONNRESET) do
+      sock.gets
+    end
     sock.close
   end