Merge branch 'main' into agentic-search-feature-flag

Author: dhrubo-os

.github/workflows/CI-workflow.yml

@@ -42,7 +42,7 @@ jobs:
     needs: [Get-Require-Approval, Get-CI-Image-Tag, spotless]
     strategy:
       matrix:
-        java: [21, 23]
+        java: [21, 24]
 
     name: Build and Test MLCommons Plugin on linux
     if: github.repository == 'opensearch-project/ml-commons'
@@ -107,7 +107,7 @@ jobs:
     needs: [Get-Require-Approval, Build-ml-linux, spotless]
     strategy:
       matrix:
-        java: [21, 23]
+        java: [21, 24]
 
     name: Test MLCommons Plugin on linux docker
     if: github.repository == 'opensearch-project/ml-commons'
@@ -203,7 +203,7 @@ jobs:
   Build-ml-windows:
     strategy:
       matrix:
-        java: [21, 23]
+        java: [21, 24]
     name: Build and Test MLCommons Plugin on Windows
     if: github.repository == 'opensearch-project/ml-commons'
     needs: [Get-Require-Approval, spotless]

build.gradle

@@ -60,9 +60,9 @@ buildscript {
 }
 
 plugins {
-    id 'com.netflix.nebula.ospackage' version "11.5.0"
+    id 'com.netflix.nebula.ospackage' version "12.0.0"
     id 'java'
-    id "io.freefair.lombok" version "8.4"
+    id "io.freefair.lombok" version "8.14"
     id 'jacoco'
 }
 

common/build.gradle

@@ -47,7 +47,7 @@ dependencies {
 }
 
 lombok {
-    version = "1.18.30"
+    version = "1.18.38"
 }
 
 jacocoTestReport {

common/src/test/java/org/opensearch/ml/common/MLModelGroupTest.java

@@ -63,7 +63,7 @@ public void toXContent() throws IOException {
             .assertEquals(
                 "{\"name\":\"test\",\"latest_version\":1,\"description\":\"this is test group\","
                     + "\"backend_roles\":[\"role1\",\"role2\"],"
-                    + "\"owner\":{\"name\":\"\",\"backend_roles\":[],\"roles\":[],\"custom_attribute_names\":[],\"user_requested_tenant\":null},"
+                    + "\"owner\":{\"name\":\"\",\"backend_roles\":[],\"roles\":[],\"custom_attribute_names\":[],\"user_requested_tenant\":null,\"user_requested_tenant_access\":null},"
                     + "\"access\":\"PUBLIC\"}",
                 content
             );
@@ -166,7 +166,7 @@ public void toXContent_WithTenantId() throws IOException {
             .assertEquals(
                 "{\"name\":\"test\",\"latest_version\":1,\"description\":\"this is test group\","
                     + "\"backend_roles\":[\"role1\",\"role2\"],"
-                    + "\"owner\":{\"name\":\"\",\"backend_roles\":[],\"roles\":[],\"custom_attribute_names\":[],\"user_requested_tenant\":null},"
+                    + "\"owner\":{\"name\":\"\",\"backend_roles\":[],\"roles\":[],\"custom_attribute_names\":[],\"user_requested_tenant\":null,\"user_requested_tenant_access\":null},"
                     + "\"access\":\"PUBLIC\",\"tenant_id\":\"test_tenant\"}",
                 content
             );
@@ -176,7 +176,7 @@ public void toXContent_WithTenantId() throws IOException {
     public void parse_WithTenantId() throws IOException {
         String jsonStr = "{\"name\":\"test\",\"latest_version\":1,\"description\":\"this is test group\","
             + "\"backend_roles\":[\"role1\",\"role2\"],"
-            + "\"owner\":{\"name\":\"\",\"backend_roles\":[],\"roles\":[],\"custom_attribute_names\":[],\"user_requested_tenant\":null},"
+            + "\"owner\":{\"name\":\"\",\"backend_roles\":[],\"roles\":[],\"custom_attribute_names\":[],\"user_requested_tenant\":null,\"user_requested_tenant_access\":null},"
             + "\"access\":\"PUBLIC\",\"tenant_id\":\"test_tenant\"}";
 
         XContentParser parser = XContentType.JSON

common/src/test/java/org/opensearch/ml/common/transport/model/MLModelGetResponseTest.java

@@ -67,7 +67,7 @@ public void toXContentTest() throws IOException {
                 + "\"algorithm\":\"KMEANS\","
                 + "\"model_version\":\"1.0.0\","
                 + "\"model_content\":\"content\","
-                + "\"user\":{\"name\":\"\",\"backend_roles\":[],\"roles\":[],\"custom_attribute_names\":[],\"user_requested_tenant\":null},\"model_state\":\"TRAINED\"}",
+                + "\"user\":{\"name\":\"\",\"backend_roles\":[],\"roles\":[],\"custom_attribute_names\":[],\"user_requested_tenant\":null,\"user_requested_tenant_access\":null},\"model_state\":\"TRAINED\"}",
             jsonStr
         );
     }

common/src/test/java/org/opensearch/ml/common/transport/task/MLTaskGetResponseTest.java

@@ -86,7 +86,7 @@ public void toXContentTest() throws IOException {
                 + "\"create_time\":123,"
                 + "\"last_update_time\":123,"
                 + "\"error\":\"error\","
-                + "\"user\":{\"name\":\"\",\"backend_roles\":[],\"roles\":[],\"custom_attribute_names\":[],\"user_requested_tenant\":null},"
+                + "\"user\":{\"name\":\"\",\"backend_roles\":[],\"roles\":[],\"custom_attribute_names\":[],\"user_requested_tenant\":null,\"user_requested_tenant_access\":null},"
                 + "\"is_async\":true}",
             jsonStr
         );