Upgrade gradle to 8.5

.github/workflows/integ-tests-with-security.yml

@@ -20,7 +20,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [ 11, 17 ]
+        java: [ 11, 17, 21 ]
 
     runs-on: ubuntu-latest
     container:

.github/workflows/sql-pitest.yml

@@ -23,6 +23,7 @@ jobs:
         java:
           - 11
           - 17
+          - 21
     runs-on: ubuntu-latest
     container:
       # using the same image which is used by opensearch-build team to build the OpenSearch Distribution

.github/workflows/sql-test-and-build-workflow.yml

@@ -31,6 +31,7 @@ jobs:
         java:
           - 11
           - 17
+          - 21
     runs-on: ubuntu-latest
     container:
       # using the same image which is used by opensearch-build team to build the OpenSearch Distribution

.github/workflows/sql-test-workflow.yml

@@ -23,6 +23,7 @@ jobs:
         java:
           - 11
           - 17
+          - 21
     runs-on: ubuntu-latest
     container:
       # using the same image which is used by opensearch-build team to build the OpenSearch Distribution

build.gradle

@@ -63,9 +63,9 @@ buildscript {
 }
 
 plugins {
-    id 'nebula.ospackage' version "8.3.0"
+    id "com.netflix.nebula.ospackage" version "11.6.0"
     id 'java-library'
-    id "io.freefair.lombok" version "6.4.0"
+    id "io.freefair.lombok" version "8.4"
     id 'jacoco'
     id 'com.diffplug.spotless' version '6.19.0'
 }
