From a0d5426ced1716030ec4c3e933dc3d7866c8bd64 Mon Sep 17 00:00:00 2001 From: Clinton Alexander Date: Tue, 6 Dec 2016 15:03:33 +0000 Subject: [PATCH] Due to insurmountable issues with publishing the JARs when the project is called Corda it has been renamed back to capsule. --- build.gradle | 2 +- docs/source/example-code/build.gradle | 4 +- node/corda/build.gradle | 79 ------------------------ samples/attachment-demo/build.gradle | 2 +- samples/irs-demo/build.gradle | 2 +- samples/network-visualiser/build.gradle | 2 +- samples/raft-notary-demo/build.gradle | 2 +- samples/simm-valuation-demo/build.gradle | 2 +- samples/trader-demo/build.gradle | 2 +- 9 files changed, 9 insertions(+), 88 deletions(-) delete mode 100644 node/corda/build.gradle diff --git a/build.gradle b/build.gradle index e3f176c856..8cbf608b52 100644 --- a/build.gradle +++ b/build.gradle @@ -92,7 +92,7 @@ repositories { dependencies { compile project(':node') compile "com.google.guava:guava:19.0" - runtime project(path: ":node:corda", configuration: 'runtimeArtifacts') + runtime project(path: ":node:capsule", configuration: 'runtimeArtifacts') } task jacocoRootReport(type: org.gradle.testing.jacoco.tasks.JacocoReport) { diff --git a/docs/source/example-code/build.gradle b/docs/source/example-code/build.gradle index 08ad1593e4..9bc0aeb012 100644 --- a/docs/source/example-code/build.gradle +++ b/docs/source/example-code/build.gradle @@ -36,7 +36,7 @@ sourceSets { } } -compileTestJava.dependsOn tasks.getByPath(':node:corda:buildCordaJAR') +compileTestJava.dependsOn tasks.getByPath(':node:capsule:buildCordaJAR') dependencies { compile project(':core') @@ -48,7 +48,7 @@ dependencies { exclude group: "bouncycastle" } - runtime project(path: ":node:corda", configuration: 'runtimeArtifacts') + runtime project(path: ":node:capsule", configuration: 'runtimeArtifacts') } mainClassName = "net.corda.docs.ClientRpcTutorialKt" diff --git a/node/corda/build.gradle b/node/corda/build.gradle deleted file mode 100644 index fd61034097..0000000000 --- a/node/corda/build.gradle +++ /dev/null @@ -1,79 +0,0 @@ -/** - * This build.gradle exists to publish our capsule (executable fat jar) to maven. It cannot be placed in the - * node project because the bintray plugin cannot publish two modules from one project. - */ -apply plugin: 'net.corda.plugins.publish-utils' -apply plugin: 'us.kirchmeier.capsule' -apply plugin: 'maven-publish' - -description 'Corda standalone node' - -repositories { - mavenLocal() - mavenCentral() - maven { - url 'http://oss.sonatype.org/content/repositories/snapshots' - } - jcenter() - maven { - url 'https://dl.bintray.com/kotlin/exposed' - } -} - -configurations { - runtimeArtifacts.extendsFrom runtime -} - -// Force the Caplet to target Java 6. This ensures that running 'java -jar corda.jar' on any Java 6 VM upwards -// will get as far as the Capsule version checks, meaning that if your JVM is too old, you will at least get -// a sensible error message telling you what to do rather than a bytecode version exception that doesn't. -// If we introduce .java files into this module that need Java 8+ then we will have to push the caplet into -// its own module so its target can be controlled individually, but for now this suffices. -sourceCompatibility = 1.6 -targetCompatibility = 1.6 - -sourceSets { - test { - resources { - srcDir "../../config/test" - } - } - main { - resources { - srcDir "../../config/dev" - } - } -} - -dependencies { - compile project(':node') -} - -task buildCordaJAR(type: FatCapsule, dependsOn: ['jar', 'buildCertSigningRequestUtilityJAR']) { - applicationClass 'net.corda.node.MainKt' - archiveName "corda-${corda_version}.jar" - applicationSource = files(project.tasks.findByName('jar'), 'build/classes/main/CordaCaplet.class', 'config/dev/log4j2.xml') - - capsuleManifest { - appClassPath = ["jolokia-agent-war-${project.rootProject.ext.jolokia_version}.war"] - javaAgents = ["quasar-core-${quasar_version}-jdk8.jar"] - minJavaVersion = '1.8.0' - caplets = ['CordaCaplet'] - } -} - -task buildCertSigningRequestUtilityJAR(type: FatCapsule, dependsOn: project.jar) { - applicationClass 'net.corda.node.utilities.certsigning.CertificateSignerKt' - archiveName 'certSigningRequestUtility.jar' - capsuleManifest { - systemProperties['log4j.configuration'] = 'log4j2.xml' - minJavaVersion = '1.8.0' - } -} - -artifacts { - runtimeArtifacts buildCordaJAR - publish buildCordaJAR { - classifier "" - } -} \ No newline at end of file diff --git a/samples/attachment-demo/build.gradle b/samples/attachment-demo/build.gradle index dccad3dce0..89991bc556 100644 --- a/samples/attachment-demo/build.gradle +++ b/samples/attachment-demo/build.gradle @@ -45,7 +45,7 @@ dependencies { testCompile group: 'junit', name: 'junit', version: '4.11' // Corda integration dependencies - runtime project(path: ":node:corda", configuration: 'runtimeArtifacts') + runtime project(path: ":node:capsule", configuration: 'runtimeArtifacts') compile project(':core') compile project(':client') compile project(':node') diff --git a/samples/irs-demo/build.gradle b/samples/irs-demo/build.gradle index 67d273888e..0400939e62 100644 --- a/samples/irs-demo/build.gradle +++ b/samples/irs-demo/build.gradle @@ -48,7 +48,7 @@ dependencies { testCompile group: 'junit', name: 'junit', version: '4.11' // Corda integration dependencies - runtime project(path: ":node:corda", configuration: 'runtimeArtifacts') + runtime project(path: ":node:capsule", configuration: 'runtimeArtifacts') compile project(':core') compile project(':client') compile project(':node') diff --git a/samples/network-visualiser/build.gradle b/samples/network-visualiser/build.gradle index ce2184b414..5a0169a4ec 100644 --- a/samples/network-visualiser/build.gradle +++ b/samples/network-visualiser/build.gradle @@ -21,7 +21,7 @@ dependencies { testCompile group: 'junit', name: 'junit', version: '4.11' // Corda integration dependencies - runtime project(path: ":node:corda", configuration: 'runtimeArtifacts') + runtime project(path: ":node:capsule", configuration: 'runtimeArtifacts') compile project(':core') compile project(':client') compile project(':node') diff --git a/samples/raft-notary-demo/build.gradle b/samples/raft-notary-demo/build.gradle index 5707e7a24e..c0ed340679 100644 --- a/samples/raft-notary-demo/build.gradle +++ b/samples/raft-notary-demo/build.gradle @@ -45,7 +45,7 @@ dependencies { testCompile group: 'junit', name: 'junit', version: '4.11' // Corda integration dependencies - runtime project(path: ":node:corda", configuration: 'runtimeArtifacts') + runtime project(path: ":node:capsule", configuration: 'runtimeArtifacts') compile project(':core') compile project(':client') compile project(':node') diff --git a/samples/simm-valuation-demo/build.gradle b/samples/simm-valuation-demo/build.gradle index 53c5f1ea8d..d444858e82 100644 --- a/samples/simm-valuation-demo/build.gradle +++ b/samples/simm-valuation-demo/build.gradle @@ -41,7 +41,7 @@ dependencies { testCompile group: 'junit', name: 'junit', version: '4.11' // Corda integration dependencies - runtime project(path: ":node:corda", configuration: 'runtimeArtifacts') + runtime project(path: ":node:capsule", configuration: 'runtimeArtifacts') compile project(':core') compile project(':client') compile project(':node') diff --git a/samples/trader-demo/build.gradle b/samples/trader-demo/build.gradle index aac811f0f6..403f5b879b 100644 --- a/samples/trader-demo/build.gradle +++ b/samples/trader-demo/build.gradle @@ -45,7 +45,7 @@ dependencies { testCompile group: 'junit', name: 'junit', version: '4.11' // Corda integration dependencies - runtime project(path: ":node:corda", configuration: 'runtimeArtifacts') + runtime project(path: ":node:capsule", configuration: 'runtimeArtifacts') compile project(':core') compile project(':client') compile project(':node')