mirror of
https://github.com/corda/corda.git
synced 2025-06-17 06:38:21 +00:00
Due to insurmountable issues with publishing the JARs when the project is called Corda it has been renamed back to capsule.
This commit is contained in:
@ -92,7 +92,7 @@ repositories {
|
|||||||
dependencies {
|
dependencies {
|
||||||
compile project(':node')
|
compile project(':node')
|
||||||
compile "com.google.guava:guava:19.0"
|
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) {
|
task jacocoRootReport(type: org.gradle.testing.jacoco.tasks.JacocoReport) {
|
||||||
|
@ -36,7 +36,7 @@ sourceSets {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
compileTestJava.dependsOn tasks.getByPath(':node:corda:buildCordaJAR')
|
compileTestJava.dependsOn tasks.getByPath(':node:capsule:buildCordaJAR')
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile project(':core')
|
compile project(':core')
|
||||||
@ -48,7 +48,7 @@ dependencies {
|
|||||||
exclude group: "bouncycastle"
|
exclude group: "bouncycastle"
|
||||||
}
|
}
|
||||||
|
|
||||||
runtime project(path: ":node:corda", configuration: 'runtimeArtifacts')
|
runtime project(path: ":node:capsule", configuration: 'runtimeArtifacts')
|
||||||
}
|
}
|
||||||
|
|
||||||
mainClassName = "net.corda.docs.ClientRpcTutorialKt"
|
mainClassName = "net.corda.docs.ClientRpcTutorialKt"
|
||||||
|
@ -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 ""
|
|
||||||
}
|
|
||||||
}
|
|
@ -45,7 +45,7 @@ dependencies {
|
|||||||
testCompile group: 'junit', name: 'junit', version: '4.11'
|
testCompile group: 'junit', name: 'junit', version: '4.11'
|
||||||
|
|
||||||
// Corda integration dependencies
|
// Corda integration dependencies
|
||||||
runtime project(path: ":node:corda", configuration: 'runtimeArtifacts')
|
runtime project(path: ":node:capsule", configuration: 'runtimeArtifacts')
|
||||||
compile project(':core')
|
compile project(':core')
|
||||||
compile project(':client')
|
compile project(':client')
|
||||||
compile project(':node')
|
compile project(':node')
|
||||||
|
@ -48,7 +48,7 @@ dependencies {
|
|||||||
testCompile group: 'junit', name: 'junit', version: '4.11'
|
testCompile group: 'junit', name: 'junit', version: '4.11'
|
||||||
|
|
||||||
// Corda integration dependencies
|
// Corda integration dependencies
|
||||||
runtime project(path: ":node:corda", configuration: 'runtimeArtifacts')
|
runtime project(path: ":node:capsule", configuration: 'runtimeArtifacts')
|
||||||
compile project(':core')
|
compile project(':core')
|
||||||
compile project(':client')
|
compile project(':client')
|
||||||
compile project(':node')
|
compile project(':node')
|
||||||
|
@ -21,7 +21,7 @@ dependencies {
|
|||||||
testCompile group: 'junit', name: 'junit', version: '4.11'
|
testCompile group: 'junit', name: 'junit', version: '4.11'
|
||||||
|
|
||||||
// Corda integration dependencies
|
// Corda integration dependencies
|
||||||
runtime project(path: ":node:corda", configuration: 'runtimeArtifacts')
|
runtime project(path: ":node:capsule", configuration: 'runtimeArtifacts')
|
||||||
compile project(':core')
|
compile project(':core')
|
||||||
compile project(':client')
|
compile project(':client')
|
||||||
compile project(':node')
|
compile project(':node')
|
||||||
|
@ -45,7 +45,7 @@ dependencies {
|
|||||||
testCompile group: 'junit', name: 'junit', version: '4.11'
|
testCompile group: 'junit', name: 'junit', version: '4.11'
|
||||||
|
|
||||||
// Corda integration dependencies
|
// Corda integration dependencies
|
||||||
runtime project(path: ":node:corda", configuration: 'runtimeArtifacts')
|
runtime project(path: ":node:capsule", configuration: 'runtimeArtifacts')
|
||||||
compile project(':core')
|
compile project(':core')
|
||||||
compile project(':client')
|
compile project(':client')
|
||||||
compile project(':node')
|
compile project(':node')
|
||||||
|
@ -41,7 +41,7 @@ dependencies {
|
|||||||
testCompile group: 'junit', name: 'junit', version: '4.11'
|
testCompile group: 'junit', name: 'junit', version: '4.11'
|
||||||
|
|
||||||
// Corda integration dependencies
|
// Corda integration dependencies
|
||||||
runtime project(path: ":node:corda", configuration: 'runtimeArtifacts')
|
runtime project(path: ":node:capsule", configuration: 'runtimeArtifacts')
|
||||||
compile project(':core')
|
compile project(':core')
|
||||||
compile project(':client')
|
compile project(':client')
|
||||||
compile project(':node')
|
compile project(':node')
|
||||||
|
@ -45,7 +45,7 @@ dependencies {
|
|||||||
testCompile group: 'junit', name: 'junit', version: '4.11'
|
testCompile group: 'junit', name: 'junit', version: '4.11'
|
||||||
|
|
||||||
// Corda integration dependencies
|
// Corda integration dependencies
|
||||||
runtime project(path: ":node:corda", configuration: 'runtimeArtifacts')
|
runtime project(path: ":node:capsule", configuration: 'runtimeArtifacts')
|
||||||
compile project(':core')
|
compile project(':core')
|
||||||
compile project(':client')
|
compile project(':client')
|
||||||
compile project(':node')
|
compile project(':node')
|
||||||
|
Reference in New Issue
Block a user