From 7dcf8d7adcce3b9691b84454ecda21185eca8183 Mon Sep 17 00:00:00 2001 From: Tim Yates Date: Thu, 18 Jul 2013 09:56:05 +0100 Subject: [PATCH] Up to using vertx-2.0.0-final Had to remove more of the non-functional groovy rxjava test --- gradle.properties | 9 ++++----- src/test/resources/integration_tests/groovy/rx.groovy | 2 ++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index 050c3eb..18b36d6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,7 +14,7 @@ testtimeout=300 pullInDeps=true # The version of Groovy language to compile against (if you are using Groovy compiled verticles or VertxTests) -groovyLangModVersion=2.0.0-CR2 +groovyLangModVersion=2.0.0-final # The version of Groovy to use (if you are using Groovy) groovyVersion=2.1.5 @@ -23,11 +23,11 @@ groovyVersion=2.1.5 gradleVersion=1.6 # The version of Vert.x -vertxVersion=2.0.0-CR3 +vertxVersion=2.0.0-final # The version of Vert.x test tools -toolsVersion=2.0.0-CR2 -testFrameworkVersion=2.0.0-CR1 +toolsVersion=2.0.0-final +testFrameworkVersion=2.0.0-final # The version of JUnit junitVersion=4.10 @@ -38,4 +38,3 @@ hsqldbVersion=2.2.9 metricsVersion=3.0.0-BETA1 rxVersion=1.0.0-beta1-SNAPSHOT -groovyVersion=2.1.6 \ No newline at end of file diff --git a/src/test/resources/integration_tests/groovy/rx.groovy b/src/test/resources/integration_tests/groovy/rx.groovy index 3bd53bd..9867546 100644 --- a/src/test/resources/integration_tests/groovy/rx.groovy +++ b/src/test/resources/integration_tests/groovy/rx.groovy @@ -25,7 +25,9 @@ def config = [ address: 'test.persistor', VertxTests.initialize( this ) +/* rxEventBus = new RxEventBus( vertx.eventBus ) +*/ container.deployModule( System.getProperty("vertx.modulename"), config, 1 ) { asyncResult -> if( asyncResult.succeeded() ) {