You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by dw...@apache.org on 2021/10/26 07:16:04 UTC
[lucene] branch main updated: LUCENE-10198: Allow external
JAVA_OPTS in gradlew scripts;
use sane defaults (heap, stack and system proxies) (#405)
This is an automated email from the ASF dual-hosted git repository.
dweiss pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/lucene.git
The following commit(s) were added to refs/heads/main by this push:
new 780846a LUCENE-10198: Allow external JAVA_OPTS in gradlew scripts; use sane defaults (heap, stack and system proxies) (#405)
780846a is described below
commit 780846a732b9c3f9c8b0abeae7d1d2c19df524e4
Author: Dawid Weiss <da...@carrotsearch.com>
AuthorDate: Tue Oct 26 09:15:55 2021 +0200
LUCENE-10198: Allow external JAVA_OPTS in gradlew scripts; use sane defaults (heap, stack and system proxies) (#405)
Co-authored-by: balmukundblr <ba...@intel.com>
---
gradle/help.gradle | 2 +-
gradlew | 14 +++++++++++---
gradlew.bat | 9 ++++++---
lucene/CHANGES.txt | 3 +++
4 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/gradle/help.gradle b/gradle/help.gradle
index 83d6181..370f28a 100644
--- a/gradle/help.gradle
+++ b/gradle/help.gradle
@@ -53,7 +53,7 @@ configure(rootProject) {
" gradlew :help%-16s # %s", section, sectionInfo)
}
println ""
- println "For the impatient, build the project with 'gradlew assemble' or 'gradlew dev' "
+ println "For the impatient, build the project with 'gradlew assemble'"
}
}
diff --git a/gradlew b/gradlew
index 0ccd1fb..d79eded 100755
--- a/gradlew
+++ b/gradlew
@@ -44,7 +44,14 @@ 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 -Xms64m -Djava.net.useSystemProxies=true'
+
+# Define this environment variable to override the default JVM options.
+if [ ! -n "$JAVA_OPTS" ] ; then
+ JAVA_OPTS="$DEFAULT_JVM_OPTS"
+fi
+
+echo "# $JAVA_OPTS"
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
@@ -114,8 +121,9 @@ DEFAULT_JVM_OPTS="$DEFAULT_JVM_OPTS \"-Djava.io.tmpdir=$GRADLE_TEMPDIR\""
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
fi
+
GRADLE_WRAPPER_JAR="$APP_HOME/gradle/wrapper/gradle-wrapper.jar"
-if ! "$JAVACMD" --source 11 "$APP_HOME/buildSrc/src/main/java/org/apache/lucene/gradle/WrapperDownloader.java" "$GRADLE_WRAPPER_JAR" ; then
+if ! "$JAVACMD" $JAVA_OPTS --source 11 "$APP_HOME/buildSrc/src/main/java/org/apache/lucene/gradle/WrapperDownloader.java" "$GRADLE_WRAPPER_JAR" ; then
echo "\nSomething went wrong. Make sure you're using Java 11 or later."
exit $?
fi
@@ -200,7 +208,7 @@ 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 $GRADLE_DAEMON_CTRL "$APP_ARGS"
+eval set -- $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain $GRADLE_DAEMON_CTRL "$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
diff --git a/gradlew.bat b/gradlew.bat
index fe7be72..9247f24 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -33,7 +33,10 @@ set APP_HOME=%DIRNAME%
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"
+set DEFAULT_JVM_OPTS=-Xmx64m -Xms64m -Djava.net.useSystemProxies=true
+
+@rem Define this environment variable to override the default JVM options.
+IF NOT defined JAVA_OPTS SET "JAVA_OPTS=%DEFAULT_JVM_OPTS%"
@rem LUCENE-9471: workaround for gradle leaving junk temp. files behind.
SET GRADLE_TEMPDIR=%DIRNAME%\.gradle\tmp
@@ -73,7 +76,7 @@ goto fail
@rem LUCENE-9266: verify and download the gradle wrapper jar if we don't have one.
set GRADLE_WRAPPER_JAR=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-"%JAVA_EXE%" --source 11 "%APP_HOME%/buildSrc/src/main/java/org/apache/lucene/gradle/WrapperDownloader.java" "%GRADLE_WRAPPER_JAR%"
+"%JAVA_EXE%" %JAVA_OPTS% --source 11 "%APP_HOME%/buildSrc/src/main/java/org/apache/lucene/gradle/WrapperDownloader.java" "%GRADLE_WRAPPER_JAR%"
IF %ERRORLEVEL% NEQ 0 goto fail
@rem Setup the command line
@@ -84,7 +87,7 @@ SET GRADLE_DAEMON_CTRL=
IF NOT EXIST "%DIRNAME%\gradle.properties" SET GRADLE_DAEMON_CTRL=--no-daemon
@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %GRADLE_DAEMON_CTRL% %*
+"%JAVA_EXE%" %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %GRADLE_DAEMON_CTRL% %*
:end
@rem End local scope for the variables with windows NT shell
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 96d42cb..44800ea 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -386,6 +386,9 @@ Changes in Backwards Compatibility Policy
Build
---------------------
+* LUCENE-10198: LUCENE-10198: Allow external JAVA_OPTS in gradlew scripts; use sane defaults
+ (balmukund.mandal@intel.com, Dawid Weiss)
+
* LUCENE-10163: Move LICENSE and NOTICE files to top level to satisfy src artifact requirements (janhoy)
Other