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/22 10:16:14 UTC
[1/2] tapestry-5 git commit: Gradle 3 insists that we specify
destinations for reports even if they are disabled
Repository: tapestry-5
Updated Branches:
refs/heads/master 7368fdc53 -> 18b54a842
Gradle 3 insists that we specify destinations for reports even if they are disabled
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/b3e07f6d
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/b3e07f6d
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/b3e07f6d
Branch: refs/heads/master
Commit: b3e07f6d3a604b2266905c9888cc0d4f0082d627
Parents: 7368fdc
Author: Jochen Kemnade <jk...@apache.org>
Authored: Thu Sep 22 12:08:52 2016 +0200
Committer: Jochen Kemnade <jk...@apache.org>
Committed: Thu Sep 22 12:08:52 2016 +0200
----------------------------------------------------------------------
build.gradle | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b3e07f6d/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index c1db6cc..68b59ac 100755
--- a/build.gradle
+++ b/build.gradle
@@ -399,8 +399,14 @@ task combinedJacocoReport(type:JacocoReport){
enabled = true
destination = "$buildDir/reports/jacoco"
}
- xml.enabled = false
- csv.enabled = false
+ xml {
+ enabled = false
+ destination = "unused"
+ }
+ csv {
+ enabled = false
+ destination = "unused"
+ }
}
onlyIf = {
true
[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/18b54a84
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/18b54a84
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/18b54a84
Branch: refs/heads/master
Commit: 18b54a84232718c2c7c13838753f1f91acb9e194
Parents: b3e07f6
Author: Jochen Kemnade <jk...@apache.org>
Authored: Thu Sep 22 12:10:20 2016 +0200
Committer: Jochen Kemnade <jk...@apache.org>
Committed: Thu Sep 22 12:10:20 2016 +0200
----------------------------------------------------------------------
build.gradle | 2 +-
gradle/wrapper/gradle-wrapper.jar | Bin 53324 -> 52928 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/18b54a84/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 68b59ac..da137fd 100755
--- a/build.gradle
+++ b/build.gradle
@@ -424,7 +424,7 @@ task continuousIntegration {
}
task wrapper(type: Wrapper) {
- gradleVersion = '2.14.1'
+ gradleVersion = '3.1'
description "Regenerates the Gradle Wrapper files"
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/18b54a84/gradle/wrapper/gradle-wrapper.jar
----------------------------------------------------------------------
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 3baa851..6ffa237 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/18b54a84/gradle/wrapper/gradle-wrapper.properties
----------------------------------------------------------------------
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 2eff010..c558c90 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
+#Thu Sep 22 12:09:59 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.1-bin.zip
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/18b54a84/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/18b54a84/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