Author: taher Date: Mon Dec 3 16:34:50 2018 New Revision: 1848062 URL: http://svn.apache.org/viewvc?rev=1848062&view=rev Log: Implemented: upgrade gradle wrapper to version 5.0 (OFBIZ-9972)
After finally resolving the issue with gradle not accepting spaces in task names, we are able to smoothly upgrade to gradle version 5. This has reference to the discussion thread: https://s.apache.org/vQgW Thanks: Mathieu Lirzin for feedback and test patch. Modified: ofbiz/ofbiz-framework/trunk/gradle/wrapper/gradle-wrapper.jar ofbiz/ofbiz-framework/trunk/gradle/wrapper/gradle-wrapper.properties ofbiz/ofbiz-framework/trunk/gradlew ofbiz/ofbiz-framework/trunk/gradlew.bat Modified: ofbiz/ofbiz-framework/trunk/gradle/wrapper/gradle-wrapper.jar URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/gradle/wrapper/gradle-wrapper.jar?rev=1848062&r1=1848061&r2=1848062&view=diff ============================================================================== Binary files - no diff available. Modified: ofbiz/ofbiz-framework/trunk/gradle/wrapper/gradle-wrapper.properties URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/gradle/wrapper/gradle-wrapper.properties?rev=1848062&r1=1848061&r2=1848062&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/gradle/wrapper/gradle-wrapper.properties (original) +++ ofbiz/ofbiz-framework/trunk/gradle/wrapper/gradle-wrapper.properties Mon Dec 3 16:34:50 2018 @@ -17,9 +17,8 @@ # under the License. ############################################################################### -#Tue Dec 27 13:23:07 AST 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.2.1-bin.zip Modified: ofbiz/ofbiz-framework/trunk/gradlew URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/gradlew?rev=1848062&r1=1848061&r2=1848062&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/gradlew (original) +++ ofbiz/ofbiz-framework/trunk/gradlew Mon Dec 3 16:34:50 2018 @@ -43,16 +43,16 @@ APP_NAME="Gradle" APP_BASE_NAME=`basename "$0"` # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +DEFAULT_JVM_OPTS='"-Xmx64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" -warn ( ) { +warn () { echo "$*" } -die ( ) { +die () { echo echo "$*" echo @@ -170,7 +170,7 @@ if $cygwin ; then fi # Escape application args -save ( ) { +save () { for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done echo " " } Modified: ofbiz/ofbiz-framework/trunk/gradlew.bat URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/gradlew.bat?rev=1848062&r1=1848061&r2=1848062&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/gradlew.bat (original) +++ ofbiz/ofbiz-framework/trunk/gradlew.bat Mon Dec 3 16:34:50 2018 @@ -29,7 +29,7 @@ set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @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 DEFAULT_JVM_OPTS="-Xmx64m" @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome