geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mbr...@apache.org
Subject geode git commit: GEODE-2708: Update Gradle Wrapper To 3.5.1
Date Mon, 21 Aug 2017 20:37:50 GMT
Repository: geode
Updated Branches:
  refs/heads/develop 99aa7c1f6 -> 7038eb902


GEODE-2708: Update Gradle Wrapper To 3.5.1

While updating the Gradle wrapper from 2.14.1 to 3.5.1, it was found that the
ANTLR plugin causing an issue inside the Eclipse IDE. The fix was to declare the
ANTLR dependency version for the antlr configuration. If no version is set for
the antlr plugin, it will default to 2.7.7. However, this was causing an issue
for Eclipse and other IDE's because the plugin was modifying the antlr
configuration after the initial dependency resolution was done.

- Updated Gradle Wrapper to 3.5.1
- Added antlr dependency to the antlr configuration

Verified by importing project into Eclipse and also running build from
command-line


Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/7038eb90
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/7038eb90
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/7038eb90

Branch: refs/heads/develop
Commit: 7038eb90200d64fb499aca6a2d01f84e19c88c5d
Parents: 99aa7c1
Author: Mark Bretl <mbretl@apache.org>
Authored: Mon Aug 21 13:20:46 2017 -0700
Committer: Mark Bretl <mbretl@kollective.com>
Committed: Mon Aug 21 13:32:08 2017 -0700

----------------------------------------------------------------------
 geode-core/build.gradle                  | 4 +++-
 gradle.properties                        | 2 +-
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode/blob/7038eb90/geode-core/build.gradle
----------------------------------------------------------------------
diff --git a/geode-core/build.gradle b/geode-core/build.gradle
index 9ecb0f9..795c124 100755
--- a/geode-core/build.gradle
+++ b/geode-core/build.gradle
@@ -31,7 +31,9 @@ configurations {
 }
 
 dependencies {
-   // Source Dependencies
+  // Source Dependencies
+  antlr 'antlr:antlr:' + project.'antlr.version'
+
   // External
   provided files("${System.getProperty('java.home')}/../lib/tools.jar")
   compile 'com.github.stephenc.findbugs:findbugs-annotations:' + project.'stephenc-findbugs.version'

http://git-wip-us.apache.org/repos/asf/geode/blob/7038eb90/gradle.properties
----------------------------------------------------------------------
diff --git a/gradle.properties b/gradle.properties
index 9462295..042cf42 100755
--- a/gradle.properties
+++ b/gradle.properties
@@ -42,7 +42,7 @@ productOrg = Apache Software Foundation (ASF)
 org.gradle.daemon = true
 org.gradle.jvmargs = -Xmx2048m
 
-minimumGradleVersion = 2.14.1
+minimumGradleVersion = 3.5.1
 # Set this on the command line with -P or in ~/.gradle/gradle.properties
 # to change the buildDir location.  Use an absolute path.
 buildRoot=

http://git-wip-us.apache.org/repos/asf/geode/blob/7038eb90/gradle/wrapper/gradle-wrapper.properties
----------------------------------------------------------------------
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index d57b5d9..2fad278 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.5.1-bin.zip


Mime
View raw message