You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2012/05/01 21:25:13 UTC
svn commit: r1332790 - in /tapestry/tapestry5/branches/5.3: ./
gradle/wrapper/ plastic/ quickstart/
quickstart/src/main/resources/archetype-resources/
quickstart/src/main/resources/archetype-resources/gradle/ tapestry-core/
tapestry-func/ tapestry-hibe...
Author: hlship
Date: Tue May 1 19:25:12 2012
New Revision: 1332790
URL: http://svn.apache.org/viewvc?rev=1332790&view=rev
Log:
Upgrade to Gradle 1.0-rc-3
Fix a number of Gradle warnings from the upgrade
Copy the root project's gradle wrapper into the quickstart archetype
Removed:
tapestry/tapestry5/branches/5.3/quickstart/src/main/resources/archetype-resources/gradle/
tapestry/tapestry5/branches/5.3/quickstart/src/main/resources/archetype-resources/gradlew
tapestry/tapestry5/branches/5.3/quickstart/src/main/resources/archetype-resources/gradlew.bat
Modified:
tapestry/tapestry5/branches/5.3/build.gradle
tapestry/tapestry5/branches/5.3/gradle/wrapper/gradle-wrapper.jar
tapestry/tapestry5/branches/5.3/gradle/wrapper/gradle-wrapper.properties
tapestry/tapestry5/branches/5.3/gradlew
tapestry/tapestry5/branches/5.3/md5.gradle
tapestry/tapestry5/branches/5.3/plastic/build.gradle
tapestry/tapestry5/branches/5.3/quickstart/build.gradle
tapestry/tapestry5/branches/5.3/ssh.gradle
tapestry/tapestry5/branches/5.3/tapestry-core/build.gradle
tapestry/tapestry5/branches/5.3/tapestry-func/build.gradle
tapestry/tapestry5/branches/5.3/tapestry-hibernate-core/build.gradle
tapestry/tapestry5/branches/5.3/tapestry-hibernate/build.gradle
tapestry/tapestry5/branches/5.3/tapestry-ioc/build.gradle
tapestry/tapestry5/branches/5.3/tapestry-spring/build.gradle
tapestry/tapestry5/branches/5.3/tapestry-test/build.gradle
tapestry/tapestry5/branches/5.3/tapestry-upload/build.gradle
Modified: tapestry/tapestry5/branches/5.3/build.gradle
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/5.3/build.gradle?rev=1332790&r1=1332789&r2=1332790&view=diff
==============================================================================
--- tapestry/tapestry5/branches/5.3/build.gradle (original)
+++ tapestry/tapestry5/branches/5.3/build.gradle Tue May 1 19:25:12 2012
@@ -1,4 +1,3 @@
-
description = "Apache Tapestry 5 Project"
apply plugin: "base"
@@ -7,40 +6,45 @@ apply plugin: "sonar"
apply from: "ssh.gradle"
apply from: "md5.gradle"
-// Remember that when generating a release, this should be incremented. Also don"t forget to
-// tag the release in Subversion.
-tapestryVersion = "5.3.3"
-
-jettyVersion = "7.0.0.v20091005"
-tomcatVersion = "6.0.30"
-testngVersion = "5.14.9"
-easymockVersion = "3.0"
-servletAPIVersion = "2.5"
+project.ext.versions = [
+ // Remember that when generating a release, this should be incremented. Also don"t forget to
+ // tag the release in Subversion.
+ tapestry: "5.3.4-rc-1",
+ jetty: "7.0.0.v20091005",
+ tomcat: "6.0.30",
+ testng: "5.14.9",
+ easymock: "3.0",
+ servletapi: "2.5",
+ spock: "0.6-groovy-1.8"
+]
// Provided so that the CI server can override the normal version number for nightly builds.
-version = System.getProperty("project-version", tapestryVersion)
+version = System.getProperty("project-version", versions.tapestry)
// Let analysis.apache.org get in touch with our builds
-sonarUrl = System.getProperty("sonarUrl", "http://analysis.apache.org");
-sonarDbUrl = System.getProperty("sonarDbUrl", "");
-sonarDbUsername = System.getProperty("sonarDbUsername", "");
-sonarDbPassword = System.getProperty("sonarDbPassword", "");
-sonarDbDriverClassName = "com.mysql.jdbc.Driver"
-stagingUrl = "https://repository.apache.org/service/local/staging/deploy/maven2/"
-snapshotUrl = "https://repository.apache.org/content/repositories/snapshots"
+project.ext {
+ sonarUrl = System.getProperty("sonarUrl", "http://analysis.apache.org");
+ sonarDbUrl = System.getProperty("sonarDbUrl", "");
+ sonarDbUsername = System.getProperty("sonarDbUsername", "");
+ sonarDbPassword = System.getProperty("sonarDbPassword", "");
+ sonarDbDriverClassName = "com.mysql.jdbc.Driver"
+
+ stagingUrl = "https://repository.apache.org/service/local/staging/deploy/maven2/"
+ snapshotUrl = "https://repository.apache.org/content/repositories/snapshots"
-doSign = !project.hasProperty("noSign") && project.hasProperty("signing.keyId")
+ doSign = !project.hasProperty("noSign") && project.hasProperty("signing.keyId")
-// apacheDeployUserName and apacheDeployPassword should be specified in ~/.gradle/gradle.properties
+ // apacheDeployUserName and apacheDeployPassword should be specified in ~/.gradle/gradle.properties
-deployUsernameProperty = isSnapshot() ? "snapshotDeployUserName" : "apacheDeployUserName"
-deployPasswordProperty = isSnapshot() ? "snapshotDeployPassword" : "apacheDeployPassword"
+ deployUsernameProperty = isSnapshot() ? "snapshotDeployUserName" : "apacheDeployUserName"
+ deployPasswordProperty = isSnapshot() ? "snapshotDeployPassword" : "apacheDeployPassword"
-canDeploy = [deployUsernameProperty, deployPasswordProperty].every { project.hasProperty(it) }
+ canDeploy = [deployUsernameProperty, deployPasswordProperty].every { project.hasProperty(it) }
-deployUsername = { getProperty(deployUsernameProperty) }
-deployPassword = { getProperty(deployPasswordProperty) }
+ deployUsername = { getProperty(deployUsernameProperty) }
+ deployPassword = { getProperty(deployPasswordProperty) }
+}
sonar {
server {
@@ -198,11 +202,11 @@ subprojects {
if (canDeploy) {
repositories {
- project.deployer = repositories.mavenDeployer {
+ project.ext.deployer = repositories.mavenDeployer {
- if (doSign) {
- beforeDeployment { MavenDeployment deployment -> signPom(deployment) }
- }
+ if (doSign) {
+ beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
+ }
repository(url: stagingUrl) {
authentication(userName: deployUsername(), password: deployPassword())
@@ -229,7 +233,7 @@ task aggregateJavadoc(type: Javadoc) {
description "Build the aggregated JavaDocs for all modules"
maxMemory "512m"
- destinationDir file("$buildDirName/documentation/javadocs")
+ destinationDir file("$buildDir/documentation/javadocs")
configure(options) {
splitIndex true
linkSource true
@@ -355,14 +359,8 @@ task zippedBinaries(type:Zip) {
into sub.name
}
}
-
-
-
}
-
-
-
if (canDeploy) {
configurations {
Modified: tapestry/tapestry5/branches/5.3/gradle/wrapper/gradle-wrapper.jar
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/5.3/gradle/wrapper/gradle-wrapper.jar?rev=1332790&r1=1332789&r2=1332790&view=diff
==============================================================================
Files tapestry/tapestry5/branches/5.3/gradle/wrapper/gradle-wrapper.jar (original) and tapestry/tapestry5/branches/5.3/gradle/wrapper/gradle-wrapper.jar Tue May 1 19:25:12 2012 differ
Modified: tapestry/tapestry5/branches/5.3/gradle/wrapper/gradle-wrapper.properties
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/5.3/gradle/wrapper/gradle-wrapper.properties?rev=1332790&r1=1332789&r2=1332790&view=diff
==============================================================================
--- tapestry/tapestry5/branches/5.3/gradle/wrapper/gradle-wrapper.properties (original)
+++ tapestry/tapestry5/branches/5.3/gradle/wrapper/gradle-wrapper.properties Tue May 1 19:25:12 2012
@@ -1,6 +1,6 @@
-#Tue Jan 24 09:36:54 PST 2012
+#Tue May 01 11:29:19 PDT 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-7-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.0-rc-3-bin.zip
Modified: tapestry/tapestry5/branches/5.3/gradlew
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/5.3/gradlew?rev=1332790&r1=1332789&r2=1332790&view=diff
==============================================================================
--- tapestry/tapestry5/branches/5.3/gradlew (original)
+++ tapestry/tapestry5/branches/5.3/gradlew Tue May 1 19:25:12 2012
@@ -105,10 +105,9 @@ if [ "$cygwin" = "false" -a "$darwin" =
fi
fi
-# For Darwin, add APP_NAME to the JAVA_OPTS as -Xdock:name
+# For Darwin, add options to specify how the application appears in the dock
if $darwin; then
- JAVA_OPTS="$JAVA_OPTS -Xdock:name=$APP_NAME"
-# we may also want to set -Xdock:image
+ GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi
# For Cygwin, switch paths to Windows format before running java
Modified: tapestry/tapestry5/branches/5.3/md5.gradle
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/5.3/md5.gradle?rev=1332790&r1=1332789&r2=1332790&view=diff
==============================================================================
--- tapestry/tapestry5/branches/5.3/md5.gradle (original)
+++ tapestry/tapestry5/branches/5.3/md5.gradle Tue May 1 19:25:12 2012
@@ -22,4 +22,4 @@ class GenMD5 extends SourceTask {
}
}
-project.GenMD5 = GenMD5.class
+project.ext.GenMD5 = GenMD5.class
Modified: tapestry/tapestry5/branches/5.3/plastic/build.gradle
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/5.3/plastic/build.gradle?rev=1332790&r1=1332789&r2=1332790&view=diff
==============================================================================
--- tapestry/tapestry5/branches/5.3/plastic/build.gradle (original)
+++ tapestry/tapestry5/branches/5.3/plastic/build.gradle Tue May 1 19:25:12 2012
@@ -2,7 +2,7 @@ description = "Plastic core framework"
dependencies {
- testCompile "org.spockframework:spock-core:0.6-groovy-1.8"
+ testCompile "org.spockframework:spock-core:$versions.spock"
}
test {
Modified: tapestry/tapestry5/branches/5.3/quickstart/build.gradle
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/5.3/quickstart/build.gradle?rev=1332790&r1=1332789&r2=1332790&view=diff
==============================================================================
--- tapestry/tapestry5/branches/5.3/quickstart/build.gradle (original)
+++ tapestry/tapestry5/branches/5.3/quickstart/build.gradle Tue May 1 19:25:12 2012
@@ -1,12 +1,22 @@
import org.apache.tools.ant.filters.FixCrLfFilter
import org.apache.tools.ant.filters.ReplaceTokens
+// Copy the gradle wrapper files from the project root
+processResources {
+ from(rootDir) {
+ include "gradlew"
+ include "gradlew.bat"
+ include "gradle/**"
+ into "archetype-resources"
+ }
+}
+
task processFiltered(type: Copy) {
- srcDir = file('filtered')
+ ext.srcDir = file('filtered')
inputs.file srcDir
- inputs.file file("../build.gradle")
+ inputs.file file("${rootDir}/build.gradle")
outputs.dir sourceSets.main.output.classesDir
from srcDir
@@ -17,9 +27,9 @@ task processFiltered(type: Copy) {
filter(ReplaceTokens, tokens: [
quickstartVersion: version,
tapestryReleaseVersion: version,
- servletApiReleaseVersion: servletAPIVersion,
- testngReleaseVersion: testngVersion,
- easymockReleaseVersion: easymockVersion,
+ servletApiReleaseVersion: versions.servletapi,
+ testngReleaseVersion: versions.testng,
+ easymockReleaseVersion: versions.easymock,
year: new GregorianCalendar()[Calendar.YEAR].toString()
])
}
Modified: tapestry/tapestry5/branches/5.3/ssh.gradle
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/5.3/ssh.gradle?rev=1332790&r1=1332789&r2=1332790&view=diff
==============================================================================
--- tapestry/tapestry5/branches/5.3/ssh.gradle (original)
+++ tapestry/tapestry5/branches/5.3/ssh.gradle Tue May 1 19:25:12 2012
@@ -1,6 +1,6 @@
-project.Scp = Scp.class
-project.SshExec = SshExec.class
-project.SshTask = SshTask.class
+project.ext.Scp = Scp.class
+project.ext.SshExec = SshExec.class
+project.ext.SshTask = SshTask.class
configurations {
sshAntTask
Modified: tapestry/tapestry5/branches/5.3/tapestry-core/build.gradle
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/5.3/tapestry-core/build.gradle?rev=1332790&r1=1332789&r2=1332790&view=diff
==============================================================================
--- tapestry/tapestry5/branches/5.3/tapestry-core/build.gradle (original)
+++ tapestry/tapestry5/branches/5.3/tapestry-core/build.gradle Tue May 1 19:25:12 2012
@@ -1,10 +1,12 @@
import org.apache.tools.ant.filters.*
-import org.gradle.api.specs.AndSpec
description = "Central module for Tapestry, containing all core services and components"
-antlrSource = "src/main/antlr"
-antlrOutput = "$buildDir/generated-sources/antlr"
+project.ext {
+ antlrSource = "src/main/antlr"
+ antlrOutput = "$buildDir/generated-sources/antlr"
+}
+
configurations {
antlr3
@@ -17,7 +19,7 @@ dependencies {
compile project(':tapestry-json')
provided project(":tapestry-test")
- provided "javax.servlet:servlet-api:$servletAPIVersion"
+ provided "javax.servlet:servlet-api:${versions.servletapi}"
compile "commons-codec:commons-codec:1.5"
Modified: tapestry/tapestry5/branches/5.3/tapestry-func/build.gradle
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/5.3/tapestry-func/build.gradle?rev=1332790&r1=1332789&r2=1332790&view=diff
==============================================================================
--- tapestry/tapestry5/branches/5.3/tapestry-func/build.gradle (original)
+++ tapestry/tapestry5/branches/5.3/tapestry-func/build.gradle Tue May 1 19:25:12 2012
@@ -1,6 +1,6 @@
description = "Light-weight functional programming for Flows of values"
dependencies {
- testCompile "org.testng:testng:$testngVersion"
+ testCompile "org.testng:testng:${versions.testng}"
testCompile "commons-lang:commons-lang:2.6"
}
\ No newline at end of file
Modified: tapestry/tapestry5/branches/5.3/tapestry-hibernate-core/build.gradle
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/5.3/tapestry-hibernate-core/build.gradle?rev=1332790&r1=1332789&r2=1332790&view=diff
==============================================================================
--- tapestry/tapestry5/branches/5.3/tapestry-hibernate-core/build.gradle (original)
+++ tapestry/tapestry5/branches/5.3/tapestry-hibernate-core/build.gradle Tue May 1 19:25:12 2012
@@ -1,13 +1,14 @@
description = "Basic Hibernate services for Tapestry, useable outside of a Tapestry web application"
-hibernateVersion = '3.6.0.Final'
+versions.hibernate = '4.1.1.Final'
dependencies {
compile project(':tapestry-ioc')
- compile group: 'org.hibernate', name: 'hibernate-core', version: hibernateVersion, transitive: false
+ compile group: 'org.hibernate', name: 'hibernate-core', version: versions.hibernate, transitive: false
compile "org.hibernate:hibernate-commons-annotations:3.2.0.Final"
compile "org.hibernate.javax.persistence:hibernate-jpa-2.0-api:1.0.0.Final"
+ compile "org.jboss.logging:jboss-logging:3.1.0.GA"
runtime "geronimo-spec:geronimo-spec-jta:1.0-M1"
runtime "antlr:antlr:2.7.6"
@@ -17,11 +18,11 @@ dependencies {
testCompile project(':tapestry-test')
- testCompile "org.easymock:easymock:$easymockVersion"
+ testCompile "org.easymock:easymock:${versions.easymock}"
- testCompile "org.testng:testng:$testngVersion", { transitive = false }
+ testCompile "org.testng:testng:${versions.testng}", { transitive = false }
- testRuntime "org.hsqldb:hsqldb:1.8.0.10"
+ testRuntime "org.hsqldb:hsqldb:2.2.8"
}
jar {
Modified: tapestry/tapestry5/branches/5.3/tapestry-hibernate/build.gradle
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/5.3/tapestry-hibernate/build.gradle?rev=1332790&r1=1332789&r2=1332790&view=diff
==============================================================================
--- tapestry/tapestry5/branches/5.3/tapestry-hibernate/build.gradle (original)
+++ tapestry/tapestry5/branches/5.3/tapestry-hibernate/build.gradle Tue May 1 19:25:12 2012
@@ -3,10 +3,11 @@ description = "Provides support for simp
dependencies {
compile project(':tapestry-core')
compile project(':tapestry-hibernate-core')
+ compile "org.jboss.logging:jboss-logging:3.1.0.GA"
testCompile project(':tapestry-test')
- testRuntime "org.hsqldb:hsqldb:1.8.0.10"
+ testRuntime "org.hsqldb:hsqldb:2.2.8"
}
jar {
Modified: tapestry/tapestry5/branches/5.3/tapestry-ioc/build.gradle
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/5.3/tapestry-ioc/build.gradle?rev=1332790&r1=1332789&r2=1332790&view=diff
==============================================================================
--- tapestry/tapestry5/branches/5.3/tapestry-ioc/build.gradle (original)
+++ tapestry/tapestry5/branches/5.3/tapestry-ioc/build.gradle Tue May 1 19:25:12 2012
@@ -4,11 +4,10 @@ dependencies {
compile project(':tapestry-func')
compile project(':tapestry5-annotations')
compile project(":plastic")
+ compile "javassist:javassist:3.12.1.GA"
provided project(':tapestry-test')
- compile "javassist:javassist:3.12.1.GA"
-
// For now, keep these compile dependencies synchronized with the binaries dependencies
// of the top-level build:
@@ -18,10 +17,14 @@ dependencies {
compile "log4j:log4j:1.2.14"
compile "org.slf4j:slf4j-log4j12:1.6.1"
- provided "org.testng:testng:$testngVersion", { transitive = false }
+ testCompile "org.spockframework:spock-core:${versions.spock}"
+
+ provided "org.testng:testng:${versions.testng}", { transitive = false }
}
test {
+ useJUnit()
+ useTestNG()
// Override the master build.gradle
systemProperties.remove("tapestry.service-reloading-enabled")
}
\ No newline at end of file
Modified: tapestry/tapestry5/branches/5.3/tapestry-spring/build.gradle
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/5.3/tapestry-spring/build.gradle?rev=1332790&r1=1332789&r2=1332790&view=diff
==============================================================================
--- tapestry/tapestry5/branches/5.3/tapestry-spring/build.gradle (original)
+++ tapestry/tapestry5/branches/5.3/tapestry-spring/build.gradle Tue May 1 19:25:12 2012
@@ -4,7 +4,7 @@ dependencies {
compile project(':tapestry-core')
compile "org.springframework:spring-web:3.1.0.RELEASE"
- provided "javax.servlet:servlet-api:$servletAPIVersion"
+ provided "javax.servlet:servlet-api:${versions.servletapi}"
testCompile project(':tapestry-test')
}
Modified: tapestry/tapestry5/branches/5.3/tapestry-test/build.gradle
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/5.3/tapestry-test/build.gradle?rev=1332790&r1=1332789&r2=1332790&view=diff
==============================================================================
--- tapestry/tapestry5/branches/5.3/tapestry-test/build.gradle (original)
+++ tapestry/tapestry5/branches/5.3/tapestry-test/build.gradle Tue May 1 19:25:12 2012
@@ -1,23 +1,23 @@
description = "Utilities for unit and integration testing of Tapestry applications"
-seleniumVersion = '2.14.0'
+versions.selenium = '2.14.0'
dependencies {
- compile "org.seleniumhq.selenium:selenium-java:$seleniumVersion"
- compile "org.seleniumhq.selenium:selenium-server:$seleniumVersion"
+ compile "org.seleniumhq.selenium:selenium-java:${versions.selenium}"
+ compile "org.seleniumhq.selenium:selenium-server:${versions.selenium}"
compile "jetty:org.mortbay.jetty:5.1.12"
+
+ compile "org.testng:testng:${versions.testng}"
- compile "org.testng:testng:$testngVersion"
-
- compile "org.eclipse.jetty:jetty-server:$jettyVersion"
- compile "org.eclipse.jetty:jetty-jndi:$jettyVersion"
- compile "org.eclipse.jetty:jetty-plus:$jettyVersion"
- compile "org.eclipse.jetty:jetty-webapp:$jettyVersion"
+ compile "org.eclipse.jetty:jetty-server:${versions.jetty}"
+ compile "org.eclipse.jetty:jetty-jndi:${versions.jetty}"
+ compile "org.eclipse.jetty:jetty-plus:${versions.jetty}"
+ compile "org.eclipse.jetty:jetty-webapp:${versions.jetty}"
- compile "org.apache.tomcat:catalina:$tomcatVersion"
- compile "org.apache.tomcat:coyote:$tomcatVersion"
+ compile "org.apache.tomcat:catalina:${versions.tomcat}"
+ compile "org.apache.tomcat:coyote:${versions.tomcat}"
- compile "org.apache.tomcat:dbcp:$tomcatVersion"
+ compile "org.apache.tomcat:dbcp:${versions.tomcat}"
- compile "org.easymock:easymock:$easymockVersion"
+ compile "org.easymock:easymock:${versions.easymock}"
}
Modified: tapestry/tapestry5/branches/5.3/tapestry-upload/build.gradle
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/5.3/tapestry-upload/build.gradle?rev=1332790&r1=1332789&r2=1332790&view=diff
==============================================================================
--- tapestry/tapestry5/branches/5.3/tapestry-upload/build.gradle (original)
+++ tapestry/tapestry5/branches/5.3/tapestry-upload/build.gradle Tue May 1 19:25:12 2012
@@ -4,7 +4,7 @@ dependencies {
compile project(':tapestry-core')
compile "commons-fileupload:commons-fileupload:1.2.2"
compile "commons-io:commons-io:2.0.1"
- provided "javax.servlet:servlet-api:$servletAPIVersion"
+ provided "javax.servlet:servlet-api:${versions.servletapi}"
testCompile project(':tapestry-test')
}