From 472bdb8937ac18db97c54b5b939f9c76b19fe610 Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Wed, 27 Nov 2024 16:20:45 -0500 Subject: [PATCH] Set geospatial plugin 3.0.0 baseline JDK version to JDK-21 (#695) * Set geospation plugin 3.0.0 baseline JDK version to JDK-21 Signed-off-by: Craig Perkins * Add to CHANGELOG Signed-off-by: Craig Perkins --------- Signed-off-by: Craig Perkins --- .github/workflows/CI.yml | 4 ++-- .github/workflows/maven-publish.yml | 2 +- CHANGELOG.md | 2 ++ build.gradle | 4 ++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index a959a5b6..bb57a93c 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -21,7 +21,7 @@ jobs: needs: Get-CI-Image-Tag strategy: matrix: - java: [11, 17, 21] + java: [21] name: Build and Test geospatial Plugin runs-on: ubuntu-latest @@ -54,7 +54,7 @@ jobs: Build-windows-macos: strategy: matrix: - java: [11, 17, 21] + java: [21] os: [windows-latest, macos-latest] name: Build and Test geospatial Plugin diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index 724e3a21..644342c7 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -20,7 +20,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: temurin # Temurin is a distribution of adoptium - java-version: 11 + java-version: 21 - uses: actions/checkout@v3 - uses: aws-actions/configure-aws-credentials@v1 with: diff --git a/CHANGELOG.md b/CHANGELOG.md index acd7b49a..39fcc55d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,8 @@ See the [CONTRIBUTING guide](./CONTRIBUTING.md#Changelog) for instructions on ho ### Infrastructure ### Documentation ### Maintenance +- Set geospatial plugin 3.0.0 baseline JDK version to JDK-21 ([#695](https://github.com/opensearch-project/geospatial/pull/695)) + ### Refactoring ## [Unreleased 2.x](https://github.com/opensearch-project/geospatial/compare/2.17...2.x) diff --git a/build.gradle b/build.gradle index 8a08474d..d76333f3 100644 --- a/build.gradle +++ b/build.gradle @@ -94,8 +94,8 @@ ext { allprojects { group = opensearch_group version = "${opensearch_build}" - targetCompatibility = JavaVersion.VERSION_11 - sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_21 + sourceCompatibility = JavaVersion.VERSION_21 } repositories {