IDK how this got reverted. Doing the required changes to upgrade Gradle now. -- Thanks & Regards Pawan Verma Technical Consultant *HotWax Systems* *Enterprise open source experts* http://www.hotwaxsystems.com
On Wed, Aug 19, 2020 at 6:02 PM <pa...@apache.org> wrote: > This is an automated email from the ASF dual-hosted git repository. > > pawan pushed a commit to branch trunk > in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git > > commit 3ac939772da01c995ac494a7256ca04ed61c04ce > Author: Pawan Verma <pawan.ve...@hotwaxsystems.com> > AuthorDate: Fri Aug 14 15:05:50 2020 +0530 > > Revert "Improved: Upgrade Gradle to V6.5.1 (OFBIZ-11946)" > > This reverts commit 8af9413193fd30936a2e57119b10220e427c4c73. > --- > gradle/init-gradle-wrapper.ps1 | 6 +++--- > gradle/wrapper/gradle-wrapper.jar | Bin 58910 -> 55741 bytes > gradle/wrapper/gradle-wrapper.properties | 2 +- > gradlew | 35 > +++++++++++++++++-------------- > gradlew.bat | 4 ---- > 5 files changed, 23 insertions(+), 24 deletions(-) > > diff --git a/gradle/init-gradle-wrapper.ps1 > b/gradle/init-gradle-wrapper.ps1 > index 323c48b..c5fb0df 100644 > --- a/gradle/init-gradle-wrapper.ps1 > +++ b/gradle/init-gradle-wrapper.ps1 > @@ -21,7 +21,7 @@ if ((Test-Path -Path ((Get-Item -Path ".\").FullName + > "\gradle\wrapper\gradle-w > } > > # HTTPS is not used because it gets complicated with Powershell and .Net > framework versions > -Invoke-WebRequest -outf gradle\wrapper\gradle-wrapper.jar > http://dl.bintray.com/apacheofbiz/GradleWrapper/v6.5.1/gradle-wrapper.jar > -Invoke-WebRequest > <http://dl.bintray.com/apacheofbiz/GradleWrapper/v6.5.1/gradle-wrapper.jar-Invoke-WebRequest> > -outf gradle\wrapper\gradle-wrapper.properties > http://dl.bintray.com/apacheofbiz/GradleWrapper/v6.5.1/gradle-wrapper.properties > -Invoke-WebRequest > <http://dl.bintray.com/apacheofbiz/GradleWrapper/v6.5.1/gradle-wrapper.properties-Invoke-WebRequest> > -outf gradlew.bat > http://dl.bintray.com/apacheofbiz/GradleWrapper/v6.5.1/gradlew.bat > +Invoke-WebRequest > <http://dl.bintray.com/apacheofbiz/GradleWrapper/v6.5.1/gradlew.bat+Invoke-WebRequest> > -outf gradle\wrapper\gradle-wrapper.jar > http://dl.bintray.com/apacheofbiz/GradleWrapper/v5.0.0/gradle-wrapper.jar > +Invoke-WebRequest > <http://dl.bintray.com/apacheofbiz/GradleWrapper/v5.0.0/gradle-wrapper.jar+Invoke-WebRequest> > -outf gradle\wrapper\gradle-wrapper.properties > http://dl.bintray.com/apacheofbiz/GradleWrapper/v5.0.0/gradle-wrapper.properties > +Invoke-WebRequest > <http://dl.bintray.com/apacheofbiz/GradleWrapper/v5.0.0/gradle-wrapper.properties+Invoke-WebRequest> > -outf gradlew.bat > http://dl.bintray.com/apacheofbiz/GradleWrapper/v5.0.0/gradlew.bat > > diff --git a/gradle/wrapper/gradle-wrapper.jar > b/gradle/wrapper/gradle-wrapper.jar > index 62d4c05..457aad0 100644 > 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 bb8b2fc..a4b4429 100644 > --- 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.5.1-bin.zip > +distributionUrl=https\:// > services.gradle.org/distributions/gradle-6.3-bin.zip > zipStoreBase=GRADLE_USER_HOME > zipStorePath=wrapper/dists > diff --git a/gradlew b/gradlew > index fbd7c51..8e25e6c 100755 > --- a/gradlew > +++ b/gradlew > @@ -82,7 +82,6 @@ esac > > CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar > > - > # Determine the Java command to use to start the JVM. > if [ -n "$JAVA_HOME" ] ; then > if [ -x "$JAVA_HOME/jre/sh/java" ] ; then > @@ -126,11 +125,10 @@ if $darwin; then > GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" > \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" > fi > > -# For Cygwin or MSYS, switch paths to Windows format before running java > -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then > +# For Cygwin, switch paths to Windows format before running java > +if $cygwin ; 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 > @@ -156,19 +154,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then > else > eval `echo args$i`="\"$arg\"" > fi > - i=`expr $i + 1` > + i=$((i+1)) > done > case $i in > - 0) set -- ;; > - 1) set -- "$args0" ;; > - 2) set -- "$args0" "$args1" ;; > - 3) set -- "$args0" "$args1" "$args2" ;; > - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; > - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; > - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; > - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" > "$args6" ;; > - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" > "$args6" "$args7" ;; > - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" > "$args6" "$args7" "$args8" ;; > + (0) set -- ;; > + (1) set -- "$args0" ;; > + (2) set -- "$args0" "$args1" ;; > + (3) set -- "$args0" "$args1" "$args2" ;; > + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; > + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; > + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" > ;; > + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" > "$args6" ;; > + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" > "$args6" "$args7" ;; > + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" > "$args6" "$args7" "$args8" ;; > esac > fi > > @@ -177,9 +175,14 @@ save () { > for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' > \\\\/" ; done > echo " " > } > -APP_ARGS=`save "$@"` > +APP_ARGS=$(save "$@") > > # Collect all arguments for the java command, following the shell quoting > and substitution rules > eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS > "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" > org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" > > +# by default we should be in the correct project dir, but when run from > Finder on Mac, the cwd is wrong > +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then > + cd "$(dirname "$0")" > +fi > + > exec "$JAVACMD" "$@" > diff --git a/gradlew.bat b/gradlew.bat > index 5093609..9618d8d 100644 > --- a/gradlew.bat > +++ b/gradlew.bat > @@ -29,9 +29,6 @@ if "%DIRNAME%" == "" set DIRNAME=. > set APP_BASE_NAME=%~n0 > set APP_HOME=%DIRNAME% > > -@rem Resolve any "." and ".." in APP_HOME to make it shorter. > -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi > - > @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="-Xmx64m" "-Xms64m" > > @@ -84,7 +81,6 @@ set CMD_LINE_ARGS=%* > > 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% > > >
