[2/2] tapestry-5 git commit: upgrade Gradle wrapper

2017-10-10 Thread jkemnade 
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/d528181b
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/d528181b
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/d528181b

Branch: refs/heads/master
Commit: d528181bb55d0e9322f1a632a12e773306b7ecbe
Parents: e4d4382
Author: Jochen Kemnade 
Authored: Tue Oct 10 09:24:40 2017 +0200
Committer: Jochen Kemnade 
Committed: Tue Oct 10 09:24:40 2017 +0200

--
 build.gradle|   6 ++
 gradle/wrapper/gradle-wrapper.jar   | Bin 54708 -> 54708 bytes
 gradle/wrapper/gradle-wrapper.properties|   4 ++--
 quickstart/build.gradle |   4 ++--
 .../filtered/archetype-resources/build.gradle   |   4 ++--
 tapestry-test/build.gradle  |   1 +
 6 files changed, 9 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/d528181b/build.gradle
--
diff --git a/build.gradle b/build.gradle
index 603ad17..601b973 100755
--- a/build.gradle
+++ b/build.gradle
@@ -397,15 +397,13 @@ task combinedJacocoReport(type:JacocoReport){
   reports {
   html {
 enabled = true
-destination = "$buildDir/reports/jacoco"
+destination = file("$buildDir/reports/jacoco")
   }
   xml {
 enabled = false
-destination = "unused"
   }
   csv {
 enabled = false
-destination = "unused"
   }
   }
   onlyIf = {
@@ -424,7 +422,7 @@ task continuousIntegration {
 }
 
 task wrapper(type: Wrapper) {
-gradleVersion = '3.5.1'
+gradleVersion = '4.2'
 description "Regenerates the Gradle Wrapper files"
 }
 

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/d528181b/gradle/wrapper/gradle-wrapper.jar
--
diff --git a/gradle/wrapper/gradle-wrapper.jar 
b/gradle/wrapper/gradle-wrapper.jar
index 7a3265e..736fb7d 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/d528181b/gradle/wrapper/gradle-wrapper.properties
--
diff --git a/gradle/wrapper/gradle-wrapper.properties 
b/gradle/wrapper/gradle-wrapper.properties
index 651f764..52dd1f0 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.5.1-bin.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.2-bin.zip

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/d528181b/quickstart/build.gradle
--
diff --git a/quickstart/build.gradle b/quickstart/build.gradle
index 5c215d3..a499357 100644
--- a/quickstart/build.gradle
+++ b/quickstart/build.gradle
@@ -17,10 +17,10 @@ task processFiltered(type: Copy) {
 
 inputs.file srcDir
 inputs.file file("${rootDir}/build.gradle")
-outputs.dir sourceSets.main.output.classesDir
+outputs.dir sourceSets.main.java.outputDir
 
 from srcDir
-into sourceSets.main.output.classesDir
+into sourceSets.main.java.outputDir
 
 // Use some of the filters provided by Ant
 filter(FixCrLfFilter)

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/d528181b/quickstart/filtered/archetype-resources/build.gradle
--
diff --git a/quickstart/filtered/archetype-resources/build.gradle 
b/quickstart/filtered/archetype-resources/build.gradle
index f3dca79..eeed246 100644
--- a/quickstart/filtered/archetype-resources/build.gradle
+++ b/quickstart/filtered/archetype-resources/build.gradle
@@ -2,7 +2,7 @@ description = "${artifactId} application"
 
 apply plugin: "war"
 apply plugin: "java"
-apply plugin: "jetty"
+apply plugin: "gretty"
 
 sourceCompatibility = "1.8"
 targetCompatibility = "1.8"
@@ -87,7 +87,7 @@ test {
 }
 
 task wrapper(type: Wrapper) {
-gradleVersion = '2.3'
+gradleVersion = '4.2'
 }
 
 // TODO: Configure execution mode for jettyRun task

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/d528181b/tapestry-test/build.gradle
--
diff --git a/tapestry-test/build.gradle b/tapestry-test/build.gradle
index f0dc96d..f46ecc0 100644
--- a/tapestry-test/build.gradle
+++

[2/2] tapestry-5 git commit: upgrade Gradle wrapper

2016-09-22 Thread jkemnade 
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 
Authored: Thu Sep 22 12:10:20 2016 +0200
Committer: Jochen Kemnade 
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

[2/2] tapestry-5 git commit: upgrade Gradle wrapper

2016-09-12 Thread jkemnade 
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 
Authored: Mon Sep 12 09:45:57 2016 +0200
Committer: Jochen Kemnade 
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

[2/2] tapestry-5 git commit: upgrade Gradle wrapper

2016-02-11 Thread jkemnade 
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/2dd5bb52
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/2dd5bb52
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/2dd5bb52

Branch: refs/heads/master
Commit: 2dd5bb5256c1b3dbd08a71d48538f4e764a38ee1
Parents: a0a3c06
Author: Jochen Kemnade 
Authored: Thu Feb 11 11:40:43 2016 +0100
Committer: Jochen Kemnade 
Committed: Thu Feb 11 11:40:43 2016 +0100

--
 build.gradle |   2 +-
 gradle/wrapper/gradle-wrapper.jar| Bin 53636 -> 53638 bytes
 gradle/wrapper/gradle-wrapper.properties |   4 ++--
 gradlew.bat  |   2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/2dd5bb52/build.gradle
--
diff --git a/build.gradle b/build.gradle
index 4f39370..78762f4 100755
--- a/build.gradle
+++ b/build.gradle
@@ -455,7 +455,7 @@ task continuousIntegration {
 }
 
 task wrapper(type: Wrapper) {
-gradleVersion = '2.10'
+gradleVersion = '2.11'
 description "Regenerates the Gradle Wrapper files"
 }
 

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/2dd5bb52/gradle/wrapper/gradle-wrapper.jar
--
diff --git a/gradle/wrapper/gradle-wrapper.jar 
b/gradle/wrapper/gradle-wrapper.jar
index 13372ae..5ccda13 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/2dd5bb52/gradle/wrapper/gradle-wrapper.properties
--
diff --git a/gradle/wrapper/gradle-wrapper.properties 
b/gradle/wrapper/gradle-wrapper.properties
index cd319fe..e1aba6f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Dec 29 15:25:29 CET 2015
+#Thu Feb 11 11:40:38 CET 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.11-bin.zip

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/2dd5bb52/gradlew.bat
--
diff --git a/gradlew.bat b/gradlew.bat
index aec9973..72d362d 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -46,7 +46,7 @@ echo location of your Java installation.
 goto fail
 
 :init
-@rem Get command-line arguments, handling Windowz variants
+@rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
 if "%@eval[2+2]" == "4" goto 4NT_args