Fixed double JAR publishing problem with network bootstrapper. (#3354)

This commit is contained in:
Michele Sollecito 2018-06-12 18:08:31 +01:00 committed by GitHub
parent 2f737cd6bc
commit 7fec9df99e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 6 deletions

View File

@ -348,8 +348,8 @@ bintrayConfig {
'corda-shell', 'corda-shell',
'corda-serialization', 'corda-serialization',
'corda-serialization-deterministic', 'corda-serialization-deterministic',
'tools-blob-inspector', 'corda-tools-blob-inspector',
'tools-network-bootstrapper' 'corda-tools-network-bootstrapper'
] ]
license { license {
name = 'Apache-2.0' name = 'Apache-2.0'

View File

@ -20,7 +20,7 @@ jar {
exclude "META-INF/*.DSA" exclude "META-INF/*.DSA"
exclude "META-INF/*.RSA" exclude "META-INF/*.RSA"
} }
archiveName = "blob-inspector-${version}.jar" archiveName = "blob-inspector-${corda_release_version}.jar"
manifest { manifest {
attributes( attributes(
'Automatic-Module-Name': 'net.corda.blobinspector', 'Automatic-Module-Name': 'net.corda.blobinspector',
@ -30,5 +30,5 @@ jar {
} }
publish { publish {
name 'tools-blob-inspector' name 'corda-tools-blob-inspector'
} }

View File

@ -8,13 +8,17 @@ configurations {
runtimeArtifacts runtimeArtifacts
} }
jar {
baseName "corda-tools-network-bootstrapper"
}
dependencies { dependencies {
compile "org.slf4j:slf4j-nop:$slf4j_version" compile "org.slf4j:slf4j-nop:$slf4j_version"
} }
task buildBootstrapperJar(type: FatCapsule, dependsOn: project(':node-api').compileJava) { task buildBootstrapperJar(type: FatCapsule, dependsOn: project(':node-api').compileJava) {
applicationClass 'net.corda.nodeapi.internal.network.NetworkBootstrapper' applicationClass 'net.corda.nodeapi.internal.network.NetworkBootstrapper'
archiveName = "network-bootstrapper-${version}.jar" archiveName "tools-network-bootstrapper-${corda_release_version}.jar"
capsuleManifest { capsuleManifest {
applicationVersion = corda_release_version applicationVersion = corda_release_version
systemProperties['visualvm.display.name'] = 'Network Bootstrapper' systemProperties['visualvm.display.name'] = 'Network Bootstrapper'
@ -38,6 +42,6 @@ artifacts {
} }
publish { publish {
name 'tools-network-bootstrapper'
disableDefaultJar = true disableDefaultJar = true
name 'corda-tools-network-bootstrapper'
} }