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/16 20:50:32 UTC
[27/44] git commit: Upgrade Gradle to 1.0-rc-3 Copy the root
project's Gradle Wrapper into the quickstart archetype Remove a number of
build warnings related to the upgrade
Upgrade Gradle to 1.0-rc-3
Copy the root project's Gradle Wrapper into the quickstart archetype
Remove a number of build warnings related to the upgrade
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/9cd30916
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/9cd30916
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/9cd30916
Branch: refs/heads/master
Commit: 9cd309162d20b76b099ea24c65d33945977e9f4b
Parents: 64b1b18
Author: Howard M. Lewis Ship <hl...@gmail.com>
Authored: Tue May 1 11:18:18 2012 -0700
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Wed May 16 11:50:12 2012 -0700
----------------------------------------------------------------------
build.gradle | 70 +++---
gradle/wrapper/gradle-wrapper.jar | Bin 41363 -> 39860 bytes
gradle/wrapper/gradle-wrapper.properties | 4 +-
gradlew | 5 +-
md5.gradle | 2 +-
plastic/build.gradle | 2 +-
quickstart/build.gradle | 20 ++-
.../gradle/wrapper/gradle-wrapper.jar | Bin 13031 -> 0 bytes
.../gradle/wrapper/gradle-wrapper.properties | 6 -
.../src/main/resources/archetype-resources/gradlew | 168 ---------------
.../main/resources/archetype-resources/gradlew.bat | 82 -------
ssh.gradle | 6 +-
tapestry-core/build.gradle | 10 +-
tapestry-func/build.gradle | 2 +-
tapestry-hibernate-core/build.gradle | 6 +-
tapestry-ioc/build.gradle | 4 +-
tapestry-spring/build.gradle | 2 +-
tapestry-test/build.gradle | 24 +-
tapestry-upload/build.gradle | 2 +-
19 files changed, 84 insertions(+), 331 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/9cd30916/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 097a985..9b5585f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,41 +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.4-alpha-1"
-
-jettyVersion = "7.0.0.v20091005"
-tomcatVersion = "6.0.30"
-testngVersion = "5.14.9"
-easymockVersion = "3.0"
-servletAPIVersion = "2.5"
-spockVersion = "0.6-groovy-1.8"
+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.4-alpha-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 {
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/9cd30916/gradle/wrapper/gradle-wrapper.jar
----------------------------------------------------------------------
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 175ee9a..86d03e6 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/9cd30916/gradle/wrapper/gradle-wrapper.properties
----------------------------------------------------------------------
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index b0bda32..44aa7db 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Jan 06 08:32:03 PST 2012
+#Tue May 01 10:14:10 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
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/9cd30916/gradlew
----------------------------------------------------------------------
diff --git a/gradlew b/gradlew
index 4ba2657..cf12650 100755
--- a/gradlew
+++ b/gradlew
@@ -105,10 +105,9 @@ if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
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
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/9cd30916/md5.gradle
----------------------------------------------------------------------
diff --git a/md5.gradle b/md5.gradle
index 9734b00..ab978c5 100644
--- a/md5.gradle
+++ b/md5.gradle
@@ -22,4 +22,4 @@ class GenMD5 extends SourceTask {
}
}
-project.GenMD5 = GenMD5.class
+project.ext.GenMD5 = GenMD5.class
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/9cd30916/plastic/build.gradle
----------------------------------------------------------------------
diff --git a/plastic/build.gradle b/plastic/build.gradle
index 0113c2e..54e6c62 100644
--- a/plastic/build.gradle
+++ b/plastic/build.gradle
@@ -2,7 +2,7 @@ description = "Plastic core framework"
dependencies {
- testCompile "org.spockframework:spock-core:$spockVersion"
+ testCompile "org.spockframework:spock-core:$versions.spock"
}
test {
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/9cd30916/quickstart/build.gradle
----------------------------------------------------------------------
diff --git a/quickstart/build.gradle b/quickstart/build.gradle
index 85ae1a1..60232a6 100644
--- a/quickstart/build.gradle
+++ b/quickstart/build.gradle
@@ -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()
])
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/9cd30916/quickstart/src/main/resources/archetype-resources/gradle/wrapper/gradle-wrapper.jar
----------------------------------------------------------------------
diff --git a/quickstart/src/main/resources/archetype-resources/gradle/wrapper/gradle-wrapper.jar b/quickstart/src/main/resources/archetype-resources/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index 45bfb5c..0000000
Binary files a/quickstart/src/main/resources/archetype-resources/gradle/wrapper/gradle-wrapper.jar and /dev/null differ
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/9cd30916/quickstart/src/main/resources/archetype-resources/gradle/wrapper/gradle-wrapper.properties
----------------------------------------------------------------------
diff --git a/quickstart/src/main/resources/archetype-resources/gradle/wrapper/gradle-wrapper.properties b/quickstart/src/main/resources/archetype-resources/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index d94098d..0000000
--- a/quickstart/src/main/resources/archetype-resources/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-#Wed Jun 08 17:10:51 PDT 2011
-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-3-bin.zip
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/9cd30916/quickstart/src/main/resources/archetype-resources/gradlew
----------------------------------------------------------------------
diff --git a/quickstart/src/main/resources/archetype-resources/gradlew b/quickstart/src/main/resources/archetype-resources/gradlew
deleted file mode 100755
index d8809f1..0000000
--- a/quickstart/src/main/resources/archetype-resources/gradlew
+++ /dev/null
@@ -1,168 +0,0 @@
-#!/bin/bash
-
-##############################################################################
-## ##
-## Gradle wrapper script for UN*X ##
-## ##
-##############################################################################
-
-# Uncomment those lines to set JVM options. GRADLE_OPTS and JAVA_OPTS can be used together.
-# GRADLE_OPTS="$GRADLE_OPTS -Xmx512m"
-# JAVA_OPTS="$JAVA_OPTS -Xmx512m"
-
-GRADLE_APP_NAME=Gradle
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn ( ) {
- echo "$*"
-}
-
-die ( ) {
- echo
- echo "$*"
- echo
- exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-case "`uname`" in
- CYGWIN* )
- cygwin=true
- ;;
- Darwin* )
- darwin=true
- ;;
- MINGW* )
- msys=true
- ;;
-esac
-
-# Attempt to set JAVA_HOME if it's not already set.
-if [ -z "$JAVA_HOME" ] ; then
- if $darwin ; then
- [ -z "$JAVA_HOME" -a -d "/Library/Java/Home" ] && export JAVA_HOME="/Library/Java/Home"
- [ -z "$JAVA_HOME" -a -d "/System/Library/Frameworks/JavaVM.framework/Home" ] && export JAVA_HOME="/System/Library/Frameworks/JavaVM.framework/Home"
- else
- javaExecutable="`which javac`"
- [ -z "$javaExecutable" -o "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ] && die "JAVA_HOME not set and cannot find javac to deduce location, please set JAVA_HOME."
- # readlink(1) is not available as standard on Solaris 10.
- readLink=`which readlink`
- [ `expr "$readLink" : '\([^ ]*\)'` = "no" ] && die "JAVA_HOME not set and readlink not available, please set JAVA_HOME."
- javaExecutable="`readlink -f \"$javaExecutable\"`"
- javaHome="`dirname \"$javaExecutable\"`"
- javaHome=`expr "$javaHome" : '\(.*\)/bin'`
- export JAVA_HOME="$javaHome"
- fi
-fi
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
- [ -n "$JAVACMD" ] && JAVACMD=`cygpath --unix "$JAVACMD"`
- [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-STARTER_MAIN_CLASS=org.gradle.wrapper.GradleWrapperMain
-CLASSPATH=`dirname "$0"`/gradle/wrapper/gradle-wrapper.jar
-WRAPPER_PROPERTIES=`dirname "$0"`/gradle/wrapper/gradle-wrapper.properties
-# Determine the Java command to use to start the JVM.
-if [ -z "$JAVACMD" ] ; then
- if [ -n "$JAVA_HOME" ] ; then
- if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
- # IBM's JDK on AIX uses strange locations for the executables
- JAVACMD="$JAVA_HOME/jre/sh/java"
- else
- JAVACMD="$JAVA_HOME/bin/java"
- fi
- else
- JAVACMD="java"
- fi
-fi
-if [ ! -x "$JAVACMD" ] ; then
- die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-if [ -z "$JAVA_HOME" ] ; then
- warn "JAVA_HOME environment variable is not set"
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
- MAX_FD_LIMIT=`ulimit -H -n`
- if [ $? -eq 0 ] ; then
- if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
- MAX_FD="$MAX_FD_LIMIT"
- fi
- ulimit -n $MAX_FD
- if [ $? -ne 0 ] ; then
- warn "Could not set maximum file descriptor limit: $MAX_FD"
- fi
- else
- warn "Could not query businessSystem maximum file descriptor limit: $MAX_FD_LIMIT"
- fi
-fi
-
-# For Darwin, add GRADLE_APP_NAME to the JAVA_OPTS as -Xdock:name
-if $darwin; then
- JAVA_OPTS="$JAVA_OPTS -Xdock:name=$GRADLE_APP_NAME"
-# we may also want to set -Xdock:image
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
- JAVA_HOME=`cygpath --path --mixed "$JAVA_HOME"`
- CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
- # We build the pattern for arguments to be converted via cygpath
- ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
- SEP=""
- for dir in $ROOTDIRSRAW ; do
- ROOTDIRS="$ROOTDIRS$SEP$dir"
- SEP="|"
- done
- OURCYGPATTERN="(^($ROOTDIRS))"
- # Add a user-defined pattern to the cygpath arguments
- if [ "$GRADLE_CYGPATTERN" != "" ] ; then
- OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
- fi
- # Now convert the arguments - kludge to limit ourselves to /bin/sh
- i=0
- for arg in "$@" ; do
- CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
- CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
-
- if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
- eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
- else
- eval `echo args$i`="\"$arg\""
- fi
- i=$((i+1))
- done
- case $i in
- (0) set -- ;;
- (1) set -- "$args0" ;;
- (2) set -- "$args0" "$args1" ;;
- (3) set -- "$args0" "$args1" "$args2" ;;
- (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
- (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
- (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
- (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
- (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
- (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
- esac
-fi
-
-GRADLE_APP_BASE_NAME=`basename "$0"`
-
-exec "$JAVACMD" $JAVA_OPTS $GRADLE_OPTS \
- -classpath "$CLASSPATH" \
- -Dorg.gradle.appname="$GRADLE_APP_BASE_NAME" \
- -Dorg.gradle.wrapper.properties="$WRAPPER_PROPERTIES" \
- $STARTER_MAIN_CLASS \
- "$@"
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/9cd30916/quickstart/src/main/resources/archetype-resources/gradlew.bat
----------------------------------------------------------------------
diff --git a/quickstart/src/main/resources/archetype-resources/gradlew.bat b/quickstart/src/main/resources/archetype-resources/gradlew.bat
deleted file mode 100644
index 479fddd..0000000
--- a/quickstart/src/main/resources/archetype-resources/gradlew.bat
+++ /dev/null
@@ -1,82 +0,0 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem ##
-@rem Gradle startup script for Windows ##
-@rem ##
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-@rem Uncomment those lines to set JVM options. GRADLE_OPTS and JAVA_OPTS can be used together.
-@rem set GRADLE_OPTS=%GRADLE_OPTS% -Xmx512m
-@rem set JAVA_OPTS=%JAVA_OPTS% -Xmx512m
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.\
-
-@rem Find java.exe
-set JAVA_EXE=java.exe
-if not defined JAVA_HOME goto init
-
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-echo.
-goto end
-
-:init
-@rem Get command-line arguments, handling Windowz 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.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-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
-
-set STARTER_MAIN_CLASS=org.gradle.wrapper.GradleWrapperMain
-set CLASSPATH=%DIRNAME%\gradle\wrapper\gradle-wrapper.jar
-set WRAPPER_PROPERTIES=%DIRNAME%\gradle\wrapper\gradle-wrapper.properties
-
-set GRADLE_OPTS=%JAVA_OPTS% %GRADLE_OPTS% -Dorg.gradle.wrapper.properties="%WRAPPER_PROPERTIES%"
-
-@rem Execute Gradle
-"%JAVA_EXE%" %GRADLE_OPTS% -classpath "%CLASSPATH%" %STARTER_MAIN_CLASS% %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-if not "%OS%"=="Windows_NT" echo 1 > nul | choice /n /c:1
-
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if not "" == "%GRADLE_EXIT_CONSOLE%" exit "%ERRORLEVEL%"
-exit /b "%ERRORLEVEL%"
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/9cd30916/ssh.gradle
----------------------------------------------------------------------
diff --git a/ssh.gradle b/ssh.gradle
index d375a42..74b620d 100644
--- a/ssh.gradle
+++ b/ssh.gradle
@@ -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
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/9cd30916/tapestry-core/build.gradle
----------------------------------------------------------------------
diff --git a/tapestry-core/build.gradle b/tapestry-core/build.gradle
index 160db6d..9cd81cd 100644
--- a/tapestry-core/build.gradle
+++ b/tapestry-core/build.gradle
@@ -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"
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/9cd30916/tapestry-func/build.gradle
----------------------------------------------------------------------
diff --git a/tapestry-func/build.gradle b/tapestry-func/build.gradle
index 93a79eb..566e264 100644
--- a/tapestry-func/build.gradle
+++ b/tapestry-func/build.gradle
@@ -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
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/9cd30916/tapestry-hibernate-core/build.gradle
----------------------------------------------------------------------
diff --git a/tapestry-hibernate-core/build.gradle b/tapestry-hibernate-core/build.gradle
index 56ad489..5410d41 100644
--- a/tapestry-hibernate-core/build.gradle
+++ b/tapestry-hibernate-core/build.gradle
@@ -5,7 +5,7 @@ hibernateVersion = '4.1.2.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"
@@ -18,9 +18,9 @@ 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:2.2.8"
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/9cd30916/tapestry-ioc/build.gradle
----------------------------------------------------------------------
diff --git a/tapestry-ioc/build.gradle b/tapestry-ioc/build.gradle
index 136a937..073a97b 100644
--- a/tapestry-ioc/build.gradle
+++ b/tapestry-ioc/build.gradle
@@ -16,9 +16,9 @@ dependencies {
compile "log4j:log4j:1.2.14"
compile "org.slf4j:slf4j-log4j12:1.6.1"
- testCompile "org.spockframework:spock-core:$spockVersion"
+ testCompile "org.spockframework:spock-core:${versions.spock}"
- provided "org.testng:testng:$testngVersion", { transitive = false }
+ provided "org.testng:testng:${versions.testng}", { transitive = false }
}
test {
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/9cd30916/tapestry-spring/build.gradle
----------------------------------------------------------------------
diff --git a/tapestry-spring/build.gradle b/tapestry-spring/build.gradle
index b4a3964..f4393a6 100644
--- a/tapestry-spring/build.gradle
+++ b/tapestry-spring/build.gradle
@@ -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')
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/9cd30916/tapestry-test/build.gradle
----------------------------------------------------------------------
diff --git a/tapestry-test/build.gradle b/tapestry-test/build.gradle
index 6f16dfd..611cf11 100644
--- a/tapestry-test/build.gradle
+++ b/tapestry-test/build.gradle
@@ -1,22 +1,22 @@
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 "org.testng:testng:$testngVersion"
+ compile "org.testng:testng:${versions.testng}"
- 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}"
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/9cd30916/tapestry-upload/build.gradle
----------------------------------------------------------------------
diff --git a/tapestry-upload/build.gradle b/tapestry-upload/build.gradle
index 056cbc7..d34da2f 100644
--- a/tapestry-upload/build.gradle
+++ b/tapestry-upload/build.gradle
@@ -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')
}