You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by hl...@apache.org on 2012/01/06 17:43:54 UTC
svn commit: r1228256 - in /tapestry/tapestry5/trunk: build.gradle
gradle/wrapper/gradle-wrapper.jar gradle/wrapper/gradle-wrapper.properties
tapestry-core/build.gradle
Author: hlship
Date: Fri Jan 6 16:43:53 2012
New Revision: 1228256
URL: http://svn.apache.org/viewvc?rev=1228256&view=rev
Log:
Fix build script problems that prevented use of Gradle 1.0-milestone-7
Modified:
tapestry/tapestry5/trunk/build.gradle
tapestry/tapestry5/trunk/gradle/wrapper/gradle-wrapper.jar
tapestry/tapestry5/trunk/gradle/wrapper/gradle-wrapper.properties
tapestry/tapestry5/trunk/tapestry-core/build.gradle
Modified: tapestry/tapestry5/trunk/build.gradle
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/build.gradle?rev=1228256&r1=1228255&r2=1228256&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/build.gradle (original)
+++ tapestry/tapestry5/trunk/build.gradle Fri Jan 6 16:43:53 2012
@@ -10,7 +10,7 @@ testngVersion = '5.14.9'
easymockVersion = '3.0'
servletAPIVersion = '2.5'
-// Provided so that Jenkins can override the normal version number for nightly builds.
+// Provided so that the CI server can override the normal version number for nightly builds.
version = System.getProperty('project-version', tapestryVersion)
stagingUrl = "https://repository.apache.org/service/local/staging/deploy/maven2/"
@@ -32,15 +32,12 @@ allprojects {
idea {
project {
- jdkName = "1.5"
+ // Technically, Tapestry is built for JDK 1.5, but we're all using Eclipse or IntelliJ with
+ // JDK 1.6 at this point.
+ jdkName = "1.6"
}
}
-// idea.project.ipr {
-// beforeMerged { project -> project.modulePaths.clear() }
-// }
-
-
}
subprojects {
@@ -238,7 +235,7 @@ task generateRelease(dependsOn: ['quicks
description: "Generates and uploads a final release to Apache Nexus")
task wrapper(type: Wrapper) {
- gradleVersion = '1.0-milestone-6'
+ gradleVersion = '1.0-milestone-7'
description = "Regenerates the Gradle Wrapper files"
}
Modified: tapestry/tapestry5/trunk/gradle/wrapper/gradle-wrapper.jar
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/gradle/wrapper/gradle-wrapper.jar?rev=1228256&r1=1228255&r2=1228256&view=diff
==============================================================================
Files tapestry/tapestry5/trunk/gradle/wrapper/gradle-wrapper.jar (original) and tapestry/tapestry5/trunk/gradle/wrapper/gradle-wrapper.jar Fri Jan 6 16:43:53 2012 differ
Modified: tapestry/tapestry5/trunk/gradle/wrapper/gradle-wrapper.properties
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/gradle/wrapper/gradle-wrapper.properties?rev=1228256&r1=1228255&r2=1228256&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/gradle/wrapper/gradle-wrapper.properties (original)
+++ tapestry/tapestry5/trunk/gradle/wrapper/gradle-wrapper.properties Fri Jan 6 16:43:53 2012
@@ -1,6 +1,6 @@
-#Wed Jan 04 14:49:13 PST 2012
+#Fri Jan 06 08:32:03 PST 2012
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=http\://repo.gradle.org/gradle/distributions/gradle-1.0-milestone-6-bin.zip
+distributionUrl=http\://repo.gradle.org/gradle/distributions/gradle-1.0-milestone-7-bin.zip
Modified: tapestry/tapestry5/trunk/tapestry-core/build.gradle
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/build.gradle?rev=1228256&r1=1228255&r2=1228256&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/build.gradle (original)
+++ tapestry/tapestry5/trunk/tapestry-core/build.gradle Fri Jan 6 16:43:53 2012
@@ -48,9 +48,9 @@ task generateGrammarSource {
}
}
-ideaModule.doFirst {
+ideaModule.dependsOn generateGrammarSource
- tasks.generateGrammarSource.execute()
+ideaModule.doFirst {
excludeDirs -= buildDir