Update to Gradle 8.0.2 (#348)

* Update to Gradle 8.0.2 Signed-off-by: Craig Perkins <cwperx@amazon.com> * Add validateNebulaPom.enabled = false back in Signed-off-by: Craig Perkins <cwperx@amazon.com> * Run spotlessApply Signed-off-by: Craig Perkins <cwperx@amazon.com> --------- Signed-off-by: Craig Perkins <cwperx@amazon.com>
opensearch-project · Apr 3, 2023 · 6892ef0 · 6892ef0
1 parent 77b873e
commit 6892ef0
Show file tree

Hide file tree

Showing 9 changed files with 48 additions and 48 deletions.
diff --git a/build.gradle b/build.gradle
@@ -24,9 +24,9 @@ buildscript {
 }
 
 plugins {
-    id 'nebula.ospackage' version "8.3.0"
+    id 'com.netflix.nebula.ospackage' version "11.0.0"
     id 'java-library'
-    id "com.diffplug.spotless" version "6.12.0" apply false
+    id "com.diffplug.spotless" version "6.17.0" apply false
 }
 
 apply plugin: 'opensearch.opensearchplugin'
@@ -158,7 +158,7 @@ dependencies {
 }
 
 // RPM & Debian build
-apply plugin: 'nebula.ospackage'
+apply plugin: 'com.netflix.nebula.ospackage'
 
 def es_tmp_dir = rootProject.file('build/private/es_tmp').absoluteFile
 es_tmp_dir.mkdirs()
@@ -303,9 +303,8 @@ afterEvaluate {
         task renameRpm(type: Copy) {
             from("$buildDir/distributions")
             into("$buildDir/distributions")
-            include archiveName
-            rename archiveName, "${packageName}-${version}.rpm"
-            doLast { delete file("$buildDir/distributions/$archiveName") }
+            rename "$archiveFileName", "${packageName}-${version}.rpm"
+            doLast { delete file("$buildDir/distributions/$archiveFileName") }
         }
     }
 
@@ -316,9 +315,8 @@ afterEvaluate {
         task renameDeb(type: Copy) {
             from("$buildDir/distributions")
             into("$buildDir/distributions")
-            include archiveName
-            rename archiveName, "${packageName}-${version}.deb"
-            doLast { delete file("$buildDir/distributions/$archiveName") }
+            rename "$archiveFileName", "${packageName}-${version}.deb"
+            doLast { delete file("$buildDir/distributions/$archiveFileName") }
         }
     }
 }

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# 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"'
@@ -143,12 +143,16 @@ fi
 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
         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
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -205,6 +209,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

diff --git a/gradlew.bat b/gradlew.bat
@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

diff --git a/...ion-plugin/src/main/java/org/opensearch/jobscheduler/sampleextension/SampleJobRunner.java b/...ion-plugin/src/main/java/org/opensearch/jobscheduler/sampleextension/SampleJobRunner.java
@@ -123,10 +123,9 @@ public void runJob(ScheduledJobParameter jobParameter, JobExecutionContext conte
 
                     lockService.release(
                         lock,
-                        ActionListener.wrap(
-                            released -> { log.info("Released lock for job {}", jobParameter.getName()); },
-                            exception -> { throw new IllegalStateException("Failed to release lock."); }
-                        )
+                        ActionListener.wrap(released -> { log.info("Released lock for job {}", jobParameter.getName()); }, exception -> {
+                            throw new IllegalStateException("Failed to release lock.");
+                        })
                     );
                 }, exception -> { throw new IllegalStateException("Failed to acquire lock."); }));
             }

diff --git a/spi/build.gradle b/spi/build.gradle
@@ -66,7 +66,7 @@ configurations.all {
 shadowJar {
     relocate 'com.cronutils', 'org.opensearch.jobscheduler.repackage.com.cronutils'
     relocate 'org.slf4j', 'org.opensearch.jobscheduler.repackage.org.slf4j' // dependency of cron-utils
-    classifier = null
+    archiveClassifier = null
 }
 
 test {

diff --git a/src/main/java/org/opensearch/jobscheduler/rest/action/RestGetLockAction.java b/src/main/java/org/opensearch/jobscheduler/rest/action/RestGetLockAction.java
@@ -76,15 +76,12 @@ protected RestChannelConsumer prepareRequest(RestRequest restRequest, NodeClient
 
         // Process acquire lock request
         CompletableFuture<LockModel> inProgressFuture = new CompletableFuture<>();
-        lockService.acquireLockWithId(
-            jobIndexName,
-            lockDurationSeconds,
-            jobId,
-            ActionListener.wrap(lockModel -> { inProgressFuture.complete(lockModel); }, exception -> {
-                logger.error("Could not acquire lock with ID : " + jobId, exception);
-                inProgressFuture.completeExceptionally(exception);
-            })
-        );
+        lockService.acquireLockWithId(jobIndexName, lockDurationSeconds, jobId, ActionListener.wrap(lockModel -> {
+            inProgressFuture.complete(lockModel);
+        }, exception -> {
+            logger.error("Could not acquire lock with ID : " + jobId, exception);
+            inProgressFuture.completeExceptionally(exception);
+        }));
 
         try {
             inProgressFuture.orTimeout(JobDetailsService.TIME_OUT_FOR_REQUEST, TimeUnit.SECONDS);

diff --git a/src/test/java/org/opensearch/jobscheduler/utils/JobDetailsServiceIT.java b/src/test/java/org/opensearch/jobscheduler/utils/JobDetailsServiceIT.java
@@ -226,13 +226,9 @@ public void testDeleteJobDetailsWithOutDocumentIdCreation() throws ExecutionExce
             this.indicesToListen,
             this.indexToJobProviders
         );
-        jobDetailsService.deleteJobDetails(
-            expectedDocumentId,
-            ActionListener.wrap(
-                deleted -> { assertTrue("Failed to delete JobDetails.", deleted); },
-                exception -> { fail(exception.getMessage()); }
-            )
-        );
+        jobDetailsService.deleteJobDetails(expectedDocumentId, ActionListener.wrap(deleted -> {
+            assertTrue("Failed to delete JobDetails.", deleted);
+        }, exception -> { fail(exception.getMessage()); }));
     }
 
     public void testDeleteNonExistingJobDetails() throws ExecutionException, InterruptedException, TimeoutException {
@@ -244,13 +240,9 @@ public void testDeleteNonExistingJobDetails() throws ExecutionException, Interru
         );
         jobDetailsService.createJobDetailsIndex(ActionListener.wrap(created -> {
             if (created) {
-                jobDetailsService.deleteJobDetails(
-                    expectedDocumentId,
-                    ActionListener.wrap(
-                        deleted -> { assertTrue("Failed to delete job details for documentId.", deleted); },
-                        exception -> fail(exception.getMessage())
-                    )
-                );
+                jobDetailsService.deleteJobDetails(expectedDocumentId, ActionListener.wrap(deleted -> {
+                    assertTrue("Failed to delete job details for documentId.", deleted);
+                }, exception -> fail(exception.getMessage())));
             } else {
                 fail("Failed to job details for extension");
             }