honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update Gradle wrapper to 6.4 (#55338)

This commit is contained in:
Mark Vieira 2020-05-06 14:52:45 -07:00
parent c775e47054
commit 91cba091ed
No known key found for this signature in database
GPG Key ID: CA947EF7E6D4B105
7 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildSrc/src/main/resources/minimumGradleVersion
View File

@ -1 +1 @@
6.3 6.4

4
buildSrc/src/test/java/org/elasticsearch/gradle/test/GradleThreadsFilter.java
View File

@ -24,12 +24,12 @@ import com.carrotsearch.randomizedtesting.ThreadFilter;
/** /**
* Filter out threads controlled by gradle that may be created during unit tests. * Filter out threads controlled by gradle that may be created during unit tests.
* *
* Currently this is only the pooled threads for Exec. * Currently this includes pooled threads for Exec as well as file system event watcher threads.
*/ */
public class GradleThreadsFilter implements ThreadFilter { public class GradleThreadsFilter implements ThreadFilter {
@Override @Override
public boolean reject(Thread t) { public boolean reject(Thread t) {
return t.getName().startsWith("Exec process"); return t.getName().startsWith("Exec process") || t.getName().startsWith("File watcher consumer");
} }
} }

2
distribution/packages/build.gradle
View File

@ -52,7 +52,7 @@ import java.util.regex.Pattern
*/ */
plugins { plugins {
id "nebula.ospackage-base" version "8.1.0" id "nebula.ospackage-base" version "8.3.0"
} }
void addProcessFilesTask(String type, boolean oss, boolean jdk) { void addProcessFilesTask(String type, boolean oss, boolean jdk) {

BIN
gradle/wrapper/gradle-wrapper.jar vendored
View File

Binary file not shown.

4
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-6.4-all.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionSha256Sum=0f316a67b971b7b571dac7215dcf2591a30994b3450e0629925ffcfe2c68cc5c distributionSha256Sum=d08f7e24d061910382c2fda9915e6ed42dd1480ae2e99211f92c70190cb697e0

2
gradlew vendored
View File

@ -82,6 +82,7 @@ esac
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
# Determine the Java command to use to start the JVM. # Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@ -129,6 +130,7 @@ fi
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"` APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"` JAVACMD=`cygpath --unix "$JAVACMD"`
# We build the pattern for arguments to be converted via cygpath # We build the pattern for arguments to be converted via cygpath

1
gradlew.bat vendored
View File

@ -84,6 +84,7 @@ set CMD_LINE_ARGS=%*
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
@rem Execute Gradle @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% "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%