upgrade gradle plugins

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1902920 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 41d9927a4d4fb3f96a785543079b8df6723c946b..249e5832f090a2944b7473328c07c9755baa3196 100644 (file)
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ

diff --git a/gradlew b/gradlew
index 1b6c787337ffb79f0e3cf8b1e9f00f680a959de1..a69d9cb6c20655813e44515156e7253a2a239138 100755 (executable)
--- a/gradlew
+++ b/gradlew
@@ -205,6 +205,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

diff --git a/gradlew.bat b/gradlew.bat
index ac1b06f93825db68fb0c0b5150917f340eaa5d02..53a6b238d414d91c30c5644c82393d27416fbbe6 100644 (file)
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -14,7 +14,7 @@
 @rem limitations under the License.\r
 @rem\r
 \r
-@if "%DEBUG%" == "" @echo off\r
+@if "%DEBUG%"=="" @echo off\r
 @rem ##########################################################################\r
 @rem\r
 @rem  Gradle startup script for Windows\r
@@ -25,7 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal\r
 \r
 set DIRNAME=%~dp0\r
-if "%DIRNAME%" == "" set DIRNAME=.\r
+if "%DIRNAME%"=="" set DIRNAME=.\r
 set APP_BASE_NAME=%~n0\r
 set APP_HOME=%DIRNAME%\r
 \r
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 \r
 set JAVA_EXE=java.exe\r
 %JAVA_EXE% -version >NUL 2>&1\r
-if "%ERRORLEVEL%" == "0" goto execute\r
+if %ERRORLEVEL% equ 0 goto execute\r
 \r
 echo.\r
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.\r
@@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 \r
 :end\r
 @rem End local scope for the variables with windows NT shell\r
-if "%ERRORLEVEL%"=="0" goto mainEnd\r
+if %ERRORLEVEL% equ 0 goto mainEnd\r
 \r
 :fail\r
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of\r
 rem the _cmd.exe /c_ return code!\r
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1\r
-exit /b 1\r
+set EXIT_CODE=%ERRORLEVEL%\r
+if %EXIT_CODE% equ 0 set EXIT_CODE=1\r
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%\r
+exit /b %EXIT_CODE%\r
 \r
 :mainEnd\r
 if "%OS%"=="Windows_NT" endlocal\r