CORDA-2750: Modularise the DJVM build. (#4897)

* CORDA-2750: Modularise the DJVM build.

* CORDA-2750: Update documentation and scripts for modular DJVM.

build.gradle

@@ -363,8 +363,6 @@ bintrayConfig {
             'corda-core',
             'corda-core-deterministic',
             'corda-deterministic-verifier',
-            'corda-djvm',
-            'corda-djvm-cli',
             'corda',
             'corda-finance-workflows',
             'corda-finance-contracts',

constants.properties

@@ -2,8 +2,6 @@
 # because some versions here need to be matched by app authors in
 # their own projects. So don't get fancy with syntax!
 
-# It is also parsed by the scripts in djvm/shell/.
-
 cordaVersion=5.0-SNAPSHOT
 gradlePluginsVersion=4.0.42
 kotlinVersion=1.2.71

djvm/.gitignore

@@ -1,3 +1,13 @@
-tmp/
+# DJVM-specific files
+**/tmp/
 *.log
 *.log.gz
+
+# IntelliJ
+*.iml
+*.ipr
+*.iws
+.idea/
+
+**/out/
+

djvm/build.gradle

@@ -1,91 +1,120 @@
+buildscript {
+    ext {
+        corda_djvm_version = '5.0-SNAPSHOT'
+        artifactory_contextUrl = 'https://ci-artifactory.corda.r3cev.com/artifactory'
+    }
+
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+    }
+}
+
 plugins {
-    id 'com.github.johnrengelman.shadow'
-    id 'net.corda.plugins.publish-utils'
-    id 'com.jfrog.artifactory'
-    id 'idea'
+    id 'net.corda.plugins.publish-utils' version '4.0.42' apply false
+    id 'com.github.johnrengelman.shadow' version '5.0.0' apply false
+    id 'com.jfrog.artifactory' version '4.7.3' apply false
+    id 'com.jfrog.bintray' version '1.4' apply false
+    id 'com.gradle.build-scan' version '2.2.1'
 }
 
-description 'Corda deterministic JVM sandbox'
+import static org.gradle.api.JavaVersion.*
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
-ext {
-    // Shaded version of ASM to avoid conflict with root project.
-    asm_version = '6.2.1'
-}
+subprojects {
+    group 'net.corda'
+    version corda_djvm_version
 
-repositories {
-    maven {
-        url "$artifactory_contextUrl/corda-dev"
+    repositories {
+        mavenCentral()
+        jcenter()
+    }
+
+    tasks.withType(JavaCompile) {
+        sourceCompatibility = VERSION_1_8
+        targetCompatibility = VERSION_1_8
+        options.encoding = 'UTF-8'
+    }
+
+    tasks.withType(KotlinCompile) {
+        kotlinOptions {
+            languageVersion = '1.2'
+            apiVersion = '1.2'
+            jvmTarget = VERSION_1_8
+            javaParameters = true   // Useful for reflection.
+            freeCompilerArgs = ['-Xjvm-default=enable']
+        }
+    }
+
+    tasks.withType(Jar) { task ->
+        manifest {
+            attributes('Corda-Vendor': 'Corda Open Source')
+            attributes('Automatic-Module-Name': "net.corda.${task.project.name.replaceAll('-', '.')}")
+        }
+    }
+
+    tasks.withType(Test) {
+        // Prevent the project from creating temporary files outside of the build directory.
+        systemProperty 'java.io.tmpdir', buildDir.absolutePath
     }
 }
 
-configurations {
-    testImplementation.extendsFrom shadow
-    jdkRt.resolutionStrategy {
-        // Always check the repository for a newer SNAPSHOT.
-        cacheChangingModulesFor 0, 'seconds'
+apply plugin: 'net.corda.plugins.publish-utils'
+apply plugin: 'com.jfrog.artifactory'
+
+bintrayConfig {
+    user = System.getenv('CORDA_BINTRAY_USER')
+    key = System.getenv('CORDA_BINTRAY_KEY')
+    repo = 'corda'
+    org = 'r3'
+    licenses = ['Apache-2.0']
+    vcsUrl = 'https://github.com/corda/corda'
+    projectUrl = 'https://github.com/corda/corda'
+    gpgSign = true
+    gpgPassphrase = System.getenv('CORDA_BINTRAY_GPG_PASSPHRASE')
+    publications = [
+        'corda-djvm',
+        'corda-djvm-cli'
+    ]
+    license {
+        name = 'Apache-2.0'
+        url = 'https://www.apache.org/licenses/LICENSE-2.0'
+        distribution = 'repo'
+    }
+    developer {
+        id = 'R3'
+        name = 'R3'
+        email = 'dev@corda.net'
     }
 }
 
-dependencies {
-    shadow "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    shadow "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
-    shadow "org.slf4j:slf4j-api:$slf4j_version"
+artifactory {
+    publish {
+        contextUrl = artifactory_contextUrl
+        repository {
+            repoKey = 'corda-dev'
+            username = System.getenv('CORDA_ARTIFACTORY_USERNAME')
+            password = System.getenv('CORDA_ARTIFACTORY_PASSWORD')
+        }
 
-    // ASM: byte code manipulation library
-    implementation "org.ow2.asm:asm:$asm_version"
-    implementation "org.ow2.asm:asm-commons:$asm_version"
-
-    // ClassGraph: classpath scanning
-    shadow "io.github.classgraph:classgraph:$class_graph_version"
-
-    // Test utilities
-    testImplementation "junit:junit:$junit_version"
-    testImplementation "org.assertj:assertj-core:$assertj_version"
-    testImplementation "org.apache.logging.log4j:log4j-slf4j-impl:$log4j_version"
-    jdkRt "net.corda:deterministic-rt:latest.integration"
-}
-
-jar.enabled = false
-
-shadowJar {
-    baseName 'corda-djvm'
-    classifier ''
-    relocate 'org.objectweb.asm', 'djvm.org.objectweb.asm'
-
-    // These particular classes are only needed to "bootstrap"
-    // the compilation of the other sandbox classes. At runtime,
-    // we will generate better versions from deterministic-rt.jar.
-    exclude 'sandbox/java/lang/Appendable.class'
-    exclude 'sandbox/java/lang/CharSequence.class'
-    exclude 'sandbox/java/lang/Character\$Subset.class'
-    exclude 'sandbox/java/lang/Character\$Unicode*.class'
-    exclude 'sandbox/java/lang/Comparable.class'
-    exclude 'sandbox/java/lang/Enum.class'
-    exclude 'sandbox/java/lang/Iterable.class'
-    exclude 'sandbox/java/lang/StackTraceElement.class'
-    exclude 'sandbox/java/lang/StringBuffer.class'
-    exclude 'sandbox/java/lang/StringBuilder.class'
-    exclude 'sandbox/java/nio/**'
-    exclude 'sandbox/java/util/**'
-}
-assemble.dependsOn shadowJar
-
-tasks.withType(Test) {
-    systemProperty 'deterministic-rt.path', configurations.jdkRt.asPath
-}
-
-artifacts {
-    publish shadowJar
-}
-
-publish {
-    dependenciesFrom configurations.shadow
-    name shadowJar.baseName
-}
-
-idea {
-    module {
-        downloadJavadoc = true
-        downloadSources = true
+        defaults {
+            // The root project has applied 'publish-utils' but has nothing to publish.
+            if (project != rootProject) {
+                publications(project.extensions.publish.name())
+            }
+        }
     }
 }
+
+wrapper {
+    gradleVersion = "5.2.1"
+    distributionType = Wrapper.DistributionType.ALL
+}
+
+buildScan {
+    termsOfServiceUrl = 'https://gradle.com/terms-of-service'
+    termsOfServiceAgree = 'yes'
+}

djvm/djvm/build.gradle

@@ -0,0 +1,87 @@
+plugins {
+    id 'org.jetbrains.kotlin.jvm'
+    id 'com.github.johnrengelman.shadow'
+    id 'net.corda.plugins.publish-utils'
+    id 'com.jfrog.artifactory'
+    id 'idea'
+}
+
+description 'Corda deterministic JVM sandbox'
+
+repositories {
+    maven {
+        url "$artifactory_contextUrl/corda-dev"
+    }
+}
+
+configurations {
+    testImplementation.extendsFrom shadow
+    jdkRt.resolutionStrategy {
+        // Always check the repository for a newer SNAPSHOT.
+        cacheChangingModulesFor 0, 'seconds'
+    }
+}
+
+dependencies {
+    shadow "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+    shadow "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
+    shadow "org.slf4j:slf4j-api:$slf4j_version"
+
+    // ASM: byte code manipulation library
+    implementation "org.ow2.asm:asm:$asm_version"
+    implementation "org.ow2.asm:asm-commons:$asm_version"
+
+    // ClassGraph: classpath scanning
+    shadow "io.github.classgraph:classgraph:$class_graph_version"
+
+    // Test utilities
+    testImplementation "junit:junit:$junit_version"
+    testImplementation "org.assertj:assertj-core:$assertj_version"
+    testImplementation "org.apache.logging.log4j:log4j-slf4j-impl:$log4j_version"
+    jdkRt "net.corda:deterministic-rt:latest.integration"
+}
+
+jar.enabled = false
+
+shadowJar {
+    archiveBaseName = 'corda-djvm'
+    archiveClassifier = ''
+    relocate 'org.objectweb.asm', 'djvm.org.objectweb.asm'
+
+    // These particular classes are only needed to "bootstrap"
+    // the compilation of the other sandbox classes. At runtime,
+    // we will generate better versions from deterministic-rt.jar.
+    exclude 'sandbox/java/lang/Appendable.class'
+    exclude 'sandbox/java/lang/CharSequence.class'
+    exclude 'sandbox/java/lang/Character\$Subset.class'
+    exclude 'sandbox/java/lang/Character\$Unicode*.class'
+    exclude 'sandbox/java/lang/Comparable.class'
+    exclude 'sandbox/java/lang/Enum.class'
+    exclude 'sandbox/java/lang/Iterable.class'
+    exclude 'sandbox/java/lang/StackTraceElement.class'
+    exclude 'sandbox/java/lang/StringBuffer.class'
+    exclude 'sandbox/java/lang/StringBuilder.class'
+    exclude 'sandbox/java/nio/**'
+    exclude 'sandbox/java/util/**'
+}
+assemble.dependsOn shadowJar
+
+tasks.withType(Test) {
+    systemProperty 'deterministic-rt.path', configurations.jdkRt.asPath
+}
+
+artifacts {
+    publish shadowJar
+}
+
+publish {
+    dependenciesFrom configurations.shadow
+    name shadowJar.baseName
+}
+
+idea {
+    module {
+        downloadJavadoc = true
+        downloadSources = true
+    }
+}

djvm/djvm/cli/build.gradle

@@ -1,4 +1,5 @@
 plugins {
+    id 'org.jetbrains.kotlin.jvm'
     id 'com.github.johnrengelman.shadow'
     id 'net.corda.plugins.publish-utils'
     id 'com.jfrog.artifactory'
@@ -14,6 +15,7 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
     implementation "org.jetbrains.kotlin:kotlin-reflect"
     implementation "org.apache.logging.log4j:log4j-slf4j-impl:$log4j_version"
+    implementation "org.apache.logging.log4j:log4j-core:$log4j_version"
     implementation "com.jcabi:jcabi-manifests:$jcabi_manifests_version"
 
     implementation "info.picocli:picocli:$picocli_version"
@@ -23,8 +25,8 @@ dependencies {
 jar.enabled = false
 
 shadowJar {
-    baseName = djvmName
-    classifier = ''
+    archiveBaseName = djvmName
+    archiveClassifier = ''
     manifest {
         attributes(
             'Automatic-Module-Name': 'net.corda.djvm.cli',
@@ -36,8 +38,8 @@ shadowJar {
 }
 
 task shadowZip(type: Zip) {
-    baseName = djvmName
-    classifier = ''
+    archiveBaseName = djvmName
+    archiveClassifier = ''
 
     from(shadowJar) {
         rename "$djvmName-(.*).jar", "${djvmName}.jar"

djvm/djvm/shell/djvm

@@ -3,8 +3,7 @@
 file="${BASH_SOURCE[0]}"
 linked_file="$(test -L "$file" && readlink "$file" || echo "$file")"
 base_dir="$(cd "$(dirname "$linked_file")/../" && pwd)"
-version="$(cat $base_dir/../constants.properties | sed -n 's/^[ ]*cordaVersion[ =]*\(.*\).*$/\1/p')"
-jar_file="$base_dir/cli/build/libs/corda-djvm-$version-cli.jar"
+djvm_cli_jar=$(ls -1 $base_dir/cli/build/libs/corda-djvm-cli-*.jar)
 
 CLASSPATH="${CLASSPATH:-}"
 
@@ -17,4 +16,4 @@ if [ "$DEBUG" != 0 ]; then
     DEBUG_AGENT="-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=$DEBUG_PORT"
 fi
 
-java $DEBUG_AGENT -cp "$CLASSPATH:.:tmp:$jar_file" net.corda.djvm.tools.cli.Program "$@"
+java $DEBUG_AGENT -cp "$CLASSPATH:.:tmp:$djvm_cli_jar" net.corda.djvm.tools.cli.Program "$@"

djvm/djvm/shell/install

@@ -2,16 +2,23 @@
 
 file="${BASH_SOURCE[0]}"
 base_dir="$(cd "$(dirname "$file")/" && pwd)"
-version="$(cat $base_dir/../../constants.properties | sed -n 's/^[ ]*cordaVersion[ =]*\(.*\).*$/\1/p')"
 
 # Build DJVM module and CLI
 cd "$base_dir/.."
-../gradlew shadowJar
+if !(../gradlew shadowJar); then
+    echo "Failed to build DJVM"
+    exit 1
+fi
+
+djvm_cli_jar=$(ls -1 $base_dir/../cli/build/libs/corda-djvm-cli-*.jar)
 
 # Generate auto-completion file for Bash and ZSH
 cd "$base_dir"
-java -cp "$base_dir/../cli/build/libs/corda-djvm-$version-cli.jar" \
-    picocli.AutoComplete -n djvm net.corda.djvm.tools.cli.Commands -f
+if !(java -cp $djvm_cli_jar \
+    picocli.AutoComplete -n djvm net.corda.djvm.tools.cli.Commands -f); then
+    echo "Failed to generate auto-completion file"
+    exit 1
+fi
 
 # Create a symbolic link to the `djvm` utility
 sudo ln -sf "$base_dir/djvm" /usr/local/bin/djvm