From 002d5a8f10f82218a1df1498f8c32aab2f7e26ec Mon Sep 17 00:00:00 2001
From: josecoll <jose.coll@r3cev.com>
Date: Fri, 8 Jun 2018 14:02:57 +0100
Subject: [PATCH] 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.
---
 .idea/compiler.xml               |  2 --
 build.gradle                     |  2 +-
 settings.gradle                  |  1 -
 tools/blobinspector/build.gradle |  8 +++++++-
 tools/bootstrapper/build.gradle  | 12 +++++++++++-
 5 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 09964f0fcd..1deff9c2e3 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -73,8 +73,6 @@
       <module name="example-code_integrationTest" target="1.8" />
       <module name="example-code_main" target="1.8" />
       <module name="example-code_test" target="1.8" />
-      <module name="experimental-blobinspector_main" target="1.8" />
-      <module name="experimental-blobinspector_test" target="1.8" />
       <module name="experimental-kryo-hook_main" target="1.8" />
       <module name="experimental-kryo-hook_test" target="1.8" />
       <module name="experimental_main" target="1.8" />
diff --git a/build.gradle b/build.gradle
index 40ef405737..9f0b4c784c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -324,7 +324,7 @@ 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', 'corda-shell', 'corda-serialization']
+    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', 'tools-blob-inspector', 'tools-network-bootstrapper']
     license {
         name = 'Apache-2.0'
         url = 'https://www.apache.org/licenses/LICENSE-2.0'
diff --git a/settings.gradle b/settings.gradle
index d841212cb4..0e31eeb1fb 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -21,7 +21,6 @@ include 'experimental:behave'
 include 'experimental:sandbox'
 include 'experimental:quasar-hook'
 include 'experimental:kryo-hook'
-include 'experimental:blobinspector'
 include 'experimental:corda-utils'
 include 'test-common'
 include 'test-utils'
diff --git a/tools/blobinspector/build.gradle b/tools/blobinspector/build.gradle
index df0ca18fa6..06b4f21e52 100644
--- a/tools/blobinspector/build.gradle
+++ b/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')
@@ -18,7 +20,7 @@ jar {
         exclude "META-INF/*.DSA"
         exclude "META-INF/*.RSA"
     }
-    baseName 'blobinspector'
+    archiveName = "blob-inspector-${version}.jar"
     manifest {
         attributes(
                 'Automatic-Module-Name': 'net.corda.blobinspector',
@@ -26,3 +28,7 @@ jar {
         )
     }
 }
+
+publish {
+    name 'tools-blob-inspector'
+}
diff --git a/tools/bootstrapper/build.gradle b/tools/bootstrapper/build.gradle
index 74a2c961d8..ff2c7c81de 100644
--- a/tools/bootstrapper/build.gradle
+++ b/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'
 
@@ -12,7 +14,7 @@ dependencies {
 
 task buildBootstrapperJar(type: FatCapsule, dependsOn: project(':node-api').compileJava) {
     applicationClass 'net.corda.nodeapi.internal.network.NetworkBootstrapper'
-    archiveName "network-bootstrapper.jar"
+    archiveName = "network-bootstrapper-${version}.jar"
     capsuleManifest {
         applicationVersion = corda_release_version
         systemProperties['visualvm.display.name'] = 'Network Bootstrapper'
@@ -30,4 +32,12 @@ task buildBootstrapperJar(type: FatCapsule, dependsOn: project(':node-api').comp
 
 artifacts {
     runtimeArtifacts buildBootstrapperJar
+    publish buildBootstrapperJar {
+        classifier ""
+    }
+}
+
+publish {
+    name 'tools-network-bootstrapper'
+    disableDefaultJar = true
 }