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/04/26 11:32:32 UTC
[1/2] git commit: updated build to gradle-1.12-rc-1
Repository: tapestry-5
Updated Branches:
refs/heads/master 536013cb4 -> fc9c89ac7
updated build to gradle-1.12-rc-1
- updated wrapper
- use `compile` configuration instead of deprecated `groovy` configuration for groovy dependency
- use `maven` syntax instead of deprecated `mavenRepo` syntax
- `idea.project` should only be configured for root project
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/9612824b
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/9612824b
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/9612824b
Branch: refs/heads/master
Commit: 9612824b363ac16e6f1fe85a72a6692db4ed983a
Parents: 536013c
Author: Peter Niederwieser <pn...@gmail.com>
Authored: Sun Apr 20 03:04:56 2014 +0200
Committer: Jochen Kemnade <jo...@web.de>
Committed: Sat Apr 26 11:03:46 2014 +0200
----------------------------------------------------------------------
build.gradle | 27 ++++++++++---------
gradle/wrapper/gradle-wrapper.jar | Bin 46707 -> 51357 bytes
gradle/wrapper/gradle-wrapper.properties | 4 +--
.../filtered/archetype-resources/build.gradle | 26 +++++++++++++-----
tapestry-jpa/build.gradle | 5 +++-
5 files changed, 40 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/9612824b/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 36d96f3..ce85b86 100755
--- a/build.gradle
+++ b/build.gradle
@@ -91,16 +91,9 @@ allprojects {
mavenCentral()
// All things JBoss/Hibernate
- mavenRepo name: "JBoss", url: "https://repository.jboss.org/nexus/content/repositories/releases/"
- }
-
- idea {
- project {
- // Leave at 1.5 to make sure that IDEA doesn't break the build for non-IDEA users by inserting
- // @Override on implementations all over the place.
- languageLevel = "1.5"
- // But this is what most (all?) of the devs are actually using:
- jdkName = "1.7"
+ maven {
+ name "JBoss"
+ url "https://repository.jboss.org/nexus/content/repositories/releases/"
}
}
@@ -111,6 +104,16 @@ allprojects {
}
+idea {
+ project {
+ // Leave at 1.5 to make sure that IDEA doesn't break the build for non-IDEA users by inserting
+ // @Override on implementations all over the place.
+ languageLevel = "1.5"
+ // But this is what most (all?) of the devs are actually using:
+ jdkName = "1.7"
+ }
+}
+
// Specific to top-level build, not set for subprojects:
configurations {
@@ -169,7 +172,7 @@ subprojects {
eclipse.classpath.plusConfigurations += configurations.provided
dependencies {
- groovy "org.codehaus.groovy:groovy-all:${versions.groovy}"
+ compile "org.codehaus.groovy:groovy-all:${versions.groovy}"
deployerJars "org.apache.maven.wagon:wagon-http-lightweight:1.0-beta-6"
@@ -394,7 +397,7 @@ task continuousIntegration {
}
task wrapper(type: Wrapper) {
- gradleVersion = '1.3'
+ gradleVersion = '1.12-rc-1'
description "Regenerates the Gradle Wrapper files"
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/9612824b/gradle/wrapper/gradle-wrapper.jar
----------------------------------------------------------------------
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index b6b646b..722a83e 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/9612824b/gradle/wrapper/gradle-wrapper.properties
----------------------------------------------------------------------
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 36e7a7d..0cb679b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Dec 20 19:06:17 CET 2012
+#Sun Apr 20 02:35:03 CEST 2014
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-1.12-rc-1-bin.zip
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/9612824b/quickstart/filtered/archetype-resources/build.gradle
----------------------------------------------------------------------
diff --git a/quickstart/filtered/archetype-resources/build.gradle b/quickstart/filtered/archetype-resources/build.gradle
index 6a82d70..5182455 100644
--- a/quickstart/filtered/archetype-resources/build.gradle
+++ b/quickstart/filtered/archetype-resources/build.gradle
@@ -16,16 +16,28 @@ repositories {
mavenCentral()
// All things JBoss/Hibernate
- mavenRepo name: "JBoss", url: "http://repository.jboss.org/nexus/content/groups/public/"
-
+ maven {
+ name "JBoss"
+ url "http://repository.jboss.org/nexus/content/groups/public/"
+ }
+
// For stable versions of the tapx libraries
- mavenRepo name: "HLS", url: "http://howardlewisship.com/repository/"
-
+ maven {
+ name "HLS"
+ url "http://howardlewisship.com/repository/"
+ }
+
// For non-stable versions of the tapx libraries
- mavenRepo name: "HLS Snapshots", url: "http://howardlewisship.com/snapshot-repository/"
-
+ maven {
+ name "HLS Snapshots"
+ url "http://howardlewisship.com/snapshot-repository/"
+ }
+
// For access to Apache Staging (Preview) packages
- mavenRepo name: "Apache Staging", url: "https://repository.apache.org/content/groups/staging"
+ maven {
+ name "Apache Staging"
+ url "https://repository.apache.org/content/groups/staging"
+ }
}
// This simulates Maven's "provided" scope, until it is officially supported by Gradle
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/9612824b/tapestry-jpa/build.gradle
----------------------------------------------------------------------
diff --git a/tapestry-jpa/build.gradle b/tapestry-jpa/build.gradle
index 9ec388d..4fdf9fd 100644
--- a/tapestry-jpa/build.gradle
+++ b/tapestry-jpa/build.gradle
@@ -13,7 +13,10 @@ dependencies {
}
repositories {
- mavenRepo name: "EclipseLink", url: "http://download.eclipse.org/rt/eclipselink/maven.repo/"
+ maven {
+ name "EclipseLink"
+ url "http://download.eclipse.org/rt/eclipselink/maven.repo/"
+ }
}
test {
[2/2] git commit: TAP-2299: update Gradle wrapper to 1.12-rc-2 make
groovy a testCompile dependency
Posted by jk...@apache.org.
TAP-2299: update Gradle wrapper to 1.12-rc-2
make groovy a testCompile dependency
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/fc9c89ac
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/fc9c89ac
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/fc9c89ac
Branch: refs/heads/master
Commit: fc9c89ac762a7adac80d7368c62a15817fd9656a
Parents: 9612824
Author: Jochen Kemnade <jo...@web.de>
Authored: Sat Apr 26 11:08:35 2014 +0200
Committer: Jochen Kemnade <jo...@web.de>
Committed: Sat Apr 26 11:08:35 2014 +0200
----------------------------------------------------------------------
build.gradle | 4 ++--
gradle/wrapper/gradle-wrapper.properties | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/fc9c89ac/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index ce85b86..bf5c708 100755
--- a/build.gradle
+++ b/build.gradle
@@ -172,7 +172,7 @@ subprojects {
eclipse.classpath.plusConfigurations += configurations.provided
dependencies {
- compile "org.codehaus.groovy:groovy-all:${versions.groovy}"
+ testCompile "org.codehaus.groovy:groovy-all:${versions.groovy}"
deployerJars "org.apache.maven.wagon:wagon-http-lightweight:1.0-beta-6"
@@ -397,7 +397,7 @@ task continuousIntegration {
}
task wrapper(type: Wrapper) {
- gradleVersion = '1.12-rc-1'
+ gradleVersion = '1.12-rc-2'
description "Regenerates the Gradle Wrapper files"
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/fc9c89ac/gradle/wrapper/gradle-wrapper.properties
----------------------------------------------------------------------
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0cb679b..495d7b7 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun Apr 20 02:35:03 CEST 2014
+#Sat Apr 26 11:07: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-rc-1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-1.12-rc-2-bin.zip
[2/2] git commit: TAP-2299: update Gradle wrapper to 1.12-rc-2 make
groovy a testCompile dependency
Posted by jk...@apache.org.
TAP-2299: update Gradle wrapper to 1.12-rc-2
make groovy a testCompile dependency
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/fc9c89ac
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/fc9c89ac
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/fc9c89ac
Branch: refs/heads/master
Commit: fc9c89ac762a7adac80d7368c62a15817fd9656a
Parents: 9612824
Author: Jochen Kemnade <jo...@web.de>
Authored: Sat Apr 26 11:08:35 2014 +0200
Committer: Jochen Kemnade <jo...@web.de>
Committed: Sat Apr 26 11:08:35 2014 +0200
----------------------------------------------------------------------
build.gradle | 4 ++--
gradle/wrapper/gradle-wrapper.properties | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/fc9c89ac/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index ce85b86..bf5c708 100755
--- a/build.gradle
+++ b/build.gradle
@@ -172,7 +172,7 @@ subprojects {
eclipse.classpath.plusConfigurations += configurations.provided
dependencies {
- compile "org.codehaus.groovy:groovy-all:${versions.groovy}"
+ testCompile "org.codehaus.groovy:groovy-all:${versions.groovy}"
deployerJars "org.apache.maven.wagon:wagon-http-lightweight:1.0-beta-6"
@@ -397,7 +397,7 @@ task continuousIntegration {
}
task wrapper(type: Wrapper) {
- gradleVersion = '1.12-rc-1'
+ gradleVersion = '1.12-rc-2'
description "Regenerates the Gradle Wrapper files"
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/fc9c89ac/gradle/wrapper/gradle-wrapper.properties
----------------------------------------------------------------------
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0cb679b..495d7b7 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun Apr 20 02:35:03 CEST 2014
+#Sat Apr 26 11:07: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-rc-1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-1.12-rc-2-bin.zip