Upgrade dependencies and centralise some more version numbers in the root gradle file

build.gradle

@@ -6,17 +6,29 @@ buildscript {
     // Our version: bump this on release.
     ext.corda_version = "0.7-SNAPSHOT"
     ext.gradle_plugins_version = props.getProperty("gradlePluginsVersion")
+
+    // Dependency versions. Can run 'gradle dependencyUpdates' to find new versions of things.
+    //
+    // TODO: Sort this alphabetically.
     ext.kotlin_version = '1.0.5-2'
-    ext.quasar_version = '0.7.6'
+    ext.quasar_version = '0.7.6'    // TODO: Upgrade to 0.7.7+ when Quasar bug 238 is resolved.
     ext.asm_version = '0.5.3'
-    ext.artemis_version = '1.4.0'
+    ext.artemis_version = '1.5.1'
-    ext.jackson_version = '2.8.0.rc2'
+    ext.jackson_version = '2.8.5'
     ext.jetty_version = '9.3.9.v20160517'
-    ext.jersey_version = '2.23.1'
+    ext.jersey_version = '2.25'
-    ext.jolokia_version = '2.0.0-M1'
+    ext.jolokia_version = '2.0.0-M3'
-    ext.assertj_version = '3.5.1'
+    ext.assertj_version = '3.6.1'
-    ext.log4j_version = '2.6.2'
+    ext.log4j_version = '2.7'
-    ext.bouncycastle_version = '1.54'
+    ext.bouncycastle_version = '1.56'
+    ext.guava_version = '19.0'
+    ext.quickcheck_version = '0.7'
+    ext.okhttp_version = '3.5.0'
+    ext.typesafe_config_version = '1.3.1'
+    ext.junit_version = '4.12'
+    ext.jopt_simple_version = '5.0.2'
+    ext.jansi_version = '1.14'
+    ext.hibernate_version = '5.2.6.Final'
 
     repositories {
         mavenLocal()
@@ -33,9 +45,7 @@ buildscript {
         classpath "net.corda.plugins:publish-utils:$gradle_plugins_version"
         classpath "net.corda.plugins:quasar-utils:$gradle_plugins_version"
         classpath "net.corda.plugins:cordformation:$gradle_plugins_version"
-
+        classpath 'com.github.ben-manes:gradle-versions-plugin:0.13.0'
-        // Can run 'gradle dependencyUpdates' to find new versions of things.
-        classpath 'com.github.ben-manes:gradle-versions-plugin:0.12.0'
     }
 }
 
@@ -95,7 +105,7 @@ repositories {
 // Required for building out the fat JAR.
 dependencies {
     compile project(':node')
-    compile "com.google.guava:guava:19.0"
+    compile "com.google.guava:guava:$guava_version"
     runtime project(path: ":node:capsule", configuration: 'runtimeArtifacts')
 }
 
@@ -177,4 +187,4 @@ bintrayConfig {
         name = 'R3'
         email = 'dev@corda.net'
     }
-}
+}

buildSrc/build.gradle

@@ -5,5 +5,6 @@ repositories {
 }
 
 dependencies {
-    compile "com.google.guava:guava:19.0"
+    // Cannot use ext.guava_version here :(
+    compile "com.google.guava:guava:20.0"
 }

client/build.gradle

@@ -51,7 +51,7 @@ dependencies {
     compile "org.apache.logging.log4j:log4j-slf4j-impl:${log4j_version}"
     compile "org.apache.logging.log4j:log4j-core:${log4j_version}"
 
-    compile "com.google.guava:guava:19.0"
+    compile "com.google.guava:guava:$guava_version"
 
     // ReactFX: Functional reactive UI programming.
     compile 'org.reactfx:reactfx:2.0-M5'
@@ -61,16 +61,16 @@ dependencies {
     compile "org.apache.activemq:artemis-core-client:${artemis_version}"
 
     // Unit testing helpers.
-    testCompile 'junit:junit:4.12'
+    testCompile "junit:junit:$junit_version"
     testCompile "org.assertj:assertj-core:${assertj_version}"
 
     testCompile project(':test-utils')
 
     // Integration test helpers
-    integrationTestCompile 'junit:junit:4.12'
+    integrationTestCompile "junit:junit:$junit_version"
 }
 
 task integrationTest(type: Test) {
     testClassesDir = sourceSets.integrationTest.output.classesDir
     classpath = sourceSets.integrationTest.runtimeClasspath
-}
+}

