From efea26fae411f4c92de75fb362591e512a89d807 Mon Sep 17 00:00:00 2001 From: Arjen Poutsma Date: Fri, 29 Nov 2013 10:41:49 +0100 Subject: [PATCH] Upgraded to gradle wrapper 1.9 --- .gitignore | 1 + build.gradle | 4 +- gradle/wrapper/gradle-wrapper.jar | Bin 50514 -> 50508 bytes gradle/wrapper/gradle-wrapper.properties | 4 +- gradlew.bat | 180 +++++++++++------------ 5 files changed, 95 insertions(+), 94 deletions(-) diff --git a/.gitignore b/.gitignore index e93237dc..fd0cfb29 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ activemq-data atlassian-ide-plugin*.xml .idea +out /build /spring-*/build diff --git a/build.gradle b/build.gradle index 9fe6d477..5bd8f1d5 100644 --- a/build.gradle +++ b/build.gradle @@ -15,7 +15,7 @@ configure(allprojects) { ext.axiomVersion = "1.2.14" apply plugin: "java" - apply plugin: "idea" + apply plugin: "propdeps-idea" apply plugin: "eclipse" apply plugin: "propdeps" @@ -411,6 +411,6 @@ configure(rootProject) { task wrapper(type: Wrapper) { description = 'Generates gradlew[.bat] scripts' - gradleVersion = '1.8' + gradleVersion = '1.9' } } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 667288ad6c2b3b87c990ece1267e56f0bcbf3622..d5c591c9c532da774b062aa6d7ab16405ff8700a 100644 GIT binary patch delta 1769 zcmZ8g4N#MH7=QN;7$2KLoFonfgoMguO(^9btoU=4_&A<~DK8jyM*cScy$NtXTJ=P&cdd-vY&d7qEp^ZAaJu`iXe zc}XI+jUz?b+f&!#3Y5Hc_81~|&$s$3L!_>^@BDg)rk=QrVV6d4HUnmVfIkHcAV1b5 zgK8)GAPtIRHdCOG*(Te8U~)PO7Ip42fh}n2UDG)rJX-bqau8m4j!R6T0mmId)4y5h z1j0h3l<d z0X#kS{8=7-Y7l!mqx=-_;;vki!1?;Dv~1;jo2tUzG)w9RN59zbZJvr$JmVgGZF))? z>zaFeb?k_2PwjAe;jZ{02jk86+nkln6)i61qTvUFcE*~bY~Dmcd42aQQI)6aKZ#zK zvDH&Mdg4Yw+rYbdVV)n&YODPHI`%c2qXH`nk8b!uSBkF?O{1cj5bi8#abZm7tM3!Ve9Z(A z#!ho=U9cqreQH=?pef4BmZH|9{30JTlgCwi)(;TB>4rHX+-N#N$TQD|+d#U8uSSSQ z-kL;w%fc6&>0aGs=0K9l10g$iT4R}bm3-GEg9Wbb42jB-CBBJjgcA-8QzE9{= z04MZ>N6?uK-_@P*OYV5KGt!fpmgQbq6txmJxcI0Psc2`HA2SzpsEf~%qMEKX@TKqK z)5j&~q0t@nN>(8U1J{co5@x<$*@UB~@$0|Hf>EU~q#}jMrz(wuG7Vgy$TjfkvuTVL zwHo{&yh5@uT#2`K3~w#WD*Q|aICdMk=u^E@gjqFR;t@;(%^a9j}{D$K*UtYKM}$J)lC)q{%diljUNb ztyT#S$iP`GTVvrE#~fehK^^$|EOmT;)t7q)7v03Bs7+QJV!0*ZXL1({Pi+sM-cf|+ z>eiyMo~K}V_pqv`7)=z1GP8#z#<%pk$Kuj#@bH)`U3^pugz|e+Ak5s$r?-{hiu}oCukG~apO{mysKJ@@nt zonS{!ur8{2)?oocj*jS)gb$4_D;x=Y^l0LH52GS^;hpKb(+uKEF8H#Xaxf6!X($Ic zK=2EP7ANKq14NO-Js@(0TSXA`In~07CC@cf2u#hw9byRnUAoc@f>puJbSX+!vH+NY zHF75iUTjFFKHK6&)Muyikl2MQ_TZY}=q(7L&3I~C>>|fat5l)#Eul?TdE{leT$Nwo z;))}ZWG>-EnsWH5e27S;I6ui(KbY6&Bk6jwGD%X({$+^YS6-)G`b;BOrr00~5$*VU z?o4jpAK!ImPAsl?Y>g8Sm@5lyiv6zcO}A}J?KWM}eN#p3w{EveX1y|Mcb&gc^y!^x z(n7EK?_!gvs{1&Qyu`(teIn6xkj8+hsPKh zgo=bXCOrV#?9O;um&C%Po?}2*orVPvM5cQ=LXed04_=m|xe6Mz=bMGFw7cL16{jBF zD+Xpre}gjBhB|7fEWYFpOE1f3DD$W34z1-?Tb$oz2ZVf`@ow4a_w8&fNv{l$4nUc03t*8gp7J)j9@4fI-jB5<0p4z-KEdr7@P4{I;jO8E(7wT& zyVLpM79g~Qobdn0Y|!9@jsPvE;W*Moc-&qiLK5^aMyp0>-+?Sy)`8u+oJ?6p&K{X6 zUcfA3>BoUfKK^JX?HEv^p})?Do!;qQ0=um0mNF>?gj&m~;7st5T{a0qD|ox8@mJlep_0;=)j3DW zojI`xt>tO@^>|z#g`<1umYaLX;S5koSx*@FYf9?X+3pApkzVuti23U* kBUEP-*bVoufKuka6vWD#XQ#5_EUPb$9FT~9v~nx|0h*^-6#xJL diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c01c7789..924aa729 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Nov 07 12:02:13 CET 2013 +#Fri Nov 29 10:36:32 CET 2013 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.8-bin.zip +distributionUrl=http\://services.gradle.org/distributions/gradle-1.9-bin.zip diff --git a/gradlew.bat b/gradlew.bat index 8a0b282a..aec99730 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,90 +1,90 @@ -@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 Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -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. - -goto fail - -: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 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% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -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 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@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 Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +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. + +goto fail + +: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 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% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +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 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega