upgrade jdk baseline to 21 (#336)

* upgrade jdk baseline to 21

Signed-off-by: zane-neo <[email protected]>

* fix labeler issue

Signed-off-by: zane-neo <[email protected]>

---------

Signed-off-by: zane-neo <[email protected]>

.github/labeler.yml

@@ -1,15 +1,15 @@
-backport 2.x:
-  - "*"
-  - "*/*"
-  - "*/**/*"
-  - "*/**/**/*"
-  - "*/**/**/**/*"
-  - "*/**/**/**/**/*"
-  - "*/**/**/**/**/**/*"
-  - "*/**/**/**/**/**/**/*"
-  - "*/**/**/**/**/**/**/**/*"
-  - "*/**/**/**/**/**/**/**/**/*"
-  - ".github/**/*"
+#backport 2.x:
+#  - "*"
+#  - "*/*"
+#  - "*/**/*"
+#  - "*/**/**/*"
+#  - "*/**/**/**/*"
+#  - "*/**/**/**/**/*"
+#  - "*/**/**/**/**/**/*"
+#  - "*/**/**/**/**/**/**/*"
+#  - "*/**/**/**/**/**/**/**/*"
+#  - "*/**/**/**/**/**/**/**/**/*"
+#  - ".github/**/*"
 
 infra:
   - ".github/**/*"

.github/workflows/ci.yml

@@ -35,7 +35,7 @@ jobs:
     needs: Get-CI-Image-Tag
     strategy:
       matrix:
-        java: [11, 17, 21]
+        java: [21]
     name: Build and Test skills plugin on Linux
     runs-on: ubuntu-latest
     container:
@@ -69,7 +69,7 @@ jobs:
   build-MacOS:
     strategy:
       matrix:
-        java: [11, 17, 21]
+        java: [21]
 
     name: Build and Test skills Plugin on MacOS
     needs: Get-CI-Image-Tag
@@ -94,7 +94,7 @@ jobs:
   build-windows:
     strategy:
       matrix:
-        java: [11, 17, 21]
+        java: [21]
     name: Build and Test skills plugin on Windows
     needs: Get-CI-Image-Tag
     runs-on: windows-latest

.github/workflows/test_security.yml

@@ -16,7 +16,7 @@ jobs:
   integ-test-with-security-linux:
     strategy:
       matrix:
-        java: [11, 17, 21]
+        java: [21]
 
     name: Run Security Integration Tests on Linux
     runs-on: ubuntu-latest
@@ -40,4 +40,4 @@ jobs:
         # switching the user, as OpenSearch cluster can only be started as root/Administrator on linux-deb/linux-rpm/windows-zip.
         run: |
           chown -R 1000:1000 `pwd`
-          su `id -un 1000` -c "whoami && java -version && ./gradlew integTest -Dsecurity.enabled=true"
+          su `id -un 1000` -c "whoami && java -version && ./gradlew integTest -Dsecurity.enabled=true"

build.gradle

@@ -5,7 +5,6 @@
 
 import org.opensearch.gradle.test.RestIntegTestTask
 import java.util.concurrent.Callable
-import org.opensearch.gradle.testclusters.OpenSearchCluster
 import java.nio.file.Paths
 import com.github.jengelman.gradle.plugins.shadow.ShadowPlugin
 
@@ -65,8 +64,10 @@ allprojects {
     version = "${opensearch_build}"
 }
 
-targetCompatibility = JavaVersion.VERSION_11
-sourceCompatibility = JavaVersion.VERSION_11
+java {
+    targetCompatibility = JavaVersion.VERSION_21
+    sourceCompatibility = JavaVersion.VERSION_21
+}
 
 apply plugin: 'java'
 apply plugin: 'jacoco'