core/build.gradle

@@ -31,11 +31,11 @@ sourceSets {
 }
 
 dependencies {
-    testCompile 'junit:junit:4.12'
+    testCompile "junit:junit:$junit_version"
     testCompile "commons-fileupload:commons-fileupload:1.3.2"
 
     // Guava: Google test library (collections test suite)
-    testCompile "com.google.guava:guava-testlib:19.0"
+    testCompile "com.google.guava:guava-testlib:$guava_version"
 
     // Bring in the MockNode infrastructure for writing protocol unit tests.
     testCompile project(":node")
@@ -43,7 +43,7 @@ dependencies {
 
     compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
-    compile "org.jetbrains.kotlinx:kotlinx-support-jdk8:0.2"
+    compile "org.jetbrains.kotlinx:kotlinx-support-jdk8:0.3"
     compile "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
 
     // Thread safety annotations
@@ -56,18 +56,19 @@ dependencies {
     // AssertJ: for fluent assertions for testing
     testCompile "org.assertj:assertj-core:${assertj_version}"
 
-    compile 'com.pholser:junit-quickcheck-core:0.6'
+    compile "com.pholser:junit-quickcheck-core:$quickcheck_version"
-    compile 'com.pholser:junit-quickcheck-generators:0.6'
+    compile "com.pholser:junit-quickcheck-generators:$quickcheck_version"
 
     // Guava: Google utilities library.
-    compile "com.google.guava:guava:19.0"
+    compile "com.google.guava:guava:$guava_version"
 
     // RxJava: observable streams of events.
+    // TODO: We can't upgrade past 1.1.6 due to a behaviour change in RxJava breaking our code. See PR #99 for discussion. Resolve.
     compile "io.reactivex:rxjava:1.1.6"
 
     // Kryo: object graph serialization.
     compile "com.esotericsoftware:kryo:4.0.0"
-    compile "de.javakaffee:kryo-serializers:0.38"
+    compile "de.javakaffee:kryo-serializers:0.41"
 
     // Apache JEXL: An embeddable expression evaluation library.
     // This may be temporary until we experiment with other ways to do on-the-fly contract specialisation via an API.
@@ -88,4 +89,4 @@ dependencies {
 
     // RS API: Response type and codes for ApiUtils.
     compile "javax.ws.rs:javax.ws.rs-api:2.0"
-}
+}

docs/source/example-code/build.gradle

@@ -98,4 +98,4 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['build']) {
                  'permissions' : ["StartFlow.net.corda.flows.CashFlow"]]
         ]
     }
-}
+}

experimental/build.gradle

@@ -28,6 +28,6 @@ dependencies {
     compile project(':core')
     compile project(':finance')
 
-    testCompile 'junit:junit:4.12'
+    testCompile "junit:junit:$junit_version"
     testCompile project(':test-utils')
 }

experimental/sandbox/build.gradle

@@ -22,10 +22,10 @@ dependencies {
     compile "org.ow2.asm:asm-commons:$asm_version"
 
     // JOptSimple: command line option parsing
-    compile "net.sf.jopt-simple:jopt-simple:5.0.1"
+    compile "net.sf.jopt-simple:jopt-simple:$jopt_simple_version"
 
     // Simple Logging Facade: makes the code independent of the chosen logging framework.
     compile "org.slf4j:slf4j-api:1.7.21"
 
-    testCompile group: 'junit', name: 'junit', version: '4.11'
+    testCompile "junit:junit:$junit_version"
 }

