Skip to content

Commit cc82be9

Browse files
Switch main/3.x to use JDK21 LTS version (#17515)
* Switch main/3.x to use JDK21 LTS version Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> * Update changelog 3.0 Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> --------- Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
1 parent 7330a88 commit cc82be9

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

CHANGELOG-3.0.md

+1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
2929
- Update Apache Lucene to 10.1.0 ([#16366](https://github.com/opensearch-project/OpenSearch/pull/16366))
3030
- Bump Apache HttpCore5/HttpClient5 dependencies from 5.2.5/5.3.1 to 5.3.1/5.4.1 to support ExtendedSocketOption in HttpAsyncClient ([#16757](https://github.com/opensearch-project/OpenSearch/pull/16757))
3131
- Bumps `jetty` version from 9.4.55.v20240627 to 9.4.57.v20241219
32+
- Switch main/3.x to use JDK21 LTS version ([#17515](https://github.com/opensearch-project/OpenSearch/pull/17515))
3233

3334
### Changed
3435
- Changed locale provider from COMPAT to CLDR ([#14345](https://github.com/opensearch-project/OpenSearch/pull/14345))

buildSrc/src/main/java/org/opensearch/gradle/test/DistroTestPlugin.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@
7777
import java.util.stream.Stream;
7878

7979
public class DistroTestPlugin implements Plugin<Project> {
80-
private static final String SYSTEM_JDK_VERSION = "23.0.2+7";
80+
private static final String SYSTEM_JDK_VERSION = "21.0.6+7";
8181
private static final String SYSTEM_JDK_VENDOR = "adoptium";
82-
private static final String GRADLE_JDK_VERSION = "23.0.2+7";
82+
private static final String GRADLE_JDK_VERSION = "21.0.6+7";
8383
private static final String GRADLE_JDK_VENDOR = "adoptium";
8484

8585
// all distributions used by distro tests. this is temporary until tests are per distribution

gradle/libs.versions.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ opensearch = "3.0.0"
33
lucene = "10.1.0"
44

55
bundled_jdk_vendor = "adoptium"
6-
bundled_jdk = "23.0.2+7"
6+
bundled_jdk = "21.0.6+7"
77

88
# optional dependencies
99
spatial4j = "0.7"

0 commit comments

Comments
 (0)