CORDA-3224 JDK11 built and published artifacts to include classifier. (#5488)

* JDK11 built and published artifacts to include classifier.

* Added additional non-intuitive gradle dust sprinkled recommended by CR.

* Added additional non-intuitive gradle dust sprinkled recommended by CR.

* Bump corda gradle plugins version.

* Incorporating PR review feedback.

* jdk11Classifier

build.gradle

@@ -25,10 +25,12 @@ buildscript {
     if (JavaVersion.current() == JavaVersion.VERSION_11) {
         ext.quasar_version = constants.getProperty("quasarVersion11")
         ext.quasar_classifier = constants.getProperty("quasarClassifier11")
+        ext.jdkClassifier = constants.getProperty("jdkClassifier11")
     }
     else {
         ext.quasar_version = constants.getProperty("quasarVersion")
         ext.quasar_classifier = constants.getProperty("quasarClassifier")
+        ext.jdkClassifier = constants.getProperty("jdkClassifier")
     }
     ext.quasar_exclusions = [
             'co.paralleluniverse**',
@@ -316,6 +318,12 @@ allprojects {
         }
     }
 
+    jar {
+        // JDK11 built and published artifacts to include classifier
+        if (jdkClassifier != null)
+            archiveClassifier = jdkClassifier
+    }
+
     group 'net.corda'
     version "$corda_release_version"
 

constants.properties

@@ -3,7 +3,7 @@
 # their own projects. So don't get fancy with syntax!
 
 cordaVersion=4.3-SNAPSHOT
-gradlePluginsVersion=5.0.3
+gradlePluginsVersion=5.0.4
 kotlinVersion=1.2.71
 java8MinUpdateVersion=171
 # ***************************************************************#
@@ -17,6 +17,8 @@ quasarVersion=0.7.10
 quasarClassifier=jdk8
 # Quasar version to use with Java 11:
 quasarVersion11=0.8.0
+# Specify a classifier for Java 11 built artifacts
+jdkClassifier11=jdk11
 proguardVersion=6.1.1
 bouncycastleVersion=1.60
 classgraphVersion=4.8.41

node/capsule/build.gradle

@@ -36,7 +36,10 @@ capsule {
 
 task buildCordaJAR(type: FatCapsule, dependsOn: project(':node').tasks.jar) {
     applicationClass 'net.corda.node.Corda'
-    archiveName "corda-${corda_release_version}.jar"
+    archiveBaseName = 'corda'
+    archiveVersion = corda_release_version
+    archiveClassifier = jdkClassifier
+    archiveName = archiveFileName.get()
     applicationSource = files(
         project(':node').configurations.runtimeClasspath,
         project(':node').tasks.jar,

testing/testserver/testcapsule/build.gradle

@@ -26,7 +26,10 @@ capsule {
 
 task buildWebserverJar(type: FatCapsule, dependsOn: project(':node').tasks.jar) {
     applicationClass 'net.corda.webserver.WebServer'
-    archiveName "corda-testserver-${corda_release_version}.jar"
+    archiveBaseName = 'corda-testserver'
+    archiveVersion = corda_release_version
+    archiveClassifier = jdkClassifier
+    archiveName = archiveFileName.get()
     applicationSource = files(
         project(':testing:testserver').configurations.runtimeClasspath,
         project(':testing:testserver').tasks.jar,

tools/explorer/capsule/build.gradle

@@ -17,13 +17,15 @@ capsule {
 
 task buildExplorerJAR(type: FatCapsule, dependsOn: project(':tools:explorer').tasks.jar) {
     applicationClass 'net.corda.explorer.Main'
-    archiveName "node-explorer-${corda_release_version}.jar"
+    archiveBaseName = 'node-explorer'
+    archiveVersion = corda_release_version
+    archiveClassifier = jdkClassifier
+    archiveName = archiveFileName.get()
     applicationSource = files(
         project(':tools:explorer').configurations.runtimeClasspath,
         project(':tools:explorer').tasks.jar,
         project(':tools:explorer').sourceSets.main.java.outputDir.toString() + '/ExplorerCaplet.class'
     )
-    classifier 'fat'
 
     capsuleManifest {
         applicationVersion = corda_release_version

tools/network-builder/build.gradle

@@ -73,7 +73,7 @@ processResources {
 
 shadowJar {
     baseName = 'network-builder'
-    classifier = null
+    archiveClassifier = jdkClassifier
     version = null
     zip64 true
 }
@@ -83,12 +83,11 @@ assemble.dependsOn buildNetworkBuilder
 
 artifacts {
     publish shadowJar {
-        classifier = ""
+        archiveClassifier = jdkClassifier
     }
 }
 
 jar {
-    classifier "ignore"
     enabled = false
 }
 

tools/shell-cli/build.gradle

@@ -35,12 +35,12 @@ assemble.dependsOn buildShellCli
 
 artifacts {
     publish shadowJar {
-        classifier = ""
+        archiveClassifier = jdkClassifier
     }
 }
 
 jar {
-    classifier "ignore"
+    archiveClassifier = "ignore"
     enabled = false
 }