Update Geode to build with Gradle 5.0 (apache#2931)

* Java 11 support * Dependency version alignment * Better build output caching
IronOnet · Dec 10, 2018 · a5fdcad · a5fdcad
1 parent 9adaffc
commit a5fdcad
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 10 deletions.
diff --git a/buildSrc/src/main/java/com/pedjak/gradle/plugins/dockerizedtest/DockerizedExecHandle.java b/buildSrc/src/main/java/com/pedjak/gradle/plugins/dockerizedtest/DockerizedExecHandle.java
@@ -64,7 +64,7 @@
 import org.gradle.process.internal.ExecHandleState;
 import org.gradle.process.internal.ProcessSettings;
 import org.gradle.process.internal.StreamsHandler;
-import org.gradle.process.internal.shutdown.ShutdownHookActionRegister;
+import org.gradle.process.internal.shutdown.ShutdownHooks;
 
 /**
  * Default implementation for the ExecHandle interface.
@@ -225,7 +225,7 @@ private boolean stateIn(ExecHandleState... states) {
   }
 
   private void setEndStateInfo(ExecHandleState newState, int exitValue, Throwable failureCause) {
-    ShutdownHookActionRegister.removeAction(shutdownHookAction);
+    ShutdownHooks.removeShutdownHook(shutdownHookAction);
     buildCancellationToken.removeCallback(shutdownHookAction);
     ExecHandleState currentState;
     lock.lock();
@@ -367,7 +367,7 @@ void detached() {
   }
 
   void started() {
-    ShutdownHookActionRegister.addAction(shutdownHookAction);
+    ShutdownHooks.addShutdownHook(shutdownHookAction);
     buildCancellationToken.addCallback(shutdownHookAction);
     setState(ExecHandleState.STARTED);
     broadcast.getSource().executionStarted(this);
@@ -545,6 +545,12 @@ public void stop() {
       inputHandler.stop();
       outputHandler.stop();
     }
+
+    @Override
+    public void disconnect() {
+      inputHandler.disconnect();
+      outputHandler.disconnect();
+    }
   }
 
   private class DockerizedProcess extends Process {

diff --git a/geode-assembly/build.gradle b/geode-assembly/build.gradle
@@ -81,7 +81,7 @@ gradle.taskGraph.whenReady( { graph ->
 repositories {
   ivy {
     url 'https://archive.apache.org/'
-    layout 'pattern', {
+    patternLayout {
       artifact '/dist/tomcat/tomcat-6/v6.0.37/bin/[organisation]-[module]-[revision].[ext]'
     }
   }

diff --git a/gradle/java.gradle b/gradle/java.gradle
@@ -47,6 +47,9 @@ subprojects {
       }
       javac.options.incremental = true
       javac.options.fork = true
+      javac.options.forkOptions.with({
+        memoryMaximumSize = "768m"
+      })
       if (project.hasProperty('compileJVM') && !compileJVM.trim().isEmpty()) {
         javac.options.forkOptions.executable = compileJVM + "/bin/javac"
       }
@@ -69,8 +72,10 @@ subprojects {
       }
       jar.metaInf {
         from("$rootDir/LICENSE")
-        if (jar.source.filter({ it.name.contains('NOTICE') }).empty) {
-          from("$rootDir/NOTICE")
+        jar.doLast {
+          if (jar.source.filter({ it.name.contains('NOTICE') }).empty) {
+            from("$rootDir/NOTICE")
+          }
         }
       }
     }

diff --git a/gradle/wrapper/gradle-wrapper.properties b/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.0-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/settings.gradle b/settings.gradle
@@ -62,11 +62,8 @@ if (GradleVersion.current() < GradleVersion.version(minimumGradleVersion)) {
   throw new GradleException('Running with unsupported Gradle Version. Use Gradle Wrapper or with Gradle version >= ' + minimumGradleVersion)
 }
 
-enableFeaturePreview('STABLE_PUBLISHING')
-
 buildCache {
   local {
     enabled = true
   }
 }
-