update build dependencies (rsocket#382)

qweek · yschimke · commit b40acf7bf2f5 · 2017-09-13T08:03:11.000+01:00
* update build dependencies

plugins: com.jfrog.artifactory 4.5.2
dependencies: jsr305 3.0.2, aeron 1.4.1, spectator 0.57.1, hdrHistogram 2.1.9, jackson 2.9.1, commons-lang3 3.6, airline 0.8, rxjava 2.1.3, mockito 2.10.0, jmh 1.19
diff --git a/build.gradle b/build.gradle
@@ -15,9 +15,10 @@
  */
 
 plugins {
-    id "com.jfrog.bintray" version "1.7.3"
+    id 'com.jfrog.bintray' version '1.7.3'
     id 'com.github.sherter.google-java-format' version '0.6'
-    id "com.jfrog.artifactory" version "4.4.18"
+    id 'com.jfrog.artifactory' version '4.5.2'
+    id 'me.champeau.gradle.jmh' version '0.4.4'
 }
 
 repositories {
@@ -41,6 +42,32 @@ subprojects {
         targetCompatibility = 1.8
     }
 
+    ext {
+        // common
+        jsr305Version = '3.0.2'
+        reactorVersion = '3.1.0.RC1'
+        nettyVersion = '4.1.15.Final'
+        reactiveStreamsVersion = '1.0.1'
+        slf4jVersion = '1.7.25'
+        // aeron
+        aeronVersion = '1.4.1'
+        // netty
+        reactorNettyVersion = '0.7.0.M2'
+        // spectator
+        spectatorVersion = '0.57.1'
+        hdrHistogramVersion = '2.1.9'
+        // tck-drivers
+        jacksonVersion = '2.9.1'
+        commonsLang3Version = '3.6'
+        airlineVersion = '0.8'
+        rxjavaVersion = '2.1.3'
+        // test
+        junitVersion = '4.12'
+        hamcrestVersion = '1.3'
+        mockitoVersion = '2.10.0'
+        jmhVersion = '1.19'
+    }
+
     // custom tasks for creating source/javadoc jars
     task sourcesJar(type: Jar, dependsOn: classes) {
         classifier = 'sources'
@@ -65,17 +92,17 @@ subprojects {
     }
 
     dependencies {
-        compile 'io.projectreactor:reactor-core:3.1.0.RC1'
-        compile 'io.netty:netty-buffer:4.1.15.Final'
-        compile 'org.reactivestreams:reactive-streams:1.0.1'
-        compile 'org.slf4j:slf4j-api:1.7.25'
-        compile 'com.google.code.findbugs:jsr305:3.0.0'
-
-        testCompile 'junit:junit:4.12'
-        testCompile 'org.mockito:mockito-core:1.10.19'
-        testCompile 'org.hamcrest:hamcrest-library:1.3'
-        testCompile 'org.slf4j:slf4j-log4j12:1.7.25'
-        testCompile 'io.projectreactor:reactor-test:3.1.0.RC1'
+        compile "io.projectreactor:reactor-core:$reactorVersion"
+        compile "io.netty:netty-buffer:$nettyVersion"
+        compile "org.reactivestreams:reactive-streams:$reactiveStreamsVersion"
+        compile "org.slf4j:slf4j-api:$slf4jVersion"
+        compile "com.google.code.findbugs:jsr305:$jsr305Version"
+
+        testCompile "junit:junit:$junitVersion"
+        testCompile "org.mockito:mockito-core:$mockitoVersion"
+        testCompile "org.hamcrest:hamcrest-library:$hamcrestVersion"
+        testCompile "org.slf4j:slf4j-log4j12:$slf4jVersion"
+        testCompile "io.projectreactor:reactor-test:$reactorVersion"
     }
 
     publishing {
@@ -141,8 +168,8 @@ subprojects {
                 def sonatypeUsername = project.property('sonatypeUsername')
                 def sonatypePassword = project.property('sonatypePassword')
                 version {
-                    name = "v${project.getVersion()}"
-                    vcsTag = "v${project.getVersion()}"
+                    name = "v${project.version}"
+                    vcsTag = "v${project.version}"
                     gpg {
                         sign = true
                     }
diff --git a/rsocket-core/build.gradle b/rsocket-core/build.gradle
@@ -14,18 +14,16 @@
  * limitations under the License.
  */
 
-plugins {
-    id "me.champeau.gradle.jmh" version "0.4.4"
-}
+apply plugin: 'me.champeau.gradle.jmh'
 
 jmh {
-    jmhVersion = '1.15'
+    jmhVersion = "$jmhVersion"
     profilers = ['gc']
     zip64 = true
-    duplicateClassesStrategy = 'warn'
+    duplicateClassesStrategy = DuplicatesStrategy.WARN
 }
 
 dependencies {
-    jmh 'org.openjdk.jmh:jmh-core:1.15'
-    jmh 'org.openjdk.jmh:jmh-generator-annprocess:1.15'
+    jmh "org.openjdk.jmh:jmh-core:$jmhVersion"
+    jmh "org.openjdk.jmh:jmh-generator-annprocess:$jmhVersion"
 }
diff --git a/rsocket-core/src/test/java/io/rsocket/RSocketTest.java b/rsocket-core/src/test/java/io/rsocket/RSocketTest.java
@@ -21,7 +21,7 @@
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.verify;
 
-import io.rsocket.exceptions.InvalidRequestException;
+import io.rsocket.exceptions.ApplicationException;
 import io.rsocket.test.util.LocalDuplexConnection;
 import io.rsocket.test.util.TestSubscriber;
 import io.rsocket.util.PayloadImpl;
@@ -63,7 +63,7 @@ public Mono<Payload> requestResponse(Payload payload) {
         });
     Subscriber<Payload> subscriber = TestSubscriber.create();
     rule.crs.requestResponse(PayloadImpl.EMPTY).subscribe(subscriber);
-    verify(subscriber).onError(any(InvalidRequestException.class));
+    verify(subscriber).onError(any(ApplicationException.class));
     rule.assertNoErrors();
   }
 
diff --git a/rsocket-core/src/test/java/io/rsocket/fragmentation/FragmentationDuplexConnectionTest.java b/rsocket-core/src/test/java/io/rsocket/fragmentation/FragmentationDuplexConnectionTest.java
@@ -43,7 +43,7 @@ public void testSendOneWithFragmentation() {
     when(mockConnection.send(any()))
         .then(
             invocation -> {
-              Publisher<Frame> frames = invocation.getArgumentAt(0, Publisher.class);
+              Publisher<Frame> frames = invocation.getArgument(0);
 
               StepVerifier.create(frames).expectNextCount(16).verifyComplete();
 
@@ -87,7 +87,7 @@ public void testShouldFragmentMultiple() {
     when(mockConnection.send(any()))
         .then(
             invocation -> {
-              Publisher<Frame> frames = invocation.getArgumentAt(0, Publisher.class);
+              Publisher<Frame> frames = invocation.getArgument(0);
 
               StepVerifier.create(frames).expectNextCount(16).verifyComplete();
 
diff --git a/rsocket-core/src/test/java/io/rsocket/util/ExceptionUtilTest.java b/rsocket-core/src/test/java/io/rsocket/util/ExceptionUtilTest.java
@@ -12,8 +12,9 @@ public class ExceptionUtilTest {
   public void testNoStacktrace() {
     RuntimeException ex = noStacktrace(new RuntimeException("RE"));
     assertEquals(
-        "java.lang.RuntimeException: RE\n"
-            + "\tat java.lang.RuntimeException.<init>(Unknown Source)\n",
+        String.format(
+            "java.lang.RuntimeException: RE%n"
+                + "\tat java.lang.RuntimeException.<init>(Unknown Source)%n"),
         stacktraceString(ex));
   }
 
diff --git a/rsocket-examples/build.gradle b/rsocket-examples/build.gradle
@@ -14,18 +14,16 @@
  * limitations under the License.
  */
 
-plugins {
-    id "me.champeau.gradle.jmh" version "0.4.4"
-}
+apply plugin: 'me.champeau.gradle.jmh'
 
 jmh {
-    jmhVersion = '1.15'
-    jvmArgs = '-XX:+UseG1GC -Xmx4g -Xms4g -XX:+UnlockCommercialFeatures -XX:+FlightRecorder'
+    jmhVersion = "$jmhVersion"
+    jvmArgs = ['-XX:+UseG1GC', '-Xmx4g', '-Xms4g', '-XX:+UnlockCommercialFeatures', '-XX:+FlightRecorder']
     profilers = ['gc']
     zip64 = true
     warmupBatchSize = 10
     iterations = 500
-    duplicateClassesStrategy = 'warn'
+    duplicateClassesStrategy = DuplicatesStrategy.WARN
 }
 
 dependencies {
@@ -34,7 +32,7 @@ dependencies {
     compile project(':rsocket-transport-netty')
     compile project(':rsocket-transport-local')
 
-    jmh group: 'org.openjdk.jmh', name: 'jmh-generator-annprocess', version: '1.15'
+    jmh "org.openjdk.jmh:jmh-generator-annprocess:$jmhVersion"
 
     testCompile project(':rsocket-test')
 }
diff --git a/rsocket-spectator/build.gradle b/rsocket-spectator/build.gradle
@@ -16,8 +16,8 @@
 
 dependencies {
     compile project(':rsocket-core')
-    compile 'com.netflix.spectator:spectator-api:0.45.0'
-    compile 'org.hdrhistogram:HdrHistogram:latest.release'
+    compile "com.netflix.spectator:spectator-api:$spectatorVersion"
+    compile "org.hdrhistogram:HdrHistogram:$hdrHistogramVersion"
 
     testCompile project(':rsocket-test')
 }
diff --git a/rsocket-tck-drivers/build.gradle b/rsocket-tck-drivers/build.gradle
@@ -33,9 +33,9 @@ dependencies {
     compile project(':rsocket-transport-netty')
     compile project(':rsocket-transport-local')
     compile project(':rsocket-test')
-    compile 'com.fasterxml.jackson.core:jackson-core:2.8.8'
-    compile 'com.fasterxml.jackson.core:jackson-databind:2.8.8'
-    compile 'org.apache.commons:commons-lang3:3.4'
-    compile 'io.airlift:airline:0.7'
-    compile 'io.reactivex.rxjava2:rxjava:2.1.0'
+    compile "com.fasterxml.jackson.core:jackson-core:$jacksonVersion"
+    compile "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion"
+    compile "org.apache.commons:commons-lang3:$commonsLang3Version"
+    compile "io.airlift:airline:$airlineVersion"
+    compile "io.reactivex.rxjava2:rxjava:$rxjavaVersion"
 }
diff --git a/rsocket-test/build.gradle b/rsocket-test/build.gradle
@@ -16,9 +16,9 @@
 
 dependencies {
     compile project(':rsocket-core')
-    compile 'junit:junit:4.12'
-    compile 'org.mockito:mockito-core:1.10.19'
-    compile 'org.hamcrest:hamcrest-library:1.3'
-    compile 'org.hdrhistogram:HdrHistogram:latest.release'
-    compile "io.projectreactor:reactor-test:3.1.0.M3"
+    compile "junit:junit:$junitVersion"
+    compile "org.mockito:mockito-core:$mockitoVersion"
+    compile "org.hamcrest:hamcrest-library:$hamcrestVersion"
+    compile "org.hdrhistogram:HdrHistogram:$hdrHistogramVersion"
+    compile "io.projectreactor:reactor-test:$reactorVersion"
 }
diff --git a/rsocket-transport-aeron/build.gradle b/rsocket-transport-aeron/build.gradle
@@ -16,7 +16,7 @@
 
 dependencies {
     compile project(':rsocket-core')
-    compile 'io.aeron:aeron-all:1.0.1'
+    compile "io.aeron:aeron-all:$aeronVersion"
 
     testCompile project(':rsocket-test')
 }
diff --git a/rsocket-transport-aeron/src/test/java/io/rsocket/aeron/AeronPongServer.java b/rsocket-transport-aeron/src/test/java/io/rsocket/aeron/AeronPongServer.java
@@ -31,7 +31,7 @@ public final class AeronPongServer {
     final io.aeron.driver.MediaDriver.Context ctx =
         new io.aeron.driver.MediaDriver.Context()
             .threadingMode(ThreadingMode.SHARED_NETWORK)
-            .dirsDeleteOnStart(true);
+            .dirDeleteOnStart(true);
     MediaDriver.launch(ctx);
   }
 
diff --git a/rsocket-transport-aeron/src/test/java/io/rsocket/aeron/MediaDriverHolder.java b/rsocket-transport-aeron/src/test/java/io/rsocket/aeron/MediaDriverHolder.java
@@ -28,7 +28,7 @@ public class MediaDriverHolder {
     final io.aeron.driver.MediaDriver.Context ctx =
         new io.aeron.driver.MediaDriver.Context()
             .threadingMode(ThreadingMode.SHARED)
-            .dirsDeleteOnStart(true)
+            .dirDeleteOnStart(true)
             .conductorIdleStrategy(new SleepingIdleStrategy(TimeUnit.MILLISECONDS.toNanos(1)))
             .receiverIdleStrategy(new SleepingIdleStrategy(TimeUnit.MILLISECONDS.toNanos(1)))
             .senderIdleStrategy(new SleepingIdleStrategy(TimeUnit.MILLISECONDS.toNanos(1)));
diff --git a/rsocket-transport-netty/build.gradle b/rsocket-transport-netty/build.gradle
@@ -16,11 +16,11 @@
 
 dependencies {
     compile project(':rsocket-core')
-    compile 'io.projectreactor.ipc:reactor-netty:0.7.0.M2'
-    compile "io.netty:netty-handler:4.1.15.Final"
-    compile "io.netty:netty-handler-proxy:4.1.15.Final"
-    compile "io.netty:netty-codec-http:4.1.15.Final"
-    compile "io.netty:netty-transport-native-epoll:4.1.15.Final"
+    compile "io.projectreactor.ipc:reactor-netty:$reactorNettyVersion"
+    compile "io.netty:netty-handler:$nettyVersion"
+    compile "io.netty:netty-handler-proxy:$nettyVersion"
+    compile "io.netty:netty-codec-http:$nettyVersion"
+    compile "io.netty:netty-transport-native-epoll:$nettyVersion"
 
     testCompile project(':rsocket-test')
 }

Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,8 @@`
`16`	`16`
`17`	`17`	`dependencies {`
`18`	`18`	`compile project(':rsocket-core')`
`19`		`- compile 'com.netflix.spectator:spectator-api:0.45.0'`
`20`		`- compile 'org.hdrhistogram:HdrHistogram:latest.release'`
	`19`	`+ compile "com.netflix.spectator:spectator-api:$spectatorVersion"`
	`20`	`+ compile "org.hdrhistogram:HdrHistogram:$hdrHistogramVersion"`
`21`	`21`
`22`	`22`	`testCompile project(':rsocket-test')`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`
`17`	`17`	`dependencies {`
`18`	`18`	`compile project(':rsocket-core')`
`19`		`- compile 'io.aeron:aeron-all:1.0.1'`
	`19`	`+ compile "io.aeron:aeron-all:$aeronVersion"`
`20`	`20`
`21`	`21`	`testCompile project(':rsocket-test')`
`22`	`22`	`}`