upgrade gradle => 8.7

build.gradle

@@ -18,7 +18,7 @@ plugins {
     id 'signing'
     id 'maven-publish'
     id 'io.github.gradle-nexus.publish-plugin' version '1.2.0'
-    id 'com.adarshr.test-logger' version '3.2.0'
+    id 'com.adarshr.test-logger' version '4.0.0'
 }
 
 apply plugin: 'java'
@@ -46,13 +46,14 @@ configurations {
 }
 
 dependencies {
-    implementation (group: 'org.elasticsearch', name: 'elasticsearch', version: versions.elasticsearch) {
+    implementation(group: 'org.elasticsearch', name: 'elasticsearch', version: versions.elasticsearch) {
         exclude group: 'org.elasticsearch', module: 'elasticsearch-preallocate'
     }
     implementation(group: 'org.apache.lucene', name: 'lucene-analyzers-morfologik', version: versions.lucene) {
         exclude group: 'ua.net.nlp'
     }
     testImplementation group: 'org.testcontainers', name: 'testcontainers', version: versions.testcontainers
+    testImplementation group: 'org.apache.commons', name: 'commons-compress', version: '1.26.1'
     testImplementation group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: versions.log4j
     testImplementation group: 'org.spockframework', name: 'spock-core', version: versions.spock
     testImplementation group: 'org.codehaus.groovy', name: 'groovy-all', version: versions.groovy
@@ -63,7 +64,7 @@ compileJava {
     targetCompatibility = JavaVersion.VERSION_11
 }
 
-tasks.withType(GroovyCompile) {
+tasks.withType(GroovyCompile).configureEach {
     options.compilerArgs << "-proc:none"
 }
 
@@ -81,36 +82,37 @@ testlogger {
     theme 'mocha'
 }
 
-task makePluginDescriptor(type: Copy) {
+tasks.register('makePluginDescriptor', Copy) {
     from 'src/main/templates'
-    into "${project.buildDir}/tmp/plugin"
+    into layout.buildDirectory.dir("tmp/plugin")
     expand([
             'descriptor': [
                     'name'                : pluginName,
                     'classname'           : pluginClassname,
                     'description'         : pluginDescription,
                     'version'             : project.property('version'),
-                    'javaVersion'         : project.property('targetCompatibility'),
+                    'javaVersion'         : JavaVersion.VERSION_11,
                     'elasticsearchVersion': versions.elasticsearch
             ]
     ])
 }
 
 task buildPluginZip(type: Zip, dependsOn: [':javadocJar', ':sourcesJar', ':jar', ':makePluginDescriptor']) {
-    from "${project.buildDir}/${libsDirName}"
+    from layout.buildDirectory.dir("libs")
     from configurations.releaseJars
     from 'build/tmp/plugin'
 }
 
-task unpackPlugin(type: Copy, dependsOn: [':buildPluginZip']) {
+tasks.register('unpackPlugin', Copy) {
+    dependsOn[':buildPluginZip']
     delete "plugins"
-    from "${project.buildDir}/${libsDirName}"
+    from layout.buildDirectory.dir("libs")
     from configurations.releaseJars
     from 'build/tmp/plugin'
     into "plugins/${pluginName}"
 }
 
-tasks.withType(Test) {
+tasks.withType(Test).configureEach {
     testLogging {
         exceptionFormat = 'full'
         events = ["failed", "skipped", "passed"]
@@ -129,7 +131,7 @@ artifacts {
 }
 
 wrapper {
-    gradleVersion = '8.4'
+    gradleVersion = '8.7'
     distributionType = Wrapper.DistributionType.ALL
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -130,26 +131,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -198,11 +202,11 @@ fi
 # 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"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

src/test/groovy/pl/allegro/tech/elasticsearch/plugin/analysis/morfologik/ElasticsearchWithPluginContainer.java

@@ -1,5 +1,6 @@
 package pl.allegro.tech.elasticsearch.plugin.analysis.morfologik;
 
+import org.testcontainers.containers.BindMode;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
 import org.testcontainers.images.builder.ImageFromDockerfile;
@@ -37,7 +38,7 @@ public ElasticsearchWithPluginContainer(String dockerImageName) {
 
     public ElasticsearchWithPluginContainer withPlugin(File pluginZipFile) {
         plugin = pluginZipFile;
-        return this.withFileSystemBind(plugin.getPath(), "/tmp/plugins/" + plugin.getName());
+        return this.withFileSystemBind(plugin.getPath(), "/tmp/plugins/" + plugin.getName(), BindMode.READ_ONLY);
     }
 
     private ImageFromDockerfile prepareImage(String imageName) {
@@ -75,6 +76,6 @@ public String getHttpHostAddress() {
     }
 
     public ElasticsearchWithPluginContainer withCustomConfigFile(File configFile) {
-        return this.withFileSystemBind(configFile.getPath(), "/usr/share/elasticsearch/config/" + configFile.getName());
+        return this.withFileSystemBind(configFile.getPath(), "/usr/share/elasticsearch/config/" + configFile.getName(), BindMode.READ_ONLY);
     }
 }