This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new a5fdcad Update Geode to build with Gradle 5.0 (#2931)
a5fdcad is described below
commit a5fdcad85ebb407deed08102f35514a1d3ad2423
Author: Robert Houghton <[email protected]>
AuthorDate: Mon Dec 10 10:27:46 2018 -0800
Update Geode to build with Gradle 5.0 (#2931)
* Java 11 support
* Dependency version alignment
* Better build output caching
---
.../gradle/plugins/dockerizedtest/DockerizedExecHandle.java | 12 +++++++++---
geode-assembly/build.gradle | 2 +-
gradle/java.gradle | 9 +++++++--
gradle/wrapper/gradle-wrapper.properties | 2 +-
settings.gradle | 3 ---
5 files changed, 18 insertions(+), 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
index 11e3ac6..d4cb4e7 100755
---
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.ExecHandleShutdownHookAction;
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 @@ public class DockerizedExecHandle implements ExecHandle,
ProcessSettings {
}
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 @@ public class DockerizedExecHandle implements ExecHandle,
ProcessSettings {
}
void started() {
- ShutdownHookActionRegister.addAction(shutdownHookAction);
+ ShutdownHooks.addShutdownHook(shutdownHookAction);
buildCancellationToken.addCallback(shutdownHookAction);
setState(ExecHandleState.STARTED);
broadcast.getSource().executionStarted(this);
@@ -545,6 +545,12 @@ public class DockerizedExecHandle implements ExecHandle,
ProcessSettings {
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
index 2e3cbea..42c1f6b 100755
--- 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
index 874e577..ad6f681 100644
--- 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
index 4e97471..ee67112 100644
--- 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
index a4a2cc2..41a557b 100644
--- 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
}
}
-
