diff --git a/.wrapper/gradle-wrapper.jar b/.wrapper/gradle-wrapper.jar deleted file mode 100644 index aba4149786..0000000000 Binary files a/.wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/.wrapper/gradle-wrapper.properties b/.wrapper/gradle-wrapper.properties deleted file mode 100644 index 43e747c047..0000000000 --- a/.wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,6 +0,0 @@ -#Thu Jan 12 12:49:02 CET 2012 -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists -distributionUrl=http\://repo.gradle.org/gradle/distributions-snapshots/gradle-1.0-milestone-8-20120112000036+0100-bin.zip diff --git a/build.gradle b/build.gradle index 40a828d453..bb8aa6c6c1 100644 --- a/build.gradle +++ b/build.gradle @@ -5,11 +5,11 @@ apply plugin: 'idea' buildscript { repositories { - maven { url 'https://repo.springsource.org/plugins-snapshot' } + maven { url 'http://repo.springsource.org/plugins-release' } } dependencies { - classpath 'org.springframework.build.gradle:bundlor-plugin:0.1.2-SNAPSHOT' - classpath 'org.springframework.build.gradle:docbook-reference-plugin:0.1.3' + classpath 'org.springframework.build.gradle:bundlor-plugin:0.1.2' + classpath 'org.springframework.build.gradle:docbook-reference-plugin:0.1.6' } } @@ -1068,9 +1068,7 @@ task dist(dependsOn: assemble) { task wrapper(type: Wrapper) { description = 'Generates gradlew[.bat] scripts' - gradleVersion = '1.0-milestone-8' - distributionUrl = 'http://repo.gradle.org/gradle/distributions-snapshots/gradle-1.0-milestone-8-20120112000036+0100-bin.zip' - jarFile = '.wrapper/gradle-wrapper.jar' + gradleVersion = '1.2' } def customizePom(def pom, def gradleProject) { diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000..7f1e239c84 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000000..d67e6ac3b2 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Wed Oct 31 14:35:04 EDT 2012 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=http\://services.gradle.org/distributions/gradle-1.2-bin.zip diff --git a/gradlew b/gradlew index b1fdaf1db4..e61422d06d 100755 --- a/gradlew +++ b/gradlew @@ -65,7 +65,7 @@ cd "`dirname \"$PRG\"`/" APP_HOME="`pwd -P`" cd "$SAVED" -CLASSPATH=$APP_HOME/.wrapper/gradle-wrapper.jar +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then @@ -101,13 +101,13 @@ if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; 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" + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" fi fi # For Darwin, add options to specify how the application appears in the dock if $darwin; then - JAVA_OPTS="$JAVA_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" + 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 diff --git a/gradlew.bat b/gradlew.bat index 9b0bb6acda..aec99730b4 100755 --- a/gradlew.bat +++ b/gradlew.bat @@ -69,7 +69,7 @@ set CMD_LINE_ARGS=%$ :execute @rem Setup the command line -set CLASSPATH=%APP_HOME%\.wrapper\gradle-wrapper.jar +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar @rem Execute Gradle "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%