move back into test-utils

build.gradle

@@ -366,7 +366,6 @@ bintrayConfig {
             'corda-finance',    // maintained for backwards compatibility only
             'corda-finance-workflows',
             'corda-finance-contracts',
-            'corda-finance-test-contracts',
             'corda-node',
             'corda-node-api',
             'corda-test-common',

finance/test-contracts/build.gradle

@@ -1,37 +0,0 @@
-apply plugin: 'kotlin'
-// Java Persistence API support: create no-arg constructor
-// see: http://stackoverflow.com/questions/32038177/kotlin-with-jpa-default-constructor-hell
-apply plugin: 'kotlin-jpa'
-apply plugin: 'java'
-apply plugin: CanonicalizerPlugin
-apply plugin: 'net.corda.plugins.publish-utils'
-apply plugin: 'com.jfrog.artifactory'
-
-description 'Corda finance module - testing contracts'
-
-dependencies {
-    compile project(':core')
-    compile project(':confidential-identities')
-
-    // For JSON
-    compile "com.fasterxml.jackson.core:jackson-databind:${jackson_version}"
-
-    compile project(':test-utils')
-    compile project(path: ':core', configuration: 'testArtifacts')
-    compile "junit:junit:$junit_version"
-
-    // AssertJ: for fluent assertions for testing
-    compile "org.assertj:assertj-core:$assertj_version"
-}
-
-jar {
-    baseName 'corda-finance-test-contracts'
-    manifest {
-        attributes('Corda-Revision': 'n/a')
-        attributes('Corda-Vendor': 'Corda Open Source')
-    }
-}
-
-publish {
-    name jar.baseName
-}

node/build.gradle

@@ -185,7 +185,7 @@ dependencies {
     compile "com.palominolabs.metrics:metrics-new-relic:${metrics_new_relic_version}"
 
     testCompile(project(':test-cli'))
-    testCompile(project(':finance:test-contracts'))
+    testCompile(project(':test-utils'))
 }
 
 tasks.withType(JavaCompile) {

settings.gradle

@@ -5,7 +5,6 @@ include 'confidential-identities'
 include 'finance'   // maintained for backwards compatibility only
 include 'finance:contracts'
 include 'finance:workflows'
-include 'finance:test-contracts'
 include 'isolated'
 include 'core'
 include 'docs'

testing/test-utils/build.gradle

@@ -26,6 +26,7 @@ dependencies {
 
     // OkHTTP: Simple HTTP library.
     compile "com.squareup.okhttp3:okhttp:$okhttp_version"
+    compile project(':confidential-identities') 
 }
 
 jar {