Corrected isolated.jar excludes for all projects and corrected some test dependencies.

build.gradle

@@ -146,10 +146,16 @@ allprojects {
         maven { url 'https://jitpack.io' }
     }
 
-    configurations.compile {
+    configurations {
-        // We want to use SLF4J's version of these bindings: jcl-over-slf4j
+        compile {
-        // Remove any transitive dependency on Apache's version.
+            // We want to use SLF4J's version of these bindings: jcl-over-slf4j
-        exclude group: 'commons-logging', module: 'commons-logging'
+            // Remove any transitive dependency on Apache's version.
+            exclude group: 'commons-logging', module: 'commons-logging'
+        }
+        runtime {
+            // We never want isolated.jar on classPath, since we want to test jar being dynamically loaded as an attachment
+            exclude module: 'isolated'
+        }
     }
 }
 

client/jfx/build.gradle

@@ -7,9 +7,6 @@ description 'Corda client JavaFX modules'
 
 //noinspection GroovyAssignabilityCheck
 configurations {
-    // we don't want isolated.jar in classPath, since we want to test jar being dynamically loaded as an attachment
-    runtime.exclude module: 'isolated'
-
     integrationTestCompile.extendsFrom testCompile
     integrationTestRuntime.extendsFrom testRuntime
 }

client/mock/build.gradle

@@ -5,12 +5,6 @@ apply plugin: 'com.jfrog.artifactory'
 
 description 'Corda client mock modules'
 
-//noinspection GroovyAssignabilityCheck
-configurations {
-    // we don't want isolated.jar in classPath, since we want to test jar being dynamically loaded as an attachment
-    runtime.exclude module: 'isolated'
-}
-
 // To find potential version conflicts, run "gradle htmlDependencyReport" and then look in
 // build/reports/project/dependencies/index.html for green highlighted parts of the tree.
 

client/rpc/build.gradle

@@ -7,9 +7,6 @@ description 'Corda client RPC modules'
 
 //noinspection GroovyAssignabilityCheck
 configurations {
-    // we don't want isolated.jar in classPath, since we want to test jar being dynamically loaded as an attachment
-    runtime.exclude module: 'isolated'
-
     integrationTestCompile.extendsFrom testCompile
     integrationTestRuntime.extendsFrom testRuntime
 

finance/isolated/build.gradle

@@ -2,5 +2,5 @@ apply plugin: 'kotlin'
 apply plugin: CanonicalizerPlugin
 
 dependencies {
-    compile project(':core')
+    compileOnly project(':core')
 }

node-api/build.gradle

@@ -5,12 +5,6 @@ apply plugin: 'com.jfrog.artifactory'
 
 description 'Corda node Artemis API'
 
-buildscript {
-    repositories {
-        mavenCentral()
-    }
-}
-
 dependencies {
     compile project(":core")
 
@@ -36,8 +30,8 @@ dependencies {
 
     // Unit testing helpers.
     testCompile "junit:junit:$junit_version"
-    testCompile "org.assertj:assertj-core:${assertj_version}"
+    testCompile "org.assertj:assertj-core:$assertj_version"
-    testCompile project(':test-utils')
+    testCompile project(':node-driver')
 }
 
 jar {

node/build.gradle

@@ -11,9 +11,6 @@ description 'Corda node modules'
 
 //noinspection GroovyAssignabilityCheck
 configurations {
-    // we don't want isolated.jar in classPath, since we want to test jar being dynamically loaded as an attachment
-    runtime.exclude module: 'isolated'
-
     compile {
         // We don't need these because we already include netty-all.
         exclude group: 'io.netty', module: 'netty-transport'

testing/node-driver/build.gradle

@@ -6,9 +6,6 @@ apply plugin: 'com.jfrog.artifactory'
 
 //noinspection GroovyAssignabilityCheck
 configurations {
-    // we don't want isolated.jar in classPath, since we want to test jar being dynamically loaded as an attachment
-    runtime.exclude module: 'isolated'
-
     integrationTestCompile.extendsFrom testCompile
     integrationTestRuntime.extendsFrom testRuntime
 }

testing/test-utils/build.gradle

@@ -6,12 +6,6 @@ apply plugin: 'com.jfrog.artifactory'
 
 description 'Testing utilities for Corda'
 
-//noinspection GroovyAssignabilityCheck
-configurations {
-    // we don't want isolated.jar in classPath, since we want to test jar being dynamically loaded as an attachment
-    runtime.exclude module: 'isolated'
-}
-
 dependencies {
     compile project(':test-common')
     compile project(':core')