Merge branch 'master' of https://github.com/corda/corda

CONTRIBUTORS.md

@@ -97,6 +97,7 @@ see changes to this list.
 * Johann Palychata (BNP Paribas)
 * johnnyychiu
 * Jonathan Sartin (R3)
+* Jonathan Sphar (R3)
 * Jose Coll (R3)
 * Jose Luu (Natixis)
 * Josh Lindl (BCS)
@@ -170,6 +171,7 @@ see changes to this list.
 * Sam Chadwick (Thomson Reuters)
 * Sasmit Sahu
 * Scott James
+* Sean Zhang (Wells Fargo)
 * Shams Asari (R3)
 * Siddhartha Sengupta (Tradewind Markets)
 * Simon Taylor (Barclays)

build.gradle

@@ -39,6 +39,7 @@ buildscript {
     ext.fileupload_version = '1.3.3'
     ext.junit_version = '4.12'
     ext.mockito_version = '2.18.3'
+    ext.hamkrest_version = '1.4.2.2'
     ext.jopt_simple_version = '5.0.2'
     ext.jansi_version = '1.14'
     ext.hibernate_version = '5.2.6.Final'
@@ -98,6 +99,7 @@ buildscript {
         classpath "net.corda.plugins:cordformation:$gradle_plugins_version"
         classpath "net.corda.plugins:cordapp:$gradle_plugins_version"
         classpath "net.corda.plugins:api-scanner:$gradle_plugins_version"
+        classpath "net.corda.plugins:jar-filter:$gradle_plugins_version"
         classpath "net.sf.proguard:proguard-gradle:$proguard_version"
         classpath 'com.github.ben-manes:gradle-versions-plugin:0.15.0'
         classpath "org.jetbrains.kotlin:kotlin-noarg:$kotlin_version"
@@ -216,6 +218,9 @@ allprojects {
                 force "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
                 force "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
 
+                // Force dependencies to use the same version of Guava as Corda.
+                force "com.google.guava:guava:$guava_version"
+
                 // Demand that everything uses our given version of Netty.
                 eachDependency { details ->
                     if (details.requested.group == 'io.netty' && details.requested.name.startsWith('netty-')) {

buildSrc/build.gradle

@@ -4,21 +4,8 @@ buildscript {
 
     ext {
         guava_version = constants.getProperty("guavaVersion")
-        kotlin_version = constants.getProperty("kotlinVersion")
-        proguard_version = constants.getProperty("proguardVersion")
         assertj_version = '3.9.1'
         junit_version = '4.12'
-        asm_version = '6.2'
-    }
-
-    repositories {
-        mavenLocal()
-        mavenCentral()
-        jcenter()
-    }
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "net.sf.proguard:proguard-gradle:$proguard_version"
     }
 }
 
@@ -28,23 +15,9 @@ repositories {
 }
 
 allprojects {
-    tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
-        kotlinOptions {
-            languageVersion = "1.2"
-            apiVersion = "1.2"
-            jvmTarget = "1.8"
-            javaParameters = true   // Useful for reflection.
-        }
-    }
-
     tasks.withType(Test) {
         // Prevent the project from creating temporary files outside of the build directory.
         systemProperty 'java.io.tmpdir', buildDir.absolutePath
-
-        // Tell the tests where Gradle's current module cache is.
-        // We need the tests to share this module cache to prevent the
-        // Gradle Test-Kit from downloading its own copy of Kotlin etc.
-        systemProperty 'test.gradle.user.home', project.gradle.gradleUserHomeDir
     }
 }