Update Gradle to 8.4

Signed-off-by: Andriy Redko <[email protected]>
opensearch-project · Jan 12, 2024 · 1a3a2b0 · 1a3a2b0
1 parent c8456aa
commit 1a3a2b0
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 8 deletions.
diff --git a/build.gradle b/build.gradle
@@ -41,7 +41,7 @@ buildscript {
 }
 
 plugins {
-    id 'com.netflix.nebula.ospackage' version "11.5.0"
+    id 'com.netflix.nebula.ospackage' version "11.6.0"
     id 'java'
     id "io.freefair.lombok" version "8.4"
     id 'jacoco'

diff --git a/client/build.gradle b/client/build.gradle
@@ -9,7 +9,7 @@ plugins {
     id 'jacoco'
     id 'com.github.johnrengelman.shadow'
     id 'maven-publish'
-    id 'com.diffplug.spotless' version '6.23.0'
+    id 'com.diffplug.spotless' version '6.23.2'
     id 'signing'
 }
 
@@ -19,7 +19,6 @@ dependencies {
     compileOnly group: 'org.opensearch', name: 'opensearch', version: "${opensearch_version}"
     testImplementation group: 'junit', name: 'junit', version: '4.13.2'
     testImplementation group: 'org.mockito', name: 'mockito-core', version: '5.7.0'
-
 }
 
 spotless {

diff --git a/memory/build.gradle b/memory/build.gradle
@@ -20,7 +20,7 @@ plugins {
     id 'java'
     id 'jacoco'
     id "io.freefair.lombok"
-    id 'com.diffplug.spotless' version '6.23.0'
+    id 'com.diffplug.spotless' version '6.23.2'
 }
 
 dependencies {

diff --git a/ml-algorithms/build.gradle b/ml-algorithms/build.gradle
@@ -9,7 +9,7 @@ plugins {
     id 'java'
     id 'jacoco'
     id "io.freefair.lombok"
-    id 'com.diffplug.spotless' version '6.23.0'
+    id 'com.diffplug.spotless' version '6.23.2'
 }
 
 repositories {

diff --git a/plugin/build.gradle b/plugin/build.gradle
@@ -13,7 +13,7 @@ plugins {
     id "io.freefair.lombok"
     id 'jacoco'
     id 'java-library'
-    id 'com.diffplug.spotless' version '6.23.0'
+    id 'com.diffplug.spotless' version '6.23.2'
     id 'checkstyle'
 }
 

diff --git a/plugin/src/test/java/org/opensearch/ml/bwc/MLCommonsBackwardsCompatibilityRestTestCase.java b/plugin/src/test/java/org/opensearch/ml/bwc/MLCommonsBackwardsCompatibilityRestTestCase.java
@@ -5,6 +5,7 @@
 
 package org.opensearch.ml.bwc;
 
+import static org.hamcrest.Matchers.equalTo;
 import static org.opensearch.commons.ConfigConstants.OPENSEARCH_SECURITY_SSL_HTTP_ENABLED;
 import static org.opensearch.commons.ConfigConstants.OPENSEARCH_SECURITY_SSL_HTTP_KEYSTORE_FILEPATH;
 import static org.opensearch.commons.ConfigConstants.OPENSEARCH_SECURITY_SSL_HTTP_KEYSTORE_KEYPASSWORD;
@@ -735,7 +736,7 @@ public String getTaskState(String taskId) throws IOException {
         return (String) task.get("state");
     }
 
-    public void waitForTask(String taskId, MLTaskState targetState) throws InterruptedException {
+    public void waitForTask(String taskId, MLTaskState targetState) throws InterruptedException, IOException {
         AtomicBoolean taskDone = new AtomicBoolean(false);
         waitUntil(() -> {
             try {
@@ -748,6 +749,7 @@ public void waitForTask(String taskId, MLTaskState targetState) throws Interrupt
             }
             return taskDone.get();
         }, CUSTOM_MODEL_TIMEOUT, TimeUnit.SECONDS);
+        assertThat(getTaskState(taskId), equalTo(targetState.name()));
         assertTrue(taskDone.get());
     }
 }
diff --git a/search-processors/build.gradle b/search-processors/build.gradle
@@ -19,7 +19,7 @@ plugins {
     id 'java'
     id 'jacoco'
     id "io.freefair.lombok"
-    id 'com.diffplug.spotless' version '6.23.0'
+    id 'com.diffplug.spotless' version '6.23.2'
 }
 
 repositories {