CORDA-2893 Upgrade Corda to use Gradle 5.4.1 (Take 2) (#5137)

Upgrade Corda to use Gradle 5.4.1

build.gradle

@@ -118,18 +118,16 @@ buildscript {
         classpath "net.i2p.crypto:eddsa:$eddsa_version" // Needed for ServiceIdentityGenerator in the build environment.
         classpath "org.owasp:dependency-check-gradle:${dependency_checker_version}"
         classpath "org.jfrog.buildinfo:build-info-extractor-gradle:$artifactory_plugin_version"
+        // Capsule gradle plugin forked and maintained locally to support Gradle 5.x
+        // See https://github.com/corda/gradle-capsule-plugin
+        classpath "us.kirchmeier:gradle-capsule-plugin:1.0.4_r3"
     }
 }
 
 plugins {
-    // TODO The capsule plugin requires the newer DSL plugin block.It would be nice if we could unify all the plugins into one style,
-    // but the DSL has some restrictions e.g can't be used on the allprojects section. So we should revisit this if there are improvements in Gradle.
-    // Version 1.0.2 of this plugin uses capsule:1.0.1 by default.
-    id 'us.kirchmeier.capsule' version '1.0.2' apply false
-
     // Add the shadow plugin to the plugins classpath for the entire project.
     id 'com.github.johnrengelman.shadow' version '2.0.4' apply false
-    id "com.gradle.build-scan" version "1.16"
+    id "com.gradle.build-scan" version "2.2.1"
 }
 
 ext {
@@ -217,6 +215,8 @@ allprojects {
         // Prevent the project from creating temporary files outside of the build directory.
         systemProperty 'java.io.tmpdir', buildDir.absolutePath
 
+        maxHeapSize = "1g"
+
         if (project.hasProperty('test.parallel') && project.property('test.parallel').toBoolean()) {
             maxParallelForks = Runtime.runtime.availableProcessors().intdiv(2) as int ?: 1
         }
@@ -473,7 +473,7 @@ if (file('corda-docs-only-build').exists() || (System.getenv('CORDA_DOCS_ONLY_BU
 
 
 wrapper {
-    gradleVersion = "4.10.1"
+    gradleVersion = "5.4.1"
     distributionType = Wrapper.DistributionType.ALL
 }
 

common/configuration-parsing/build.gradle

@@ -28,4 +28,4 @@ jar {
 
 publish {
     name jar.baseName
-}
+}

common/logging/build.gradle

@@ -8,12 +8,12 @@ dependencies {
     compile group: "org.jetbrains.kotlin", name: "kotlin-reflect", version: kotlin_version
 
     compile group: "com.typesafe", name: "config", version: typesafe_config_version
-    compile "org.apache.logging.log4j:log4j-slf4j-impl:$log4j_version"
 
+    // Log4J: logging framework
+    compile "org.apache.logging.log4j:log4j-core:$log4j_version"
 
     compile "com.jcabi:jcabi-manifests:$jcabi_manifests_version"
 
-
     testCompile project(":test-utils")
 }
 

confidential-identities/build.gradle

@@ -31,8 +31,6 @@ dependencies {
 
 jar {
     baseName 'corda-confidential-identities'
-    preserveFileTimestamps = false
-    reproducibleFileOrder = true
 }
 
 publish {

constants.properties

@@ -3,7 +3,7 @@
 # their own projects. So don't get fancy with syntax!
 
 cordaVersion=5.0-SNAPSHOT
-gradlePluginsVersion=4.0.42
+gradlePluginsVersion=5.0.0
 kotlinVersion=1.2.71
 java8MinUpdateVersion=171
 # ***************************************************************#

core/build.gradle

@@ -143,6 +143,11 @@ configurations {
     testArtifacts.extendsFrom testRuntimeClasspath
 }
 
+tasks.withType(Test) {
+    // fork a new test process for every test class
+    forkEvery = 10
+}
+
 task testJar(type: Jar) {
     classifier "tests"
     from sourceSets.test.output

finance/contracts/build.gradle

@@ -31,8 +31,6 @@ configurations {
 
 jar {
     baseName 'corda-finance-contracts'
-    preserveFileTimestamps = false
-    reproducibleFileOrder = true
     manifest {
         attributes('Corda-Revision': 'n/a')
         attributes('Corda-Vendor': 'Corda Open Source')

finance/workflows/build.gradle

@@ -70,8 +70,6 @@ artifacts {
 
 jar {
     baseName 'corda-finance-workflows'
-    preserveFileTimestamps = false
-    reproducibleFileOrder = true
 }
 
 cordapp {

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,5 +1,21 @@
 #!/usr/bin/env sh
 
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"

gradlew.bat

@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      http://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome

isolated/build.gradle

@@ -7,11 +7,6 @@ dependencies {
     cordaCompile project(':core')
 }
 
-jar {
-    preserveFileTimestamps = false
-    reproducibleFileOrder = true
-}
-
 cordapp {
     targetPlatformVersion corda_platform_version.toInteger()
     minimumPlatformVersion 1

node/build.gradle

@@ -212,6 +212,12 @@ tasks.withType(JavaCompile) {
     options.compilerArgs << '-proc:none'
 }
 
+tasks.withType(Test) {
+    maxHeapSize = "2g"
+    // fork a new test process for every test class
+    forkEvery = 10
+}
+
 task integrationTest(type: Test) {
     testClassesDirs = sourceSets.integrationTest.output.classesDirs
     classpath = sourceSets.integrationTest.runtimeClasspath

settings.gradle

@@ -1,3 +1,12 @@
+pluginManagement {
+    ext.artifactory_contextUrl = 'https://software.r3.com/artifactory'
+
+    repositories {
+        mavenLocal()
+        gradlePluginPortal()
+        maven { url "$artifactory_contextUrl/corda-dependencies" }
+    }
+}
 // The project is named 'corda-project' and not 'corda' because if this is named the same as the
 // output JAR from the capsule then the buildCordaJAR task goes into an infinite loop.
 rootProject.name = 'corda-project'

tools/demobench/build.gradle

@@ -66,6 +66,7 @@ dependencies {
 
     // FontAwesomeFX: icons in the form of a font.
     compile "de.jensd:fontawesomefx-fontawesome:4.7.0-5"
+    compile 'de.jensd:fontawesomefx-commons:8.15'
 
     // JediTerm: the terminal emulator used in IntelliJ. We have forked it and tweaked it, see https://github.com/corda/jediterm
     compile ':terminal-331a005d6793e52cefc9e2cec6774e62d5a546b1'

tools/explorer/build.gradle

@@ -35,6 +35,7 @@ dependencies {
 
     // FontAwesomeFX: The "FontAwesome" icon library.
     compile 'de.jensd:fontawesomefx-fontawesome:4.7.0'
+    compile 'de.jensd:fontawesomefx-commons:8.13'
 
     // ReactFX: Functional reactive UI programming.
     compile 'org.reactfx:reactfx:2.0-M5'
@@ -67,4 +68,4 @@ jar {
             'Automatic-Module-Name': 'net.corda.tools.explorer'
         )
     }
-}
+}