gradle 7

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

diff --git a/build.gradle b/build.gradle
index cfcca5590b6d01b6d653f7f15d43991e14ff364b..485313ff612f0fda88426bdc6ca13579b01b2743 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -62,7 +62,7 @@ ant.taskdef(name: "junit",
 
 wrapper {
     // https://stackoverflow.com/a/54741656/2066598
-    gradleVersion = '6.8'
+    gradleVersion = '7.0.1'
 }
 
 task adjustWrapperPropertiesFile {

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 62d4c053550b91381bbd28b1afc82d634bf73a8a..e708b1c023ec8b20f512888fe07c5bd3ff77bb8f 100644 (file)
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index da9702f9e70d99d587ce73bbfb0c212fc66e24c9..e5338d370bade1e50a9edfb6037b0c91e011234f 100644 (file)
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

diff --git a/gradlew b/gradlew
index fbd7c515832dab7b01092e80db76e5e03fe32d29..4f906e0c811fc9e230eb44819f509cd0627f2600 100755 (executable)
--- a/gradlew
+++ b/gradlew
@@ -130,7 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath

diff --git a/gradlew.bat b/gradlew.bat
index a9f778a7a964b6f01c904ee667903f005d6df556..ac1b06f93825db68fb0c0b5150917f340eaa5d02 100644 (file)
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -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 init\r
+if "%ERRORLEVEL%" == "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
@@ -54,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%\r
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe\r
 \r
-if exist "%JAVA_EXE%" goto init\r
+if exist "%JAVA_EXE%" goto execute\r
 \r
 echo.\r
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%\r
@@ -64,21 +64,6 @@ echo location of your Java installation.
 \r
 goto fail\r
 \r
-:init\r
-@rem Get command-line arguments, handling Windows variants\r
-\r
-if not "%OS%" == "Windows_NT" goto win9xME_args\r
-\r
-:win9xME_args\r
-@rem Slurp the command line arguments.\r
-set CMD_LINE_ARGS=\r
-set _SKIP=2\r
-\r
-:win9xME_args_slurp\r
-if "x%~1" == "x" goto execute\r
-\r
-set CMD_LINE_ARGS=%*\r
-\r
 :execute\r
 @rem Setup the command line\r
 \r
@@ -86,7 +71,7 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 \r
 \r
 @rem Execute Gradle\r
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%\r
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*\r
 \r
 :end\r
 @rem End local scope for the variables with windows NT shell\r