mirror of
https://github.com/corda/corda.git
synced 2025-05-09 20:12:56 +00:00
Removed dead installDist configurations and moved Jolokia access to the correct resources dir.
This commit is contained in:
parent
2744d8abaa
commit
1e6cca4d5d
1
.idea/runConfigurations/Clean___Install.xml
generated
1
.idea/runConfigurations/Clean___Install.xml
generated
@ -11,6 +11,7 @@
|
|||||||
<option name="taskNames">
|
<option name="taskNames">
|
||||||
<list>
|
<list>
|
||||||
<option value="clean" />
|
<option value="clean" />
|
||||||
|
<option value="build" />
|
||||||
<option value="installDist" />
|
<option value="installDist" />
|
||||||
<option value="buildCordaJAR" />
|
<option value="buildCordaJAR" />
|
||||||
</list>
|
</list>
|
||||||
|
43
build.gradle
43
build.gradle
@ -30,7 +30,6 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
apply plugin: 'kotlin'
|
apply plugin: 'kotlin'
|
||||||
apply plugin: 'application'
|
|
||||||
apply plugin: 'project-report'
|
apply plugin: 'project-report'
|
||||||
apply plugin: QuasarPlugin
|
apply plugin: QuasarPlugin
|
||||||
apply plugin: 'com.github.ben-manes.versions'
|
apply plugin: 'com.github.ben-manes.versions'
|
||||||
@ -93,14 +92,8 @@ configurations {
|
|||||||
integrationTestRuntime.extendsFrom testRuntime
|
integrationTestRuntime.extendsFrom testRuntime
|
||||||
}
|
}
|
||||||
|
|
||||||
// This is required for quasar. I think.
|
|
||||||
applicationDefaultJvmArgs = ["-javaagent:${configurations.quasar.singleFile}"]
|
|
||||||
// Needed by the :startScripts task
|
|
||||||
mainClassName = 'com.r3corda.demos.TraderDemoKt'
|
|
||||||
|
|
||||||
// To find potential version conflicts, run "gradle htmlDependencyReport" and then look in
|
// 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.
|
// build/reports/project/dependencies/index.html for green highlighted parts of the tree.
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile project(':node')
|
compile project(':node')
|
||||||
// TODO: Demos should not depend on test code, but only use production APIs
|
// TODO: Demos should not depend on test code, but only use production APIs
|
||||||
@ -121,41 +114,11 @@ dependencies {
|
|||||||
integrationTestCompile project(':test-utils')
|
integrationTestCompile project(':test-utils')
|
||||||
}
|
}
|
||||||
|
|
||||||
// Package up the demo programs.
|
|
||||||
|
|
||||||
task getAttachmentDemo(type: CreateStartScripts) {
|
|
||||||
mainClassName = "com.r3corda.demos.attachment.AttachmentDemoKt"
|
|
||||||
applicationName = "attachment-demo"
|
|
||||||
defaultJvmOpts = ["-javaagent:${configurations.quasar.singleFile}"]
|
|
||||||
outputDir = new File(project.buildDir, 'scripts')
|
|
||||||
classpath = jar.outputs.files + project.configurations.runtime
|
|
||||||
}
|
|
||||||
|
|
||||||
task getTraderDemo(type: CreateStartScripts) {
|
|
||||||
mainClassName = "com.r3corda.demos.TraderDemoKt"
|
|
||||||
applicationName = "trader-demo"
|
|
||||||
defaultJvmOpts = ["-javaagent:${configurations.quasar.singleFile}"]
|
|
||||||
outputDir = new File(project.buildDir, 'scripts')
|
|
||||||
classpath = jar.outputs.files + project.configurations.runtime
|
|
||||||
}
|
|
||||||
|
|
||||||
// Force windows script classpath to wildcard path to avoid the 'Command Line Is Too Long' issues
|
|
||||||
// with generated scripts. Include Jolokia .war explicitly as this isn't picked up by wildcard
|
|
||||||
tasks.withType(CreateStartScripts) {
|
|
||||||
doLast {
|
|
||||||
windowsScript.text = windowsScript
|
|
||||||
.readLines()
|
|
||||||
.collect { line -> line.replaceAll(~/^set CLASSPATH=.*$/, 'set CLASSPATH=%APP_HOME%/lib/*;%APP_HOME%/lib/jolokia-agent-war-'+project.ext.jolokia_version+'.war') }
|
|
||||||
.join('\r\n')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
task integrationTest(type: Test, dependsOn: [':node:integrationTest',':client:integrationTest']) {
|
task integrationTest(type: Test, dependsOn: [':node:integrationTest',':client:integrationTest']) {
|
||||||
testClassesDir = sourceSets.integrationTest.output.classesDir
|
testClassesDir = sourceSets.integrationTest.output.classesDir
|
||||||
classpath = sourceSets.integrationTest.runtimeClasspath
|
classpath = sourceSets.integrationTest.runtimeClasspath
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
task jacocoRootReport(type: org.gradle.testing.jacoco.tasks.JacocoReport) {
|
task jacocoRootReport(type: org.gradle.testing.jacoco.tasks.JacocoReport) {
|
||||||
dependsOn = subprojects.test
|
dependsOn = subprojects.test
|
||||||
additionalSourceDirs = files(subprojects.sourceSets.main.allSource.srcDirs)
|
additionalSourceDirs = files(subprojects.sourceSets.main.allSource.srcDirs)
|
||||||
@ -183,12 +146,6 @@ tasks.withType(Test) {
|
|||||||
|
|
||||||
quasarScan.dependsOn('classes', 'core:classes', 'contracts:classes', 'node:classes')
|
quasarScan.dependsOn('classes', 'core:classes', 'contracts:classes', 'node:classes')
|
||||||
|
|
||||||
applicationDistribution.into("bin") {
|
|
||||||
from(getAttachmentDemo)
|
|
||||||
from(getTraderDemo)
|
|
||||||
fileMode = 0755
|
|
||||||
}
|
|
||||||
|
|
||||||
task buildCordaJAR(type: FatCapsule, dependsOn: ['quasarScan', 'buildCertSigningRequestUtilityJAR']) {
|
task buildCordaJAR(type: FatCapsule, dependsOn: ['quasarScan', 'buildCertSigningRequestUtilityJAR']) {
|
||||||
applicationClass 'com.r3corda.node.MainKt'
|
applicationClass 'com.r3corda.node.MainKt'
|
||||||
archiveName 'corda.jar'
|
archiveName 'corda.jar'
|
||||||
|
Loading…
x
Reference in New Issue
Block a user