Update CI to JDK 25

.github/workflows/CI.yml

@@ -18,7 +18,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4
         with:
-          java-version: 21
+          java-version: 25
           distribution: temurin
       - name: Spotless Check
         run: ./gradlew spotlessCheck
@@ -29,7 +29,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4
         with:
-          java-version: 21
+          java-version: 25
           distribution: temurin
       - name: Javadoc CheckStyle
         run: ./gradlew checkstyleMain
@@ -40,7 +40,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        java: [21]
+        java: [21, 25]
     name: Test JDK${{ matrix.java }}, ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     steps:
@@ -66,7 +66,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        java: [21]
+        java: [21, 25]
     name: Integ Test JDK${{ matrix.java }}, ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     steps:
@@ -85,7 +85,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        java: [21]
+        java: [21, 25]
     name: Multi-Node Integ Test JDK${{ matrix.java }}, ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     steps:
@@ -104,7 +104,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        java: [21]
+        java: [21, 25]
     name: Tenant Aware Integ Test JDK${{ matrix.java }}, ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     env:

.github/workflows/publish-snapshots.yml

@@ -23,7 +23,7 @@ jobs:
       - uses: actions/setup-java@v4
         with:
           distribution: temurin # Temurin is a distribution of adoptium
-          java-version: 21
+          java-version: 25
       - uses: actions/checkout@v4
 
       - name: Load secret

.github/workflows/test_bwc.yml

@@ -13,7 +13,7 @@ jobs:
   Build-ff-linux:
     strategy:
       matrix:
-        java: [21]
+        java: [21, 25]
       fail-fast: false
 
     name: Test Flow Framework BWC

.github/workflows/test_security.yml

@@ -19,7 +19,7 @@ jobs:
   integ-test-with-security-linux:
     strategy:
       matrix:
-        java: [21]
+        java: [21, 25]
 
     name: Run Security Integration Tests on Linux
     runs-on: ubuntu-latest

.github/workflows/wrapper.yml

@@ -14,4 +14,4 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: gradle/actions/wrapper-validation@v4
+      - uses: gradle/actions/wrapper-validation@v5

build.gradle

@@ -27,8 +27,7 @@ buildscript {
         common_utils_version = System.getProperty("common_utils.version", opensearch_build)
         bwcVersionShort = "2.12.0"
         bwcVersion = bwcVersionShort + ".0"
-        bwcOpenSearchFFDownload = 'https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/' + bwcVersionShort + '/latest/linux/x64/tar/builds/' +
-                'opensearch/plugins/opensearch-flow-framework-' + bwcVersion + '.zip'
+        bwcOpenSearchFFDownload = 'https://repo1.maven.org/maven2/org/opensearch/plugin/opensearch-flow-framework/' + bwcVersion + '/opensearch-flow-framework-' + bwcVersion + '.zip'
         baseName = "ffBwcCluster"
         bwcFilePath = "src/test/resources/org/opensearch/flowframework/bwc/"
         bwcFlowFrameworkPath = bwcFilePath + "flowframework/"
@@ -41,14 +40,14 @@ buildscript {
         dafnyRuntimeVersion = "4.11.0"
         smithyDafnyVersion = "0.1.1"
         gsonVersion = "2.13.2"
-        junitJupiterVersion = "5.13.4"
+        junitJupiterVersion = "5.14.1"
         jakartaJsonBindVersion = "3.0.1"
         jakartaJsonVersion = "2.0.1"
         commonsTextVersion = "1.14.0"
         yassonVersion = "3.0.4"
         parssonVersion = "1.1.7"
-        swaggerVersion = "2.1.34"
-        swaggerCoreVersion = "2.2.38"
+        swaggerVersion = "2.1.35"
+        swaggerCoreVersion = "2.2.40"
     }
 
     repositories {
@@ -240,6 +239,7 @@ dependencies {
         implementation("org.opensearch:opensearch-remote-metadata-sdk-ddb-client:${opensearch_build}") {
             exclude group: "jakarta.json", module: "jakarta.json-api"
             exclude group: "io.netty"
+            exclude group: "org.bouncycastle"
         }
     } else {
         implementation("org.opensearch:opensearch-remote-metadata-sdk:${opensearch_build}")
@@ -272,6 +272,7 @@ dependencies {
                 force("com.fasterxml.jackson.core:jackson-core:${versions.jackson}")
                 force("com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}")
                 force("com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}")
+                force("com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${versions.jackson}")
                 force("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${versions.jackson_databind}")
 
                 // OpenSearch client dependencies
@@ -288,6 +289,12 @@ dependencies {
                 force("org.apache.httpcomponents:httpcore:${versions.httpcore}")
                 force("commons-codec:commons-codec:${versions.commonscodec}")
                 force("commons-logging:commons-logging:${versions.commonslogging}")
+
+                // Remote Metadata SDK dependencies
+                force("software.amazon.awssdk:bom:${versions.aws}")
+                force("software.amazon.awssdk:kms:${versions.aws}")
+                force("software.amazon.awssdk:dynamodb:${versions.aws}")
+                force("org.dafny:DafnyRuntime:${dafnyRuntimeVersion}")
             }
         }
     }

gradle/wrapper/gradle-wrapper.properties

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