Doorman and doorman HSM can now be published to artifactory and maven (#151)

Doorman and doorman HSM can now be published to artifactory and maven local.

.idea/compiler.xml

@@ -57,10 +57,10 @@
       <module name="finance_integrationTest" target="1.8" />
       <module name="finance_main" target="1.8" />
       <module name="finance_test" target="1.8" />
-      <module name="gradle-plugins-cordform-common_main" target="1.8" />
-      <module name="gradle-plugins-cordform-common_test" target="1.8" />
       <module name="gradle-plugins-cordapp_main" target="1.8" />
       <module name="gradle-plugins-cordapp_test" target="1.8" />
+      <module name="gradle-plugins-cordform-common_main" target="1.8" />
+      <module name="gradle-plugins-cordform-common_test" target="1.8" />
       <module name="graphs_main" target="1.8" />
       <module name="graphs_test" target="1.8" />
       <module name="intellij-plugin_main" target="1.8" />
@@ -90,6 +90,8 @@
       <module name="loadtest_test" target="1.8" />
       <module name="mock_main" target="1.8" />
       <module name="mock_test" target="1.8" />
+      <module name="network-management-capsule_main" target="1.8" />
+      <module name="network-management-capsule_test" target="1.8" />
       <module name="network-management_integrationTest" target="1.8" />
       <module name="network-management_main" target="1.8" />
       <module name="network-management_test" target="1.8" />

build.gradle

@@ -294,7 +294,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']
+    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', 'doorman', 'doorman-hsm']
     license {
         name = 'Apache-2.0'
         url = 'https://www.apache.org/licenses/LICENSE-2.0'

network-management/build.gradle

@@ -11,7 +11,6 @@ description 'Network management module encapsulating components such as Doorman,
 apply plugin: 'us.kirchmeier.capsule'
 apply plugin: 'kotlin'
 apply plugin: 'kotlin-jpa'
-apply plugin: 'maven-publish'
 
 repositories {
     mavenLocal()
@@ -48,30 +47,6 @@ sourceSets {
     }
 }
 
-task buildDoormanJAR(type: FatCapsule, dependsOn: 'jar') {
-    group = 'build'
-    applicationClass 'com.r3.corda.networkmanage.doorman.MainKt'
-    archiveName "doorman-${version}-capsule.jar"
-    capsuleManifest {
-        applicationVersion = corda_dependency_version
-        systemProperties['visualvm.display.name'] = 'Doorman'
-        minJavaVersion = '1.8.0'
-        jvmArgs = ['-XX:+UseG1GC']
-    }
-}
-
-task buildHsmJAR(type: FatCapsule, dependsOn: 'jar') {
-    group = 'build'
-    applicationClass 'com.r3.corda.networkmanage.hsm.MainKt'
-    archiveName "hsm-${version}-capsule.jar"
-    capsuleManifest {
-        applicationVersion = corda_dependency_version
-        systemProperties['visualvm.display.name'] = 'HSM Signing Service'
-        minJavaVersion = '1.8.0'
-        jvmArgs = ['-XX:+UseG1GC']
-    }
-}
-
 task integrationTest(type: Test) {
     testClassesDirs = sourceSets.integrationTest.output.classesDirs
     classpath = sourceSets.integrationTest.runtimeClasspath
@@ -129,13 +104,3 @@ dependencies {
     // SQL connection pooling library
     compile "com.zaxxer:HikariCP:2.5.1"
 }
-
-publishing {
-    publications {
-        doorman(MavenPublication) {
-            artifact buildDoormanJAR {
-                classifier ""
-            }
-        }
-    }
-}

network-management/capsule-hsm/build.gradle

@@ -0,0 +1,36 @@
+apply plugin: 'net.corda.plugins.publish-utils'
+apply plugin: 'us.kirchmeier.capsule'
+apply plugin: 'com.jfrog.artifactory'
+
+description 'Doorman default'
+
+version project(':network-management').version
+
+configurations {
+    runtimeArtifacts.extendsFrom runtime
+}
+
+task buildHsmJAR(type: FatCapsule, dependsOn: 'jar') {
+    applicationClass 'com.r3.corda.networkmanage.hsm.MainKt'
+    archiveName "hsm-${version}-capsule.jar"
+    capsuleManifest {
+        applicationVersion = corda_dependency_version
+        systemProperties['visualvm.display.name'] = 'HSM Signing Service'
+        minJavaVersion = '1.8.0'
+        jvmArgs = ['-XX:+UseG1GC']
+    }
+    applicationSource = files(
+        project(':network-management').configurations.runtime,
+        project(':network-management').jar
+    )
+}
+
+artifacts {
+    runtimeArtifacts buildHsmJAR
+    publish buildHsmJAR
+}
+
+publish {
+    name 'doorman-hsm'
+    disableDefaultJar = true
+}

network-management/capsule/build.gradle

@@ -0,0 +1,36 @@
+apply plugin: 'net.corda.plugins.publish-utils'
+apply plugin: 'us.kirchmeier.capsule'
+apply plugin: 'com.jfrog.artifactory'
+
+description 'Doorman default'
+
+version project(':network-management').version
+
+configurations {
+    runtimeArtifacts.extendsFrom runtime
+}
+
+task buildDoormanJAR(type: FatCapsule, dependsOn: ':network-management:jar') {
+    applicationClass 'com.r3.corda.networkmanage.doorman.MainKt'
+    archiveName "doorman-${version}-capsule.jar"
+    capsuleManifest {
+        applicationVersion = corda_dependency_version
+        systemProperties['visualvm.display.name'] = 'Doorman'
+        minJavaVersion = '1.8.0'
+        jvmArgs = ['-XX:+UseG1GC']
+    }
+    applicationSource = files(
+        project(':network-management').configurations.runtime,
+        project(':network-management').jar
+    )
+}
+
+artifacts {
+    runtimeArtifacts buildDoormanJAR
+    publish buildDoormanJAR
+}
+
+publish {
+    name 'doorman'
+    disableDefaultJar = true
+}

settings.gradle

@@ -49,6 +49,8 @@ include 'samples:bank-of-corda-demo'
 include 'samples:business-network-demo'
 include 'cordform-common'
 include 'network-management'
+include 'network-management:capsule'
+include 'network-management:capsule-hsm'
 include 'verify-enclave'
 include 'hsm-tool'
 project(':hsm-tool').with {