[ofbiz-framework] branch trunk updated: Improvement: Upgrade Gradle and Groovy
This is an automated email from the ASF dual-hosted git repository. jleroux pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git The following commit(s) were added to refs/heads/trunk by this push: new d0eae33 Improvement: Upgrade Gradle and Groovy d0eae33 is described below commit d0eae336224a28d9f432c385031fae3033f1ed63 Author: Jacques Le Roux AuthorDate: Fri May 8 13:32:07 2020 +0200 Improvement: Upgrade Gradle and Groovy (OFBIZ-11661) Puts back the ASL2 header and the -Xms64m value --- gradlew | 18 +- gradlew.bat | 18 +- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/gradlew b/gradlew index af6708f..8e25e6c 100755 --- a/gradlew +++ b/gradlew @@ -1,5 +1,21 @@ #!/usr/bin/env sh +# +# 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. +# + ## ## ## Gradle start up script for UN*X @@ -28,7 +44,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" diff --git a/gradlew.bat b/gradlew.bat index 6d57edc..9618d8d 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,3 +1,19 @@ +@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 @@ -14,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
[ofbiz-framework] branch trunk updated: Improvement: Upgrade Gradle and Groovy
This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new 5ff7852 Improvement: Upgrade Gradle and Groovy
5ff7852 is described below
commit 5ff7852e506f342cad63ec65f86910ea1c15d9bc
Author: Jacques Le Roux
AuthorDate: Wed May 6 15:12:43 2020 +0200
Improvement: Upgrade Gradle and Groovy
(OFBIZ-11661)
Increases tasks.checkstyleMain.maxErrors from 36894 to 37094
Too much detected after Gradle upgrade to fix manually
The checkstyle plugin is automatically updated with the Gradle version
(you don't define a checkstyle plugin version)
---
build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.gradle b/build.gradle
index 5625bd0..c8725cf 100644
--- a/build.gradle
+++ b/build.gradle
@@ -286,7 +286,7 @@ checkstyle {
// the sum of errors found last time it was changed after using the
// ‘checkstyle’ tool present in the framework and in the official
// plugins.
-tasks.checkstyleMain.maxErrors = 36894
+tasks.checkstyleMain.maxErrors = 37094
// Currently there are a lot of errors so we need to temporarily
// hide them to avoid polluting the terminal output.
showViolations = false
[ofbiz-framework] branch trunk updated: Improvement: Upgrade Gradle and Groovy
This is an automated email from the ASF dual-hosted git repository. jleroux pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git The following commit(s) were added to refs/heads/trunk by this push: new 00ec6c6 Improvement: Upgrade Gradle and Groovy 00ec6c6 is described below commit 00ec6c677b7948178e1232b3d463ce49b69d62eb Author: Jacques Le Roux AuthorDate: Wed May 6 15:08:57 2020 +0200 Improvement: Upgrade Gradle and Groovy (OFBIZ-11661) Fixes a known issue with config/checkstyle/checkstyle.xml: TreeWalker is not allowed as a parent of LineLength Please review 'Parent Module' section for this Check in web documentation if Check is standard --- config/checkstyle/checkstyle.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml index 0788c24..527945a 100644 --- a/config/checkstyle/checkstyle.xml +++ b/config/checkstyle/checkstyle.xml @@ -40,6 +40,9 @@ under the License. + + + @@ -62,9 +65,6 @@ under the License. - - -
[ofbiz-framework] branch trunk updated: Improvement: Upgrade Gradle and Groovy
This is an automated email from the ASF dual-hosted git repository.
jamesyong pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new ff21950 Improvement: Upgrade Gradle and Groovy
new 3da9ff4 Merge remote-tracking branch 'origin/trunk' into trunk
ff21950 is described below
commit ff219500248373fafb39ee57f12f30147df318a7
Author: James Yong
AuthorDate: Wed May 6 20:22:38 2020 +0800
Improvement: Upgrade Gradle and Groovy
(OFBIZ-11661)
Upgrade to Gradle 6.3 and Groovy 2.5.11. Both are current stable versions.
---
build.gradle | 4 ++--
gradle/wrapper/gradle-wrapper.jar| Bin 55616 -> 55741 bytes
gradle/wrapper/gradle-wrapper.properties | 2 +-
gradlew | 18 +-
gradlew.bat | 18 +-
5 files changed, 5 insertions(+), 37 deletions(-)
diff --git a/build.gradle b/build.gradle
index df0952c..5625bd0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -98,7 +98,7 @@ javadoc {
links(
'https://docs.oracle.com/javase/8/docs/api',
'https://tomcat.apache.org/tomcat-9.0-doc/servletapi/',
-'http://docs.groovy-lang.org/docs/groovy-2.5.8/html/api',
+'http://docs.groovy-lang.org/docs/groovy-2.5.11/html/api',
'https://commons.apache.org/proper/commons-cli/apidocs'
)
}
@@ -187,7 +187,7 @@ dependencies {
implementation 'org.apache.xmlgraphics:fop:2.3' // NOTE: in 2.4
dependencies are messed up. See
https://github.com/moqui/moqui-fop/blob/master/build.gradle
implementation 'org.apache.xmlrpc:xmlrpc-client:3.1.3'
implementation 'org.apache.xmlrpc:xmlrpc-server:3.1.3'
-implementation 'org.codehaus.groovy:groovy-all:2.5.8' // Compile issue
with commons-cli and Groovy 3. Remember to change the version number in javadoc
block.
+implementation 'org.codehaus.groovy:groovy-all:2.5.11' // Compile issue
with commons-cli and Groovy 3. Remember to change the version number in javadoc
block.
implementation 'org.freemarker:freemarker:2.3.30' // Remember to change
the version number in FreeMarkerWorker class when upgrading. See OFBIZ-10019 if
>= 2.4
implementation 'org.owasp.esapi:esapi:2.2.0.0'
implementation 'org.springframework:spring-test:5.2.5.RELEASE'
diff --git a/gradle/wrapper/gradle-wrapper.jar
b/gradle/wrapper/gradle-wrapper.jar
index 5c2d1cf..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 75b8c7c..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-5.0-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 8e25e6c..af6708f 100755
--- a/gradlew
+++ b/gradlew
@@ -1,21 +1,5 @@
#!/usr/bin/env sh
-#
-# 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.
-#
-
##
##
## Gradle start up script for UN*X
@@ -44,7 +28,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" "-Xms64m"'
+DEFAULT_JVM_OPTS='"-Xmx64m"'
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
diff --git a/gradlew.bat b/gradlew.bat
index 9618d8d..6d57edc 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,19 +1,3 @@
-@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"
