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 2014/07/01 19:32:35 UTC

[1/3] git commit: ensure build file compatibility with Gradle 2.0

Repository: tapestry-5
Updated Branches:
  refs/heads/master accbb5374 -> e457a43b8


ensure build file compatibility with Gradle 2.0


Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/a9755099
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/a9755099
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/a9755099

Branch: refs/heads/master
Commit: a9755099570039a87bb695731223ea45f76d1e3f
Parents: accbb53
Author: Jochen Kemnade <jk...@apache.org>
Authored: Tue Jul 1 18:51:05 2014 +0200
Committer: Jochen Kemnade <jk...@apache.org>
Committed: Tue Jul 1 18:51:05 2014 +0200

----------------------------------------------------------------------
 build.gradle                                         | 10 +++++-----
 quickstart/filtered/archetype-resources/build.gradle |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/a9755099/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 1869f64..4dd14e4 100755
--- a/build.gradle
+++ b/build.gradle
@@ -155,19 +155,19 @@ subprojects {
 
     sourceSets {
         main {
-            compileClasspath += configurations.provided
+            compileClasspath += [configurations.provided]
         }
         test {
-            compileClasspath += configurations.provided
-            runtimeClasspath += configurations.provided
+            compileClasspath += [configurations.provided]
+            runtimeClasspath += [configurations.provided]
         }
     }
 
     idea.module {
-        scopes.PROVIDED.plus += configurations.provided
+        scopes.PROVIDED.plus += [configurations.provided]
     }
 
-    eclipse.classpath.plusConfigurations += configurations.provided
+    eclipse.classpath.plusConfigurations += [configurations.provided]
 
     dependencies {
         testCompile "org.codehaus.groovy:groovy-all:${versions.groovy}"

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/a9755099/quickstart/filtered/archetype-resources/build.gradle
----------------------------------------------------------------------
diff --git a/quickstart/filtered/archetype-resources/build.gradle b/quickstart/filtered/archetype-resources/build.gradle
index 5182455..3df6f01 100644
--- a/quickstart/filtered/archetype-resources/build.gradle
+++ b/quickstart/filtered/archetype-resources/build.gradle
@@ -49,14 +49,14 @@ configurations {
 
 sourceSets {
     main {
-        compileClasspath += configurations.provided
+        compileClasspath += [configurations.provided]
         // To give the same path as IDEA has
         // output.resourcesDir = 'build/production/${artifactId}'
         // output.classesDir = 'build/production/${artifactId}'
     }
     test {
-        compileClasspath += configurations.provided
-        runtimeClasspath += configurations.provided
+        compileClasspath += [configurations.provided]
+        runtimeClasspath += [configurations.provided]
     }
 }
 


[3/3] git commit: update to Gradle 2.0

Posted by jk...@apache.org.
update to Gradle 2.0


Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/e457a43b
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/e457a43b
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/e457a43b

Branch: refs/heads/master
Commit: e457a43b880d534785be95ef822552dd333485a8
Parents: 7702038
Author: Jochen Kemnade <jk...@apache.org>
Authored: Tue Jul 1 19:31:37 2014 +0200
Committer: Jochen Kemnade <jk...@apache.org>
Committed: Tue Jul 1 19:31:37 2014 +0200

----------------------------------------------------------------------
 build.gradle                             |   2 +-
 gradle/wrapper/gradle-wrapper.jar        | Bin 51357 -> 51348 bytes
 gradle/wrapper/gradle-wrapper.properties |   4 ++--
 3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/e457a43b/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 4dd14e4..ee3ed2c 100755
--- a/build.gradle
+++ b/build.gradle
@@ -397,7 +397,7 @@ task continuousIntegration {
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '1.12'
+    gradleVersion = '2.0'
     description "Regenerates the Gradle Wrapper files"
 }
 

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/e457a43b/gradle/wrapper/gradle-wrapper.jar
----------------------------------------------------------------------
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index b49a12a..0087cd3 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/e457a43b/gradle/wrapper/gradle-wrapper.properties
----------------------------------------------------------------------
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a9db652..06a8e2c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Apr 29 12:59:50 CEST 2014
+#Tue Jul 01 18:20:48 CEST 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-1.12-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-bin.zip


[3/3] git commit: update to Gradle 2.0

Posted by jk...@apache.org.
update to Gradle 2.0


Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/e457a43b
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/e457a43b
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/e457a43b

Branch: refs/heads/master
Commit: e457a43b880d534785be95ef822552dd333485a8
Parents: 7702038
Author: Jochen Kemnade <jk...@apache.org>
Authored: Tue Jul 1 19:31:37 2014 +0200
Committer: Jochen Kemnade <jk...@apache.org>
Committed: Tue Jul 1 19:31:37 2014 +0200

----------------------------------------------------------------------
 build.gradle                             |   2 +-
 gradle/wrapper/gradle-wrapper.jar        | Bin 51357 -> 51348 bytes
 gradle/wrapper/gradle-wrapper.properties |   4 ++--
 3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/e457a43b/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 4dd14e4..ee3ed2c 100755
--- a/build.gradle
+++ b/build.gradle
@@ -397,7 +397,7 @@ task continuousIntegration {
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '1.12'
+    gradleVersion = '2.0'
     description "Regenerates the Gradle Wrapper files"
 }
 

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/e457a43b/gradle/wrapper/gradle-wrapper.jar
----------------------------------------------------------------------
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index b49a12a..0087cd3 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/e457a43b/gradle/wrapper/gradle-wrapper.properties
----------------------------------------------------------------------
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a9db652..06a8e2c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Apr 29 12:59:50 CEST 2014
+#Tue Jul 01 18:20:48 CEST 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-1.12-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-bin.zip


[2/3] git commit: update ANTLR to 3.5.2, fixes issues when building the grammar with Java 8 see https://github.com/antlr/antlr3/issues/151

Posted by jk...@apache.org.
update ANTLR to 3.5.2, fixes issues when building the grammar with Java 8
see https://github.com/antlr/antlr3/issues/151


Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/77020385
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/77020385
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/77020385

Branch: refs/heads/master
Commit: 7702038519af9a548de52b757446b02212f7165f
Parents: a975509
Author: Jochen Kemnade <jk...@apache.org>
Authored: Tue Jul 1 19:08:32 2014 +0200
Committer: Jochen Kemnade <jk...@apache.org>
Committed: Tue Jul 1 19:08:32 2014 +0200

----------------------------------------------------------------------
 tapestry-core/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/77020385/tapestry-core/build.gradle
----------------------------------------------------------------------
diff --git a/tapestry-core/build.gradle b/tapestry-core/build.gradle
index 41c2adf..c16cd48 100644
--- a/tapestry-core/build.gradle
+++ b/tapestry-core/build.gradle
@@ -27,12 +27,12 @@ dependencies {
     compile "commons-codec:commons-codec:1.5"
 
     // Transitive will bring in the unwanted string template library as well
-    compile "org.antlr:antlr-runtime:3.3", {
+    compile "org.antlr:antlr-runtime:3.5.2", {
         exclude group: "org.antlr", module: "stringtemplate"
     }
 
     // Antlr3 tool path used with the antlr3 task
-    antlr3 "org.antlr:antlr:3.3"
+    antlr3 "org.antlr:antlr:3.5.2"
 
     testRuntime "org.hsqldb:hsqldb:1.8.0.10"
 }


[2/3] git commit: update ANTLR to 3.5.2, fixes issues when building the grammar with Java 8 see https://github.com/antlr/antlr3/issues/151

Posted by jk...@apache.org.
update ANTLR to 3.5.2, fixes issues when building the grammar with Java 8
see https://github.com/antlr/antlr3/issues/151


Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/77020385
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/77020385
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/77020385

Branch: refs/heads/master
Commit: 7702038519af9a548de52b757446b02212f7165f
Parents: a975509
Author: Jochen Kemnade <jk...@apache.org>
Authored: Tue Jul 1 19:08:32 2014 +0200
Committer: Jochen Kemnade <jk...@apache.org>
Committed: Tue Jul 1 19:08:32 2014 +0200

----------------------------------------------------------------------
 tapestry-core/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/77020385/tapestry-core/build.gradle
----------------------------------------------------------------------
diff --git a/tapestry-core/build.gradle b/tapestry-core/build.gradle
index 41c2adf..c16cd48 100644
--- a/tapestry-core/build.gradle
+++ b/tapestry-core/build.gradle
@@ -27,12 +27,12 @@ dependencies {
     compile "commons-codec:commons-codec:1.5"
 
     // Transitive will bring in the unwanted string template library as well
-    compile "org.antlr:antlr-runtime:3.3", {
+    compile "org.antlr:antlr-runtime:3.5.2", {
         exclude group: "org.antlr", module: "stringtemplate"
     }
 
     // Antlr3 tool path used with the antlr3 task
-    antlr3 "org.antlr:antlr:3.3"
+    antlr3 "org.antlr:antlr:3.5.2"
 
     testRuntime "org.hsqldb:hsqldb:1.8.0.10"
 }