finance/build.gradle

@@ -21,7 +21,7 @@ dependencies {
     compile project(':core')
 
     testCompile project(':test-utils')
-    testCompile 'junit:junit:4.12'
+    testCompile "junit:junit:$junit_version"
 }
 
 sourceSets {
@@ -30,4 +30,4 @@ sourceSets {
             srcDir "../config/test"
         }
     }
-}
+}

gradle-plugins/build.gradle

@@ -16,7 +16,7 @@ buildscript {
 
     dependencies {
         classpath "net.corda.plugins:publish-utils:$gradle_plugins_version"
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.4'
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
     }
 }
 
@@ -48,4 +48,4 @@ bintrayConfig {
         name = 'R3'
         email = 'dev@corda.net'
     }
-}
+}

gradle-plugins/cordformation/build.gradle

@@ -11,6 +11,7 @@ dependencies {
     compile gradleApi()
     compile localGroovy()
 
-    compile "com.typesafe:config:1.3.0"
+    // TypeSafe Config: for simple and human friendly config files.
+    compile "com.typesafe:config:$typesafe_config_version"
 }
 

gradle-plugins/quasar-utils/build.gradle

@@ -11,4 +11,4 @@ repositories {
 dependencies {
     compile gradleApi()
     compile localGroovy()
-}
+}

node/build.gradle