@@ -155,8 +155,8 @@ jacoco {
 }
 jacocoTestReport {
     reports {
-        xml.enabled false
-        csv.enabled false
+        xml.setRequired(false)
+        csv.setRequired(false)
     }
     afterEvaluate {
         classDirectories.setFrom(files(classDirectories.files.collect {

core/build.gradle

@@ -91,8 +91,8 @@ test {
 
 jacocoTestReport {
     reports {
-        html.enabled true
-        xml.enabled true
+        html.required.set(true)
+        xml.required.set(true)
     }
     afterEvaluate {
         classDirectories.setFrom(files(classDirectories.files.collect {

datasources/build.gradle

@@ -44,8 +44,8 @@ test {
 
 jacocoTestReport {
     reports {
-        html.enabled true
-        xml.enabled true
+        html.required.set(true)
+        xml.required.set(true)
     }
     afterEvaluate {
         classDirectories.setFrom(files(classDirectories.files.collect {

gradle/wrapper/gradle-wrapper.properties

@@ -1,8 +1,7 @@
-# Copyright OpenSearch Contributors
-# SPDX-License-Identifier: Apache-2.0
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,14 +1,5 @@
-#!/usr/bin/env sh
-#
-# Copyright OpenSearch Contributors
-# SPDX-License-Identifier: Apache-2.0
-#
-# The OpenSearch Contributors require contributions made to
-# this file be licensed under the Apache-2.0 license or a
-# compatible open source license.
-#
-# Modifications Copyright OpenSearch Contributors. See
-# GitHub history for details.
+#!/bin/sh
+
 #
 # Copyright © 2015-2021 the original authors.
 #
@@ -92,10 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-# 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"'
+# 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
@@ -142,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
@@ -206,11 +198,15 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# 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.
+
+# 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, 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" \

gradlew.bat

@@ -1,14 +1,4 @@
 @rem
-@rem Copyright OpenSearch Contributors
-@rem SPDX-License-Identifier: Apache-2.0
-@rem
-@rem The OpenSearch Contributors require contributions made to
-@rem this file be licensed under the Apache-2.0 license or a
-@rem compatible open source license.
-@rem
-@rem Modifications Copyright OpenSearch Contributors. See
-@rem GitHub history for details.
-@rem
 @rem Copyright 2015 the original author or authors.
 @rem
 @rem Licensed under the Apache License, Version 2.0 (the "License");

integ-test/build.gradle

@@ -84,9 +84,9 @@ ext {
         cluster.getNodes().forEach { node ->
             var creds = node.getCredentials()
             if (creds.isEmpty()) {
-                creds.add(Map.of('useradd', 'admin', '-p', 'admin'))
+                creds.add(Map.of('useradd', 'admin', '-p', 'myStrongPassword123!'))
             } else {
-                creds.get(0).putAll(Map.of('useradd', 'admin', '-p', 'admin'))
+                creds.get(0).putAll(Map.of('useradd', 'admin', '-p', 'myStrongPassword123!'))
             }
         }
 
@@ -500,7 +500,7 @@ task comparisonTest(type: RestIntegTestTask) {
                     return new RegularFile() {
                         @Override
                         File getAsFile() {
-                            return configurations.zipArchive.asFileTree.matching {
+                            configurations.zipArchive.asFileTree.matching {
                                 include '**/opensearch-sql-plugin*'
                             }.singleFile
                         }

opensearch/build.gradle

@@ -86,8 +86,8 @@ test {
 
 jacocoTestReport {
     reports {
-        html.enabled true
-        xml.enabled true
+        html.required.set(true)
+        xml.required.set(true)
     }
     afterEvaluate {
         classDirectories.setFrom(files(classDirectories.files.collect {

plugin/build.gradle

@@ -203,7 +203,7 @@ testingConventions.enabled = false
 thirdPartyAudit.enabled = false
 
 
-apply plugin: 'nebula.ospackage'
+apply plugin: 'com.netflix.nebula.ospackage'
 validateNebulaPom.enabled = false
 
 // This is afterEvaluate because the bundlePlugin ZIP task is updated afterEvaluate and changes the ZIP name to match the plugin name
@@ -245,8 +245,7 @@ afterEvaluate {
         task renameRpm(type: Copy) {
             from("$buildDir/distributions")
             into("$buildDir/distributions")
-            include archiveName
-            rename archiveName, "${packageName}-${version}.rpm"
+            rename "$archiveFileName", "${packageName}-${version}.rpm"
             doLast { delete file("$buildDir/distributions/$archiveName") }
         }
     }
@@ -258,8 +257,7 @@ afterEvaluate {
         task renameDeb(type: Copy) {
             from("$buildDir/distributions")
             into("$buildDir/distributions")
-            include archiveName
-            rename archiveName, "${packageName}-${version}.deb"
+            rename "$archiveFileName", "${packageName}-${version}.deb"
             doLast { delete file("$buildDir/distributions/$archiveName") }
         }
     }

ppl/build.gradle

@@ -88,8 +88,8 @@ test {
 
 jacocoTestReport {
     reports {
-        html.enabled true
-        xml.enabled true
+        html.required.set(true)
+        xml.required.set(true)
     }
     afterEvaluate {
         classDirectories.setFrom(files(classDirectories.files.collect {

prometheus/build.gradle

@@ -45,8 +45,8 @@ configurations.all {
 
 jacocoTestReport {
     reports {
-        html.enabled true
-        xml.enabled true
+        html.required.set(true)
+        xml.required.set(true)
     }
     afterEvaluate {
         classDirectories.setFrom(files(classDirectories.files.collect {

protocol/build.gradle

@@ -60,8 +60,8 @@ test {
 
 jacocoTestReport {
     reports {
-        html.enabled true
-        xml.enabled true
+        html.required.set(true)
+        xml.required.set(true)
     }
     afterEvaluate {
         classDirectories.setFrom(files(classDirectories.files.collect {

spark/build.gradle

@@ -96,8 +96,8 @@ jacocoTestReport {
     dependsOn test, junit4
     executionData test, junit4
     reports {
-        html.enabled true
-        xml.enabled true
+        html.required.set(true)
+        xml.required.set(true)
     }
     afterEvaluate {
         classDirectories.setFrom(files(classDirectories.files.collect {

sql/build.gradle

@@ -87,8 +87,8 @@ test {
 
 jacocoTestReport {
     reports {
-        html.enabled true
-        xml.enabled true
+        html.required.set(true)
+        xml.required.set(true)
     }
     afterEvaluate {
         classDirectories.setFrom(files(classDirectories.files.collect {