You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by jk...@apache.org on 2016/09/12 07:46:10 UTC
[1/2] tapestry-5 git commit: Revert "upgrade Gradle wrapper"
Repository: tapestry-5
Updated Branches:
refs/heads/master cc2813255 -> 78ff4456f
Revert "upgrade Gradle wrapper"
This reverts commit 2ed0a7ca1301f3944111e0fc8139dff4c28e0f76.
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/694f7abf
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/694f7abf
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/694f7abf
Branch: refs/heads/master
Commit: 694f7abfc2693c2b12ac989a7742d83daa4892f3
Parents: cc28132
Author: Jochen Kemnade <jo...@eddyson.de>
Authored: Mon Sep 12 09:43:19 2016 +0200
Committer: Jochen Kemnade <jo...@eddyson.de>
Committed: Mon Sep 12 09:43:19 2016 +0200
----------------------------------------------------------------------
build.gradle | 2 +-
gradle/wrapper/gradle-wrapper.jar | Bin 52818 -> 53324 bytes
gradle/wrapper/gradle-wrapper.properties | 4 ++--
gradlew | 5 -----
gradlew.bat | 6 ++++++
5 files changed, 9 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/694f7abf/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 5ee217f..c1db6cc 100755
--- a/build.gradle
+++ b/build.gradle
@@ -418,7 +418,7 @@ task continuousIntegration {
}
task wrapper(type: Wrapper) {
- gradleVersion = '3.0.0'
+ gradleVersion = '2.14.1'
description "Regenerates the Gradle Wrapper files"
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/694f7abf/gradle/wrapper/gradle-wrapper.jar
----------------------------------------------------------------------
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index deedc7f..3baa851 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/694f7abf/gradle/wrapper/gradle-wrapper.properties
----------------------------------------------------------------------
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 949f0cb..2eff010 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Sep 12 09:21:40 CEST 2016
+#Wed Jul 20 15:08:04 CEST 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.0.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/694f7abf/gradlew
----------------------------------------------------------------------
diff --git a/gradlew b/gradlew
index 9aa616c..27309d9 100755
--- a/gradlew
+++ b/gradlew
@@ -161,9 +161,4 @@ function splitJvmOpts() {
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [[ "$(uname)" == "Darwin" ]] && [[ "$HOME" == "$PWD" ]]; then
- cd "$(dirname "$0")"
-fi
-
exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/694f7abf/gradlew.bat
----------------------------------------------------------------------
diff --git a/gradlew.bat b/gradlew.bat
index e95643d..f6d5974 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -49,6 +49,7 @@ goto fail
@rem Get command-line arguments, handling Windows variants
if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
:win9xME_args
@rem Slurp the command line arguments.
@@ -59,6 +60,11 @@ set _SKIP=2
if "x%~1" == "x" goto execute
set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
:execute
@rem Setup the command line
[2/2] tapestry-5 git commit: upgrade Gradle wrapper
Posted by jk...@apache.org.
upgrade Gradle wrapper
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/78ff4456
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/78ff4456
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/78ff4456
Branch: refs/heads/master
Commit: 78ff4456f5e08c513999660af53b1663a659d169
Parents: 694f7ab
Author: Jochen Kemnade <jo...@eddyson.de>
Authored: Mon Sep 12 09:45:57 2016 +0200
Committer: Jochen Kemnade <jo...@eddyson.de>
Committed: Mon Sep 12 09:45:57 2016 +0200
----------------------------------------------------------------------
build.gradle | 2 +-
gradle/wrapper/gradle-wrapper.jar | Bin 53324 -> 52818 bytes
gradle/wrapper/gradle-wrapper.properties | 4 ++--
gradlew | 5 +++++
gradlew.bat | 6 ------
5 files changed, 8 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/78ff4456/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index c1db6cc..f031805 100755
--- a/build.gradle
+++ b/build.gradle
@@ -418,7 +418,7 @@ task continuousIntegration {
}
task wrapper(type: Wrapper) {
- gradleVersion = '2.14.1'
+ gradleVersion = '3.0'
description "Regenerates the Gradle Wrapper files"
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/78ff4456/gradle/wrapper/gradle-wrapper.jar
----------------------------------------------------------------------
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 3baa851..deedc7f 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/78ff4456/gradle/wrapper/gradle-wrapper.properties
----------------------------------------------------------------------
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 2eff010..4d77fdb 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Jul 20 15:08:04 CEST 2016
+#Mon Sep 12 09:43:42 CEST 2016
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.0-bin.zip
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/78ff4456/gradlew
----------------------------------------------------------------------
diff --git a/gradlew b/gradlew
index 27309d9..9aa616c 100755
--- a/gradlew
+++ b/gradlew
@@ -161,4 +161,9 @@ function splitJvmOpts() {
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [[ "$(uname)" == "Darwin" ]] && [[ "$HOME" == "$PWD" ]]; then
+ cd "$(dirname "$0")"
+fi
+
exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/78ff4456/gradlew.bat
----------------------------------------------------------------------
diff --git a/gradlew.bat b/gradlew.bat
index f6d5974..e95643d 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -49,7 +49,6 @@ goto fail
@rem Get command-line arguments, handling Windows variants
if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
:win9xME_args
@rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2
if "x%~1" == "x" goto execute
set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
:execute
@rem Setup the command line