@@ -66,10 +66,10 @@ dependencies {
     compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
     compile "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
 
-    compile "com.google.guava:guava:19.0"
+    compile "com.google.guava:guava:$guava_version"
 
     // JOpt: for command line flags.
-    compile "net.sf.jopt-simple:jopt-simple:5.0.2"
+    compile "net.sf.jopt-simple:jopt-simple:$jopt_simple_version"
 
     // Artemis: for reliable p2p message queues.
     compile "org.apache.activemq:artemis-server:${artemis_version}"
@@ -77,7 +77,7 @@ dependencies {
     runtime "org.apache.activemq:artemis-amqp-protocol:${artemis_version}"
 
     // JAnsi: for drawing things to the terminal in nicely coloured ways.
-    compile "org.fusesource.jansi:jansi:1.13"
+    compile "org.fusesource.jansi:jansi:$jansi_version"
 
     // GraphStream: For visualisation
     testCompile "org.graphstream:gs-core:1.3"
@@ -95,7 +95,7 @@ dependencies {
     compile "org.eclipse.jetty:jetty-servlet:${jetty_version}"
     compile "org.eclipse.jetty:jetty-webapp:${jetty_version}"
     compile "javax.servlet:javax.servlet-api:3.1.0"
-    compile "org.jolokia:jolokia-agent-war:2.0.0-M1"
+    compile "org.jolokia:jolokia-agent-war:$jolokia_version"
     compile "commons-fileupload:commons-fileupload:1.3.2"
 
     // Jersey for JAX-RS implementation for use in Jetty
@@ -121,26 +121,27 @@ dependencies {
     compile "com.google.jimfs:jimfs:1.1"
 
     // TypeSafe Config: for simple and human friendly config files.
-    compile "com.typesafe:config:1.3.0"
+    compile "com.typesafe:config:$typesafe_config_version"
 
     // Unit testing helpers.
-    testCompile 'junit:junit:4.12'
+    testCompile "junit:junit:$junit_version"
     testCompile "org.assertj:assertj-core:${assertj_version}"
 
-    testCompile 'com.pholser:junit-quickcheck-core:0.6'
+    testCompile "com.pholser:junit-quickcheck-core:$quickcheck_version"
 
     // For H2 database support in persistence
-    compile "com.h2database:h2:1.4.192"
+    compile "com.h2database:h2:1.4.193"
 
     // Exposed: Kotlin SQL library - under evaluation
+    // TODO: Upgrade to Exposed 0.7 (has API changes)
     compile "org.jetbrains.exposed:exposed:0.5.0"
 
     // SQL connection pooling library
-    compile "com.zaxxer:HikariCP:2.4.7"
+    compile "com.zaxxer:HikariCP:2.5.1"
 
     // Hibernate: an object relational mapper for writing state objects to the database automatically.
-    compile "org.hibernate:hibernate-core:5.2.2.Final"
+    compile "org.hibernate:hibernate-core:$hibernate_version"
-    compile "org.hibernate:hibernate-java8:5.2.2.Final"
+    compile "org.hibernate:hibernate-java8:$hibernate_version"
 
     // Capsule is a library for building independently executable fat JARs.
     compile 'co.paralleluniverse:capsule:1.0.3'
@@ -151,12 +152,12 @@ dependencies {
     compile 'io.atomix.catalyst:catalyst-netty:1.1.1'
 
     // Integration test helpers
-    integrationTestCompile 'junit:junit:4.12'
+    integrationTestCompile "junit:junit:$junit_version"
 
-    testCompile "com.nhaarman:mockito-kotlin:0.6.1"
+    testCompile "com.nhaarman:mockito-kotlin:1.1.0"
 }
 
 task integrationTest(type: Test) {
     testClassesDir = sourceSets.integrationTest.output.classesDir
     classpath = sourceSets.integrationTest.runtimeClasspath
-}
+}

node/capsule/build.gradle

@@ -80,4 +80,4 @@ artifacts {
 publish {
     name = 'corda'
     disableDefaultJar = true
-}
+}

samples/attachment-demo/build.gradle

@@ -42,7 +42,7 @@ configurations {
 
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    testCompile group: 'junit', name: 'junit', version: '4.11'
+    testCompile "junit:junit:$junit_version"
 
     // Corda integration dependencies
     runtime project(path: ":node:capsule", configuration: 'runtimeArtifacts')
@@ -127,4 +127,4 @@ task runRecipient(type: JavaExec) {
     main = 'net.corda.attachmentdemo.AttachmentDemoKt'
     args '--role'
     args 'RECIPIENT'
-}
+}

samples/bank-of-corda-demo/build.gradle

@@ -42,7 +42,7 @@ configurations {
 
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    testCompile group: 'junit', name: 'junit', version: '4.11'
+    testCompile "junit:junit:$junit_version"
 
     // Corda integration dependencies
     runtime project(path: ":node:capsule", configuration: 'runtimeArtifacts')
@@ -146,4 +146,4 @@ task runWebCashIssue(type: JavaExec) {
     args 30000
     args '--currency'
     args 'GBP'
-}
+}

samples/irs-demo/build.gradle

@@ -45,7 +45,7 @@ configurations {
 
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    testCompile group: 'junit', name: 'junit', version: '4.11'
+    testCompile "junit:junit:$junit_version"
 
     // Corda integration dependencies
     runtime project(path: ":node:capsule", configuration: 'runtimeArtifacts')
@@ -58,7 +58,7 @@ dependencies {
 
     // Cordapp dependencies
     // Specify your cordapp's dependencies below, including dependent cordapps
-    compile 'com.squareup.okhttp3:okhttp:3.3.1'
+    compile "com.squareup.okhttp3:okhttp:$okhttp_version"
 }
 
 task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['build']) {
@@ -118,4 +118,4 @@ publishing {
             artifact javadocJar
         }
     }
-}
+}

samples/network-visualiser/build.gradle

@@ -18,7 +18,7 @@ dependencies {
     compile project(':samples:irs-demo')
 
     compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    testCompile group: 'junit', name: 'junit', version: '4.11'
+    testCompile "junit:junit:$junit_version"
 
     // Corda integration dependencies
     runtime project(path: ":node:capsule", configuration: 'runtimeArtifacts')
@@ -52,4 +52,4 @@ task deployVisualiser(type: FatCapsule) {
         minJavaVersion = '1.8.0'
         javaAgents = [configurations.quasar.singleFile.name]
     }
-}
+}

