Author: mthl
Date: Sat Jun 29 23:04:35 2019
New Revision: 1862326
URL: http://svn.apache.org/viewvc?rev=1862326&view=rev
Log:
Improved: Upgrade to Gradle 5.5
(OFBIZ-11131)
The upgrade has been done with the following command:
$ ./gradlew wrapper --gradle-version=5.5 --distribution-type=bin
Our “gradlew” scripts modification has been preserved and
“gradle/init-gradle-wrapper.sh” has been updated to download the new
version of the wrapper jar.
Modified:
ofbiz/ofbiz-framework/trunk/gradle/init-gradle-wrapper.sh
ofbiz/ofbiz-framework/trunk/gradlew
ofbiz/ofbiz-framework/trunk/gradlew.bat
Modified: ofbiz/ofbiz-framework/trunk/gradle/init-gradle-wrapper.sh
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/gradle/init-gradle-wrapper.sh?rev=1862326&r1=1862325&r2=1862326&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/gradle/init-gradle-wrapper.sh (original)
+++ ofbiz/ofbiz-framework/trunk/gradle/init-gradle-wrapper.sh Sat Jun 29
23:04:35 2019
@@ -19,7 +19,7 @@
OFBIZ_HOME="$(pwd)"
GRADLE_OFBIZ_PATH="$OFBIZ_HOME/gradle"
GRADLE_WRAPPER_OFBIZ_PATH="$GRADLE_OFBIZ_PATH/wrapper"
-RELEASE="5.0.0"
+RELEASE="5.5.0"
#GRADLE_WRAPPER_URI="https://github.com/gradle/gradle/blob/v${RELEASE}/gradle/wrapper";
GRADLE_WRAPPER_URI="https://svn.apache.org/repos/asf/ofbiz/tools/Buildbot/Gradle/Wrapper/trunk/";
GRADLE_WRAPPER_JAR="gradle-wrapper.jar"
Modified: ofbiz/ofbiz-framework/trunk/gradlew
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/gradlew?rev=1862326&r1=1862325&r2=1862326&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/gradlew (original)
+++ ofbiz/ofbiz-framework/trunk/gradlew Sat Jun 29 23:04:35 2019
@@ -7,26 +7,27 @@ if [ ! -r ./gradle/wrapper/gradle-wrappe
sh ./gradle/init-gradle-wrapper.sh
fi
-#####################################################################
-## Gradle start up script for UN*X
-#####################################################################
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# https://www.apache.org/licenses/LICENSE-2.0
#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#####################################################################
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+##
+## Gradle start up script for UN*X
+##
+##############################################################################
# Attempt to set APP_HOME
# Resolve links: $0 may be a link
@@ -50,7 +51,7 @@ 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='"-Xmx64m"'
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
Modified: ofbiz/ofbiz-framework/trunk/gradlew.bat
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/gradlew.bat?rev=1862326&r1=1862325&r2=1862326&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/gradlew.bat (original)
+++ ofbiz/ofbiz-framework/trunk/gradlew.bat Sat Jun 29 23:04:35 2019
@@ -1,23 +1,24 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
+@rem
@rem Gradle startup script for Windows
-@rem ##########################################################################
-@rem Licensed to the Apache Software Foundation (ASF) under one
-@rem or more contributor license agreements. See the NOTICE file
-@rem distributed with this work for additional information
-@rem regarding copyright ownership. The ASF licenses this file
-@rem to you under the Apache License, Version 2.0 (the
-@rem "License"); you may not use this file except in compliance
-@rem with the License. You may obtain a copy of the License at
-@rem
-@rem http://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing,
-@rem software distributed under the License is distributed on an
-@rem "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-@rem KIND, either express or implied. See the License for the
-@rem specific language governing permissions and limitations
-@rem under the License.
+@rem
@rem ##########################################################################
@rem Set local scope for the variables with windows NT shell
@@ -29,7 +30,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="-Xmx64m"
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
@@ -86,7 +87,6 @@ if exist "%CLASSPATH%" goto GradleOK
md %APP_HOME%\gradle\wrapper\
Powershell.exe -executionpolicy remotesigned -File
%APP_HOME%\init-gradle-wrapper.ps1
-:GradleOK
@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%
