CORDA-2037 - Add network bootstrapper and other tools to published binary list (#4003)

* Publish tools to Artifactory: Blob Inspector, Network Bootstrapper (#3321)

* Added missing plugin to enable publishing of artifact to Artifactory.

* Remove references to experimental blobinspector

* Remove disableDefaultJar for default jar.

* Add additional artifacts to be published.

* Fix bootstrapper publication problem. (#3370)

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

Fixed merge issue

build.gradle

@@ -304,7 +304,28 @@ bintrayConfig {
     projectUrl = 'https://github.com/corda/corda'
     gpgSign = true
     gpgPassphrase = System.getenv('CORDA_BINTRAY_GPG_PASSPHRASE')
-    publications = ['corda-jfx', 'corda-mock', 'corda-rpc', 'corda-core', 'corda', 'corda-finance', 'corda-node', 'corda-node-api', 'corda-test-common', 'corda-test-utils', 'corda-jackson', 'corda-verifier', 'corda-webserver-impl', 'corda-webserver', 'corda-node-driver', 'corda-confidential-identities']
+    publications = [
+            'corda-jfx',
+            'corda-mock',
+            'corda-rpc',
+            'corda-core',
+            'corda',
+            'corda-finance',
+            'corda-node',
+            'corda-node-api',
+            'corda-test-common',
+            'corda-test-utils',
+            'corda-jackson',
+            'corda-verifier',
+            'corda-webserver-impl',
+            'corda-webserver',
+            'corda-node-driver',
+            'corda-confidential-identities',
+            'corda-shell',
+            'corda-serialization',
+            'corda-tools-blob-inspector',
+            'corda-tools-network-bootstrapper'
+    ]
     license {
         name = 'Apache-2.0'
         url = 'https://www.apache.org/licenses/LICENSE-2.0'

tools/blobinspector/build.gradle

@@ -1,5 +1,7 @@
 apply plugin: 'java'
 apply plugin: 'kotlin'
+apply plugin: 'net.corda.plugins.publish-utils'
+apply plugin: 'com.jfrog.artifactory'
 
 dependencies {
     compile project(':client:jackson')
@@ -19,7 +21,7 @@ jar {
         exclude "META-INF/*.DSA"
         exclude "META-INF/*.RSA"
     }
-    baseName 'blobinspector'
+    archiveName = "blob-inspector-${corda_release_version}.jar"
     manifest {
         attributes(
                 'Automatic-Module-Name': 'net.corda.blobinspector',
@@ -27,3 +29,7 @@ jar {
         )
     }
 }
+
+publish {
+    name 'corda-tools-blob-inspector'
+}

tools/bootstrapper/build.gradle

@@ -1,4 +1,6 @@
 apply plugin: 'us.kirchmeier.capsule'
+apply plugin: 'net.corda.plugins.publish-utils'
+apply plugin: 'com.jfrog.artifactory'
 
 description 'Network bootstrapper'
 
@@ -6,13 +8,17 @@ configurations {
     runtimeArtifacts
 }
 
+jar {
+    baseName "corda-tools-network-bootstrapper"
+}
+
 dependencies {
     compile "org.slf4j:slf4j-nop:$slf4j_version"
 }
 
 task buildBootstrapperJar(type: FatCapsule, dependsOn: project(':node-api').compileJava) {
     applicationClass 'net.corda.nodeapi.internal.network.NetworkBootstrapper'
-    archiveName "network-bootstrapper.jar"
+    archiveName "tools-network-bootstrapper-${corda_release_version}.jar"
     capsuleManifest {
         applicationVersion = corda_release_version
         systemProperties['visualvm.display.name'] = 'Network Bootstrapper'
@@ -30,4 +36,16 @@ task buildBootstrapperJar(type: FatCapsule, dependsOn: project(':node-api').comp
 
 artifacts {
     runtimeArtifacts buildBootstrapperJar
+    publish buildBootstrapperJar {
+        classifier ""
+    }
+}
+
+jar {
+    classifier "ignore"
+}
+
+publish {
+    disableDefaultJar = true
+    name 'corda-tools-network-bootstrapper'
 }