samples/raft-notary-demo/build.gradle

@@ -42,7 +42,7 @@ configurations {
 
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    testCompile group: 'junit', name: 'junit', version: '4.11'
+    testCompile "junit:junit:$junit_version"
 
     // Corda integration dependencies
     runtime project(path: ":node:capsule", configuration: 'runtimeArtifacts')

samples/simm-valuation-demo/build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.strata_version = '1.0.0'
+    ext.strata_version = '1.1.2'
 }
 
 apply plugin: 'java'
@@ -38,7 +38,7 @@ sourceSets {
 
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    testCompile group: 'junit', name: 'junit', version: '4.11'
+    testCompile "junit:junit:$junit_version"
 
     // Corda integration dependencies
     runtime project(path: ":node:capsule", configuration: 'runtimeArtifacts')

samples/trader-demo/build.gradle

@@ -42,7 +42,7 @@ configurations {
 
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    testCompile group: 'junit', name: 'junit', version: '4.11'
+    testCompile "junit:junit:$junit_version"
 
     // Corda integration dependencies
     runtime project(path: ":node:capsule", configuration: 'runtimeArtifacts')
@@ -145,4 +145,4 @@ task runSeller(type: JavaExec) {
     main = 'net.corda.traderdemo.TraderDemoKt'
     args '--role'
     args 'SELLER'
-}
+}

test-utils/build.gradle

@@ -35,17 +35,17 @@ dependencies {
     compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
     compile "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
 
-    compile "com.google.guava:guava:19.0"
+    compile "com.google.guava:guava:$guava_version"
 
     // Force commons logging to version 1.2 to override Artemis, which pulls in 1.1.3 (ARTEMIS-424)
     compile "commons-logging:commons-logging:1.2"
 
     // Unit testing helpers.
-    compile 'junit:junit:4.12'
+    compile "junit:junit:$junit_version"
 
     // Guava: Google test library (collections test suite)
     compile "com.google.guava:guava-testlib:19.0"
 
     // OkHTTP: Simple HTTP library.
-    compile 'com.squareup.okhttp3:okhttp:3.3.1'
+    compile "com.squareup.okhttp3:okhttp:$okhttp_version"
-}
+}

tools/explorer/build.gradle

@@ -45,10 +45,10 @@ repositories {
 
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    testCompile group: 'junit', name: 'junit', version: '4.11'
+    testCompile "junit:junit:$junit_version"
 
     // TornadoFX: A lightweight Kotlin framework for working with JavaFX UI's.
-    compile 'no.tornado:tornadofx:1.5.7'
+    compile 'no.tornado:tornadofx:1.5.9'
 
     // Corda Core: Data structures and basic types needed to work with Corda.
     compile project(':core')
@@ -57,7 +57,7 @@ dependencies {
     compile project(':finance')
 
     // FontAwesomeFX: The "FontAwesome" icon library.
-    compile 'de.jensd:fontawesomefx-fontawesome:4.6.1-2'
+    compile 'de.jensd:fontawesomefx-fontawesome:4.7.0'
 
     // ReactFX: Functional reactive UI programming.
     compile 'org.reactfx:reactfx:2.0-M5'
@@ -86,4 +86,4 @@ task(runSimulationNodes, dependsOn: 'classes', type: JavaExec) {
     main = 'net.corda.explorer.MainKt'
     classpath = sourceSets.main.runtimeClasspath
     args '-S'
-}
+}

tools/loadtest/build.gradle

@@ -35,7 +35,8 @@ dependencies {
     // https://mvnrepository.com/artifact/de.danielbechler/java-object-diff
     compile group: 'de.danielbechler', name: 'java-object-diff', version: '0.10.2'
 
-    compile "com.typesafe:config:1.3.0"
+    // TypeSafe Config: for simple and human friendly config files.
+    compile "com.typesafe:config:$typesafe_config_version"
 }
 
 run {