You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by fa...@apache.org on 2021/05/12 23:39:41 UTC
svn commit: r1889815 - in /poi/trunk: build.gradle
gradle/wrapper/gradle-wrapper.jar gradle/wrapper/gradle-wrapper.properties
gradlew gradlew.bat
Author: fanningpj
Date: Wed May 12 23:39:41 2021
New Revision: 1889815
URL: http://svn.apache.org/viewvc?rev=1889815&view=rev
Log:
gradle 7
Modified:
poi/trunk/build.gradle
poi/trunk/gradle/wrapper/gradle-wrapper.jar
poi/trunk/gradle/wrapper/gradle-wrapper.properties
poi/trunk/gradlew
poi/trunk/gradlew.bat
Modified: poi/trunk/build.gradle
URL: http://svn.apache.org/viewvc/poi/trunk/build.gradle?rev=1889815&r1=1889814&r2=1889815&view=diff
==============================================================================
--- poi/trunk/build.gradle (original)
+++ poi/trunk/build.gradle Wed May 12 23:39:41 2021
@@ -62,7 +62,7 @@ ant.taskdef(name: "junit",
wrapper {
// https://stackoverflow.com/a/54741656/2066598
- gradleVersion = '6.8'
+ gradleVersion = '7.0.1'
}
task adjustWrapperPropertiesFile {
Modified: poi/trunk/gradle/wrapper/gradle-wrapper.jar
URL: http://svn.apache.org/viewvc/poi/trunk/gradle/wrapper/gradle-wrapper.jar?rev=1889815&r1=1889814&r2=1889815&view=diff
==============================================================================
Binary files - no diff available.
Modified: poi/trunk/gradle/wrapper/gradle-wrapper.properties
URL: http://svn.apache.org/viewvc/poi/trunk/gradle/wrapper/gradle-wrapper.properties?rev=1889815&r1=1889814&r2=1889815&view=diff
==============================================================================
--- poi/trunk/gradle/wrapper/gradle-wrapper.properties (original)
+++ poi/trunk/gradle/wrapper/gradle-wrapper.properties Wed May 12 23:39:41 2021
@@ -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
Modified: poi/trunk/gradlew
URL: http://svn.apache.org/viewvc/poi/trunk/gradlew?rev=1889815&r1=1889814&r2=1889815&view=diff
==============================================================================
--- poi/trunk/gradlew (original)
+++ poi/trunk/gradlew Wed May 12 23:39:41 2021
@@ -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
Modified: poi/trunk/gradlew.bat
URL: http://svn.apache.org/viewvc/poi/trunk/gradlew.bat?rev=1889815&r1=1889814&r2=1889815&view=diff
==============================================================================
--- poi/trunk/gradlew.bat (original)
+++ poi/trunk/gradlew.bat Wed May 12 23:39:41 2021
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJa
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +54,7 @@ goto fail
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,21 +64,6 @@ echo location of your Java installation.
goto fail
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_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=%*
-
:execute
@rem Setup the command line
@@ -86,7 +71,7 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\
@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%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
:end
@rem End local scope for the variables with windows NT shell
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org
Re: svn commit: r1889815 - in /poi/trunk: build.gradle
gradle/wrapper/gradle-wrapper.jar gradle/wrapper/gradle-wrapper.properties
gradlew gradlew.bat
Posted by Nick Burch <ap...@gagravarr.org>.
On Thu, 13 May 2021, PJ Fanning wrote:
> The gradle-wrapper.jar was already part of our builds. It is in our POI
> 5.0.0 source distribution.
>
> If we remove gradle wrapper dir from source distribution, we should
> remove the gradlew scripts too.
Hopefully Dave can pop along in a bit to help answer and clarify, he is
our resident expert on this sort of thing!
Based on https://www.apache.org/legal/resolved.html and
https://www.apache.org/legal/release-policy.html I think the rules are:
Platform dependencies under incompatible licenses, eg GNU Build Tools /
Windows SDK / Java JDK, must be downloaded and installed by users
themselves
Suitably licensed dependencies and tools to help end users may be included
in the binary releases
Small suitably licensed dependencies or tools to help new developers may
be included in the version control, larger ones need to have helper
scripts to guide users to install them or auto-fetch them. eg maven
wrapper to get maven could be there, maven pom to get dependencies but not
all the dependencies themselves etc.
The source release packages need to be pristine, containing only sources
and instructions on manually installing any required build tools, they
must not include any pre-built binaries.
Assuming I've got all that right, gradle wrapper in svn / git is fine, but
needs to be excluded from source releases (which should instead tell you
what version of gradle to manually fetch)
Nick
Re: svn commit: r1889815 - in /poi/trunk: build.gradle
gradle/wrapper/gradle-wrapper.jar gradle/wrapper/gradle-wrapper.properties
gradlew gradlew.bat
Posted by PJ Fanning <fa...@yahoo.com.INVALID>.
Hi,
The gradle-wrapper.jar was already part of our builds. It is in our POI 5.0.0 source distribution.
If we remove gradle wrapper dir from source distribution, we should remove the gradlew scripts too.
On Thursday 13 May 2021, 10:30:30 IST, Nick Burch <ap...@gagravarr.org> wrote:
On Wed, 12 May 2021, fanningpj@apache.org wrote:
> Modified:
> poi/trunk/build.gradle
> poi/trunk/gradle/wrapper/gradle-wrapper.jar
> poi/trunk/gradle/wrapper/gradle-wrapper.properties
> poi/trunk/gradlew
> poi/trunk/gradlew.bat
Need to be careful with the Gradle wrapper, see
https://issues.apache.org/jira/browse/LEGAL-570
If I have followed that issue properly, you can have the gradle wrapper in
source control to help new developers, but it shouldn't include it in
source releases
Nick
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@poi.apache.org
For additional commands, e-mail: dev-help@poi.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@poi.apache.org
For additional commands, e-mail: dev-help@poi.apache.org
Re: svn commit: r1889815 - in /poi/trunk: build.gradle
gradle/wrapper/gradle-wrapper.jar gradle/wrapper/gradle-wrapper.properties
gradlew gradlew.bat
Posted by Nick Burch <ap...@gagravarr.org>.
On Wed, 12 May 2021, fanningpj@apache.org wrote:
> Modified:
> poi/trunk/build.gradle
> poi/trunk/gradle/wrapper/gradle-wrapper.jar
> poi/trunk/gradle/wrapper/gradle-wrapper.properties
> poi/trunk/gradlew
> poi/trunk/gradlew.bat
Need to be careful with the Gradle wrapper, see
https://issues.apache.org/jira/browse/LEGAL-570
If I have followed that issue properly, you can have the gradle wrapper in
source control to help new developers, but it shouldn't include it in
source releases
Nick
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@poi.apache.org
For additional commands, e-mail: dev-help@poi.apache.org