Skip to content

Commit bbd226e

Browse files
authored
Update bundled JDK to JDK-25 (#19698)
Signed-off-by: Andrew Ross <andrross@amazon.com>
1 parent 6b35c7c commit bbd226e

File tree

5 files changed

+7
-6
lines changed

5 files changed

+7
-6
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
55

66
## [Unreleased 3.x]
77
### Added
8-
98
- Add support for a ForkJoinPool type ([#19008](https://github.com/opensearch-project/OpenSearch/pull/19008))
109
- Add seperate shard limit validation for local and remote indices ([#19532](https://github.com/opensearch-project/OpenSearch/pull/19532))
1110
- Use Lucene `pack` method for `half_float` and `usigned_long` when using `ApproximatePointRangeQuery`.
@@ -53,6 +52,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
5352

5453
### Dependencies
5554
- Update to Gradle 9.1 ([#19575](https://github.com/opensearch-project/OpenSearch/pull/19575))
55+
- Update bundled JDK to JDK-25 ([#19314](https://github.com/opensearch-project/OpenSearch/issues/19314))
5656
- Bump `peter-evans/create-or-update-comment` from 4 to 5 ([#19536](https://github.com/opensearch-project/OpenSearch/pull/19536))
5757
- Bump `com.azure:azure-core-http-netty` from 1.15.12 to 1.16.1 ([#19533](https://github.com/opensearch-project/OpenSearch/pull/19533))
5858
- Bump `org.apache.zookeeper:zookeeper` from 3.9.3 to 3.9.4 ([#19535](https://github.com/opensearch-project/OpenSearch/pull/19535))

buildSrc/src/main/java/org/opensearch/gradle/precommit/ThirdPartyAuditPrecommitPlugin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public class ThirdPartyAuditPrecommitPlugin extends PrecommitPlugin {
5151
public TaskProvider<? extends Task> createTask(Project project) {
5252
project.getPlugins().apply(CompileOnlyResolvePlugin.class);
5353
project.getConfigurations().create("forbiddenApisCliJar");
54-
project.getDependencies().add("forbiddenApisCliJar", "de.thetaphi:forbiddenapis:3.8");
54+
project.getDependencies().add("forbiddenApisCliJar", "de.thetaphi:forbiddenapis:3.10");
5555

5656
Configuration jdkJarHellConfig = project.getConfigurations().create(JDK_JAR_HELL_CONFIG_NAME);
5757
if (BuildParams.isInternal() && project.getPath().equals(":libs:opensearch-core") == false) {

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

Lines changed: 2 additions & 2 deletions
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 = "24.0.2+12";
80+
private static final String SYSTEM_JDK_VERSION = "25.0.1+8";
8181
private static final String SYSTEM_JDK_VENDOR = "adoptium";
82-
private static final String GRADLE_JDK_VERSION = "24.0.2+12";
82+
private static final String GRADLE_JDK_VERSION = "25.0.1+8";
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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ opensearch = "3.4.0"
33
lucene = "10.3.1"
44

55
bundled_jdk_vendor = "adoptium"
6-
bundled_jdk = "24.0.2+12"
6+
bundled_jdk = "25.0.1+8"
77

88
# optional dependencies
99
spatial4j = "0.7"
@@ -77,7 +77,7 @@ randomizedrunner = "2.7.1"
7777
junit = "4.13.2"
7878
junit5 = "6.0.0"
7979
hamcrest = "2.1"
80-
mockito = "5.16.1"
80+
mockito = "5.20.0"
8181
objenesis = "3.3"
8282
bytebuddy = "1.17.7"
8383

plugins/repository-hdfs/src/test/resources/org/opensearch/bootstrap/test.policy

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,5 @@
99
grant {
1010
permission java.net.NetPermission "accessUnixDomainSocket";
1111
permission java.net.SocketPermission "*", "connect,resolve";
12+
permission java.io.FilePermission "${{java.security.krb5.conf}}", "read";
1213
};

0 commit comments

Comments
 (0)