jdk upgrade to 25 and gradle upgrade to 9.2 (#1618)

* gradle and jdk upgrade

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* gradle and jdk upgrade

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

---------

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

Author: riysaxen-amzn

.github/workflows/ci.yml

@@ -19,7 +19,7 @@ jobs:
       # This setting says that all jobs should finish, even if one fails
       fail-fast: false
       matrix:
-        java: [21, 24]
+        java: [21, 25]
         os:
           - ubuntu-24.04-arm  # arm64-preview
           - ubuntu-24.04  # x64
@@ -82,7 +82,7 @@ jobs:
       WORKING_DIR: ${{ matrix.working_directory }}.
     strategy:
       matrix:
-        java: [21, 24]
+        java: [21, 25]
         os: [ windows-latest, macos-latest ]
         include:
           - os: windows-latest

.github/workflows/multi-node-test-workflow.yml

@@ -17,7 +17,7 @@ jobs:
     needs: Get-CI-Image-Tag
     strategy:
       matrix:
-        java: [ 21, 24 ]
+        java: [ 21, 25 ]
     # Job name
     name: Build and test Security Analytics on linux
     # This job runs on Linux

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

@@ -20,7 +20,7 @@ jobs:
   build-linux:
     strategy:
       matrix:
-        java: [ 21, 24 ]
+        java: [ 21, 25 ]
     needs: Get-CI-Image-Tag
     # This job runs on Linux
     runs-on: ubuntu-latest

build.gradle

@@ -465,7 +465,7 @@ afterEvaluate {
         version = "${project.version}" - "-SNAPSHOT"
 
         into '/usr/share/opensearch/plugins'
-        from(zipTree(bundlePlugin.archivePath)) {
+        from(zipTree(bundlePlugin.archiveFile.get().asFile)) {
             into opensearchplugin.name
         }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=ed1a8d686605fd7c23bdf62c7fc7add1c5b23b2bbc3721e661934ef4a4911d7c
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip
+distributionSha256Sum=16f2b95838c1ddcf7242b1c39e7bbbb43c842f1f1a1a0dc4959b6d4d68abcac3
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

src/test/java/org/opensearch/securityanalytics/util/IndexUtilsTests.java

@@ -52,23 +52,23 @@ public void testGetSchemaVersionWithWrongSchemaVersion() {
     }
 
     public void testShouldUpdateIndexWithoutOriginalVersion() throws IOException {
-        String indexContent = "{\"testIndex\":{\"settings\":{\"index\":{\"creation_date\":\"1558407515699\"," +
-                "\"number_of_shards\":\"1\",\"number_of_replicas\":\"1\",\"uuid\":\"t-VBBW6aR6KpJ3XP5iISOA\"," +
-                "\"version\":{\"created\":\"6040399\"},\"provided_name\":\"data_test\"}},\"mapping_version\":123," +
-                "\"settings_version\":123,\"mappings\":{\"_doc\":{\"properties\":{\"name\":{\"type\":\"keyword\"}}}}}}";
+    String indexContent = "{\"testIndex\":{\"settings\":{\"index\":{\"creation_date\":\"1558407515699\"," +
+            "\"number_of_shards\":\"1\",\"number_of_replicas\":\"1\",\"uuid\":\"t-VBBW6aR6KpJ3XP5iISOA\"," +
+            "\"version\":{\"created\":\"136217927\"},\"provided_name\":\"data_test\"}},\"mapping_version\":123," +
+            "\"settings_version\":123,\"aliases_version\":1,\"mappings\":{\"_doc\":{\"properties\":{\"name\":{\"type\":\"keyword\"}}}}}}";
 
-        String newMapping = "{\"_meta\":{\"schema_version\":10},\"properties\":{\"name\":{\"type\":\"keyword\"}}}";
-        IndexMetadata index = IndexMetadata.fromXContent(parser(indexContent));
-        boolean shouldUpdateIndex = IndexUtils.shouldUpdateIndex(index, newMapping);
+    String newMapping = "{\"_meta\":{\"schema_version\":10},\"properties\":{\"name\":{\"type\":\"keyword\"}}}";
+    IndexMetadata index = IndexMetadata.fromXContent(parser(indexContent));
+    boolean shouldUpdateIndex = IndexUtils.shouldUpdateIndex(index, newMapping);
 
-        Assert.assertTrue(shouldUpdateIndex);
+    Assert.assertTrue(shouldUpdateIndex);
     }
 
     public void testShouldUpdateIndexWithLaggedVersion() throws IOException {
         String indexContent = "{\"testIndex\":{\"settings\":{\"index\":{\"creation_date\":\"1558407515699\"," +
                 "\"number_of_shards\":\"1\",\"number_of_replicas\":\"1\",\"uuid\":\"t-VBBW6aR6KpJ3XP5iISOA\"," +
-                "\"version\":{\"created\":\"6040399\"},\"provided_name\":\"data_test\"}},\"mapping_version\":123," +
-                "\"settings_version\":123,\"mappings\":{\"_doc\":{\"_meta\":{\"schema_version\":1},\"properties\":" +
+                "\"version\":{\"created\":\"136217927\"},\"provided_name\":\"data_test\"}},\"mapping_version\":123," +
+                "\"settings_version\":123,\"aliases_version\":1,\"mappings\":{\"_doc\":{\"_meta\":{\"schema_version\":1},\"properties\":" +
                 "{\"name\":{\"type\":\"keyword\"}}}}}}";
 
         String newMapping = "{\"_meta\":{\"schema_version\":10},\"properties\":{\"name\":{\"type\":\"keyword\"}}}";
@@ -81,7 +81,7 @@ public void testShouldUpdateIndexWithLaggedVersion() throws IOException {
     public void testShouldUpdateIndexWithSameVersion() throws IOException {
         String indexContent = "{\"testIndex\":{\"settings\":{\"index\":{\"creation_date\":\"1558407515699\"," +
                 "\"number_of_shards\":\"1\",\"number_of_replicas\":\"1\",\"uuid\":\"t-VBBW6aR6KpJ3XP5iISOA\"," +
-                "\"version\":{\"created\":\"6040399\"},\"provided_name\":\"data_test\"}},\"mapping_version\":\"1\"," +
+                "\"version\":{\"created\":\"136217927\"},\"provided_name\":\"data_test\"}},\"mapping_version\":\"1\"," +
                 "\"settings_version\":\"1\",\"aliases_version\":\"1\",\"mappings\":" +
                 "{\"_doc\":{\"_meta\":{\"schema_version\":1},\"properties\":{\"name\":{\"type\":\"keyword\"}}}}}}";