Author: jleroux
Date: Mon Jul 8 13:10:42 2019
New Revision: 1862745
URL: http://svn.apache.org/viewvc?rev=1862745&view=rev
Log:
Reverted: Remove the Gradle wrapper from our release packages and add a step to
our build notes
(OFBIZ-10145)
As discussed in dev ML and OFBIZ-11133, reverts all commits done for
OFBIZ-10145:
r1862356, r1862354, r1862353, r1861783, r1861766
But keeps in README.doc the added line in r1861766:
==== Clean system and load the complete OFBiz data
I'm uncertain about what will happen with the gradle/wrapper directory and the
wrapper version there (currently 5.5 and in between these commits).
But anyway not a big deal to get it back
Removed:
ofbiz/ofbiz-framework/trunk/gradle/init-gradle-wrapper.ps1
ofbiz/ofbiz-framework/trunk/gradle/init-gradle-wrapper.sh
Modified:
ofbiz/ofbiz-framework/trunk/.gitignore
ofbiz/ofbiz-framework/trunk/.hgignore
ofbiz/ofbiz-framework/trunk/README.adoc
ofbiz/ofbiz-framework/trunk/gradlew
ofbiz/ofbiz-framework/trunk/gradlew.bat
Modified: ofbiz/ofbiz-framework/trunk/.gitignore
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/.gitignore?rev=1862745&r1=1862744&r2=1862745&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/.gitignore (original)
+++ ofbiz/ofbiz-framework/trunk/.gitignore Mon Jul 8 13:10:42 2019
@@ -2,7 +2,6 @@ bin/
build/
applications/*/build
framework/*/build
-gradle/wrapper
plugins/
runtime/git-rebase/*
runtime/SvnInfo.ftl
Modified: ofbiz/ofbiz-framework/trunk/.hgignore
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/.hgignore?rev=1862745&r1=1862744&r2=1862745&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/.hgignore (original)
+++ ofbiz/ofbiz-framework/trunk/.hgignore Mon Jul 8 13:10:42 2019
@@ -1,6 +1,5 @@
syntax: regexp
^(framework|applications|plugins)/[^/]+/build/.*$
-^gradle/wrapper/.*$
^ofbiz\.jar$
^runtime/data/derby/.*$
^runtime/logs/.*(log|html)(|.\d+)$
Modified: ofbiz/ofbiz-framework/trunk/README.adoc
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/README.adoc?rev=1862745&r1=1862744&r2=1862745&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/README.adoc (original)
+++ ofbiz/ofbiz-framework/trunk/README.adoc Mon Jul 8 13:10:42 2019
@@ -72,19 +72,6 @@ the command line at the OFBiz top level
[[prepare-ofbiz]]
=== Prepare OFBiz:
-==== Setting up the Gradle Wrapper
-
-*Unix-like OS*: ensure that your system have `curl` or `wget` and run
`./gradlew`
-
-*MS Windows*: run `gradlew`
-
-if some inconveniences appear please remove `OFBiz-root/gradle/wrapper`
directory and run again.
-
-*Manual setting*
-
-* Get to https://github.com/gradle/gradle/blob/v5.0.0/gradle/wrapper,
gradle-wrapper.jar and gradle-wrapper.properties
-* Copy both files in your OFBiz-root\gradle\wrapper directory, that's it.
-
==== Clean system and load the complete OFBiz data
_________________________________________________________________________________________________________________________________________________________________________________________________________________
_Note_: Depending on your Internet connection speed it might take a long time
Modified: ofbiz/ofbiz-framework/trunk/gradlew
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/gradlew?rev=1862745&r1=1862744&r2=1862745&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/gradlew (original)
+++ ofbiz/ofbiz-framework/trunk/gradlew Mon Jul 8 13:10:42 2019
@@ -1,11 +1,4 @@
#!/usr/bin/env sh
-#####################################################################
-# Apache OFBiz part
-# if the gradle-wrapper.jar isn't present, call init to download it
-#####################################################################
-if [ ! -r ./gradle/wrapper/gradle-wrapper.jar ]; then
- sh ./gradle/init-gradle-wrapper.sh
-fi
#
# Copyright 2015 the original author or authors.
Modified: ofbiz/ofbiz-framework/trunk/gradlew.bat
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/gradlew.bat?rev=1862745&r1=1862744&r2=1862745&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/gradlew.bat (original)
+++ ofbiz/ofbiz-framework/trunk/gradlew.bat Mon Jul 8 13:10:42 2019
@@ -78,11 +78,8 @@ set CMD_LINE_ARGS=%*
:execute
@rem Setup the command line
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-@rem Overwrites the local Gradle Wrapper files from tools repo in all cases
(it's only 55kb).
-@rem This way we are sure to always use the latest version. At least when an
Internet connexion is available.
-Powershell.exe -executionpolicy remotesigned -File
%APP_HOME%\gradle\init-gradle-wrapper.ps1
+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%
