Skip to content

Commit ed6093c

Browse files
harshavamsiharshavamsi
authored
Merge branch 'main' into fix_histogram_cb
Signed-off-by: Harsha Vamsi Kalluri <[email protected]>
2 parents f82e58b + c32262d commit ed6093c

File tree

296 files changed

+4345
-1012
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

296 files changed

+4345
-1012
lines changed

‎.ci/bwcVersions

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,3 +45,5 @@ BWC_VERSION:
4545
- "2.19.0"
4646
- "2.19.1"
4747
- "2.19.2"
48+
- "2.19.3"
49+
- "3.0.0"

‎.ci/java-versions.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# are 'java' or 'openjdk' followed by the major release number.
1515

1616
# See please https://docs.gradle.org/8.10/userguide/upgrading_version_8.html#minimum_daemon_jvm_version
17-
OPENSEARCH_BUILD_JAVA=openjdk17
18-
OPENSEARCH_RUNTIME_JAVA=java11
17+
OPENSEARCH_BUILD_JAVA=openjdk21
18+
OPENSEARCH_RUNTIME_JAVA=java21
1919
GRADLE_TASK=build
2020
GRADLE_EXTRA_ARGS=

‎.github/CODEOWNERS

Lines changed: 17 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,31 @@
1-
# CODEOWNERS manages notifications, not PR approvals
2-
# For PR approvals see /.github/workflows/maintainer-approval.yml
3-
4-
# Files have a single rule applied, the last match decides the owner
5-
# If you would like to more specifically apply ownership, include existing owner in new sub fields
6-
71
# To verify changes of CODEOWNERS file
82
# In VSCode
93
# 1. Install extension https://marketplace.visualstudio.com/items?itemName=jasonnutter.vscode-codeowners
104
# 2. Go to a file
115
# 3. Use the command palette to run the CODEOWNERS: Show owners of current file command, which will display all code owners for the current file.
126

137
# Default ownership for all repo files
14-
* @anasalkouz @andrross @ashking94 @bugmakerrrrrr @Bukhtawar @CEHENKLE @cwperks @dbwiddis @gbbafna @jainankitk @kotwanikunal @linuxpi @mch2 @msfroh @nknize @owaiskazi19 @reta @Rishikesh1159 @sachinpkale @saratvemulapalli @shwetathareja @sohami @VachaShah
8+
* @opensearch-project/opensearch-core-maintainers
159

16-
/modules/lang-painless/ @anasalkouz @andrross @ashking94 @Bukhtawar @CEHENKLE @dbwiddis @gbbafna @jed326 @kotwanikunal @mch2 @msfroh @nknize @owaiskazi19 @reta @Rishikesh1159 @sachinpkale @saratvemulapalli @shwetathareja @sohami @VachaShah
17-
/modules/parent-join/ @anasalkouz @andrross @ashking94 @Bukhtawar @CEHENKLE @dbwiddis @gbbafna @jed326 @kotwanikunal @mch2 @msfroh @nknize @owaiskazi19 @reta @Rishikesh1159 @sachinpkale @saratvemulapalli @shwetathareja @sohami @VachaShah
18-
/modules/transport-netty4/ @peternied
10+
/modules/lang-painless/ @opensearch-project/opensearch-core-maintainers @anasalkouz @andrross @ashking94 @Bukhtawar @CEHENKLE @dbwiddis @gbbafna @jed326 @kotwanikunal @mch2 @msfroh @nknize @owaiskazi19 @reta @Rishikesh1159 @sachinpkale @saratvemulapalli @shwetathareja @sohami @VachaShah
11+
/modules/parent-join/ @opensearch-project/opensearch-core-maintainers @anasalkouz @andrross @ashking94 @Bukhtawar @CEHENKLE @dbwiddis @gbbafna @jed326 @kotwanikunal @mch2 @msfroh @nknize @owaiskazi19 @reta @Rishikesh1159 @sachinpkale @saratvemulapalli @shwetathareja @sohami @VachaShah
12+
/modules/transport-netty4/ @opensearch-project/opensearch-core-maintainers @peternied
1913

20-
/plugins/identity-shiro/ @peternied @cwperks
14+
/plugins/identity-shiro/ @opensearch-project/opensearch-core-maintainers @peternied @cwperks
2115

22-
/server/src/internalClusterTest/java/org/opensearch/index/ @anasalkouz @andrross @ashking94 @Bukhtawar @CEHENKLE @cwperks @dbwiddis @gbbafna @jed326 @kotwanikunal @mch2 @msfroh @nknize @owaiskazi19 @reta @Rishikesh1159 @sachinpkale @saratvemulapalli @shwetathareja @sohami @VachaShah
23-
/server/src/internalClusterTest/java/org/opensearch/search/ @anasalkouz @andrross @ashking94 @Bukhtawar @CEHENKLE @cwperks @dbwiddis @gbbafna @jed326 @kotwanikunal @mch2 @msfroh @nknize @owaiskazi19 @reta @Rishikesh1159 @sachinpkale @saratvemulapalli @shwetathareja @sohami @VachaShah
16+
/server/src/internalClusterTest/java/org/opensearch/index/ @opensearch-project/opensearch-core-maintainers @anasalkouz @andrross @ashking94 @Bukhtawar @CEHENKLE @cwperks @dbwiddis @gbbafna @jed326 @kotwanikunal @mch2 @msfroh @nknize @owaiskazi19 @reta @Rishikesh1159 @sachinpkale @saratvemulapalli @shwetathareja @sohami @VachaShah
17+
/server/src/internalClusterTest/java/org/opensearch/search/ @opensearch-project/opensearch-core-maintainers @anasalkouz @andrross @ashking94 @Bukhtawar @CEHENKLE @cwperks @dbwiddis @gbbafna @jed326 @kotwanikunal @mch2 @msfroh @nknize @owaiskazi19 @reta @Rishikesh1159 @sachinpkale @saratvemulapalli @shwetathareja @sohami @VachaShah
2418

25-
/server/src/main/java/org/opensearch/extensions/ @peternied
26-
/server/src/main/java/org/opensearch/identity/ @peternied @cwperks
27-
/server/src/main/java/org/opensearch/index/ @anasalkouz @andrross @ashking94 @Bukhtawar @CEHENKLE @cwperks @dbwiddis @gbbafna @jed326 @kotwanikunal @mch2 @msfroh @nknize @owaiskazi19 @reta @Rishikesh1159 @sachinpkale @saratvemulapalli @shwetathareja @sohami @VachaShah
28-
/server/src/main/java/org/opensearch/search/ @anasalkouz @andrross @ashking94 @Bukhtawar @CEHENKLE @cwperks @dbwiddis @gbbafna @jed326 @kotwanikunal @mch2 @msfroh @nknize @owaiskazi19 @reta @Rishikesh1159 @sachinpkale @saratvemulapalli @shwetathareja @sohami @VachaShah
29-
/server/src/main/java/org/opensearch/threadpool/ @jed326 @peternied
30-
/server/src/main/java/org/opensearch/transport/ @peternied
19+
/server/src/main/java/org/opensearch/extensions/ @opensearch-project/opensearch-core-maintainers @peternied
20+
/server/src/main/java/org/opensearch/identity/ @opensearch-project/opensearch-core-maintainers @peternied @cwperks
21+
/server/src/main/java/org/opensearch/index/ @opensearch-project/opensearch-core-maintainers @anasalkouz @andrross @ashking94 @Bukhtawar @CEHENKLE @cwperks @dbwiddis @gbbafna @jed326 @kotwanikunal @mch2 @msfroh @nknize @owaiskazi19 @reta @Rishikesh1159 @sachinpkale @saratvemulapalli @shwetathareja @sohami @VachaShah
22+
/server/src/main/java/org/opensearch/search/ @opensearch-project/opensearch-core-maintainers @anasalkouz @andrross @ashking94 @Bukhtawar @CEHENKLE @cwperks @dbwiddis @gbbafna @jed326 @kotwanikunal @mch2 @msfroh @nknize @owaiskazi19 @reta @Rishikesh1159 @sachinpkale @saratvemulapalli @shwetathareja @sohami @VachaShah
23+
/server/src/main/java/org/opensearch/threadpool/ @opensearch-project/opensearch-core-maintainers @jed326 @peternied
24+
/server/src/main/java/org/opensearch/transport/ @opensearch-project/opensearch-core-maintainers @peternied
3125

32-
/server/src/test/java/org/opensearch/index/ @anasalkouz @andrross @ashking94 @Bukhtawar @CEHENKLE @cwperks @dbwiddis @gbbafna @jed326 @kotwanikunal @mch2 @msfroh @nknize @owaiskazi19 @reta @Rishikesh1159 @sachinpkale @saratvemulapalli @shwetathareja @sohami @VachaShah
33-
/server/src/test/java/org/opensearch/search/ @anasalkouz @andrross @ashking94 @Bukhtawar @CEHENKLE @cwperks @dbwiddis @gbbafna @jed326 @kotwanikunal @mch2 @msfroh @nknize @owaiskazi19 @reta @Rishikesh1159 @sachinpkale @saratvemulapalli @shwetathareja @sohami @VachaShah
26+
/server/src/test/java/org/opensearch/index/ @opensearch-project/opensearch-core-maintainers @anasalkouz @andrross @ashking94 @Bukhtawar @CEHENKLE @cwperks @dbwiddis @gbbafna @jed326 @kotwanikunal @mch2 @msfroh @nknize @owaiskazi19 @reta @Rishikesh1159 @sachinpkale @saratvemulapalli @shwetathareja @sohami @VachaShah
27+
/server/src/test/java/org/opensearch/search/ @opensearch-project/opensearch-core-maintainers @anasalkouz @andrross @ashking94 @Bukhtawar @CEHENKLE @cwperks @dbwiddis @gbbafna @jed326 @kotwanikunal @mch2 @msfroh @nknize @owaiskazi19 @reta @Rishikesh1159 @sachinpkale @saratvemulapalli @shwetathareja @sohami @VachaShah
3428

35-
/.github/ @jed326 @peternied
29+
/.github/ @opensearch-project/opensearch-core-maintainers @jed326 @peternied
3630

37-
/MAINTAINERS.md @anasalkouz @andrross @ashking94 @Bukhtawar @CEHENKLE @cwperks @dbwiddis @gaobinlong @gbbafna @jed326 @kotwanikunal @mch2 @msfroh @nknize @owaiskazi19 @peternied @reta @Rishikesh1159 @sachinpkale @saratvemulapalli @shwetathareja @sohami @VachaShah
31+
/MAINTAINERS.md @opensearch-project/opensearch-core-maintainers

‎.github/dependabot.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1403,14 +1403,6 @@ updates:
14031403
labels:
14041404
- "dependabot"
14051405
- "dependencies"
1406-
- directory: /test/fixtures/old-elasticsearch/
1407-
open-pull-requests-limit: 1
1408-
package-ecosystem: gradle
1409-
schedule:
1410-
interval: weekly
1411-
labels:
1412-
- "dependabot"
1413-
- "dependencies"
14141406
- directory: /test/fixtures/s3-fixture/
14151407
open-pull-requests-limit: 1
14161408
package-ecosystem: gradle

‎.github/workflows/maintainer-approval.yml

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎CHANGELOG.md

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,36 +5,42 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
55

66
## [Unreleased 3.x]
77
### Added
8+
- Add support for linux riscv64 platform ([#18156](https://github.com/opensearch-project/OpenSearch/pull/18156))
89
- [Rule based auto-tagging] Add get rule API ([#17336](https://github.com/opensearch-project/OpenSearch/pull/17336))
9-
- Add multi-threaded writer support in pull-based ingestion ([#17912](https://github.com/opensearch-project/OpenSearch/pull/17912))
10-
- Unset discovery nodes for every transport node actions request ([#17682](https://github.com/opensearch-project/OpenSearch/pull/17682))
1110
- Implement parallel shard refresh behind cluster settings ([#17782](https://github.com/opensearch-project/OpenSearch/pull/17782))
1211
- Bump OpenSearch Core main branch to 3.0.0 ([#18039](https://github.com/opensearch-project/OpenSearch/pull/18039))
1312
- Update API of Message in index to add the timestamp for lag calculation in ingestion polling ([#17977](https://github.com/opensearch-project/OpenSearch/pull/17977/))
14-
13+
- Add composite directory factory ([#17988](https://github.com/opensearch-project/OpenSearch/pull/17988))
14+
- Add pull-based ingestion error metrics and make internal queue size configurable ([#18088](https://github.com/opensearch-project/OpenSearch/pull/18088))
15+
- [Security Manager Replacement] Enhance Java Agent to intercept newByteChannel ([#17989](https://github.com/opensearch-project/OpenSearch/pull/17989))
16+
- Enabled Async Shard Batch Fetch by default ([#18139](https://github.com/opensearch-project/OpenSearch/pull/18139))
17+
- Allow to get the search request from the QueryCoordinatorContext ([#17818](https://github.com/opensearch-project/OpenSearch/pull/17818))
18+
- Improve sort-query performance by retaining the default `totalHitsThreshold` for approximated `match_all` queries ([#18189](https://github.com/opensearch-project/OpenSearch/pull/18189))
1519

1620
### Changed
17-
- Change the default max header size from 8KB to 16KB. ([#18024](https://github.com/opensearch-project/OpenSearch/pull/18024))
18-
- Avoid invalid retries in multiple replicas when querying [#17370](https://github.com/opensearch-project/OpenSearch/pull/17370)
19-
* Enable concurrent_segment_search auto mode by default[#17978](https://github.com/opensearch-project/OpenSearch/pull/17978)
20-
- Skip approximation when `track_total_hits` is set to `true` [#18017](https://github.com/opensearch-project/OpenSearch/pull/18017)
2121

2222
### Dependencies
2323
- Bump `com.google.code.gson:gson` from 2.12.1 to 2.13.0 ([#17923](https://github.com/opensearch-project/OpenSearch/pull/17923))
2424
- Bump `com.github.spotbugs:spotbugs-annotations` from 4.9.0 to 4.9.3 ([#17922](https://github.com/opensearch-project/OpenSearch/pull/17922))
2525
- Bump `com.microsoft.azure:msal4j` from 1.18.0 to 1.20.0 ([#17925](https://github.com/opensearch-project/OpenSearch/pull/17925))
26+
- Update Apache HttpClient5 and HttpCore5 (CVE-2025-27820) ([#18152](https://github.com/opensearch-project/OpenSearch/pull/18152))
27+
- Bump `org.apache.commons:commons-collections4` from 4.4 to 4.5.0 ([#18101](https://github.com/opensearch-project/OpenSearch/pull/18101))
28+
- Bump `netty` from 4.1.118.Final to 4.1.121.Final ([#18192](https://github.com/opensearch-project/OpenSearch/pull/18192))
2629

2730
### Deprecated
2831

2932
### Removed
3033

3134
### Fixed
32-
- Fix ingest pipeline cannot be executed when retry the failed index requests for update_by_query API and reindex API ([#18003](https://github.com/opensearch-project/OpenSearch/pull/18003))
33-
- With creation of FilterFieldType, we need unwrap all the MappedFieldType before using the instanceof check. ([#17951](https://github.com/opensearch-project/OpenSearch/pull/17951))
3435
- Fix simultaneously creating a snapshot and updating the repository can potentially trigger an infinite loop ([#17532](https://github.com/opensearch-project/OpenSearch/pull/17532))
3536
- Remove package org.opensearch.transport.grpc and replace with org.opensearch.plugin.transport.grpc ([#18031](https://github.com/opensearch-project/OpenSearch/pull/18031))
37+
- Fix the native plugin installation error cause by the pgp public key change ([#18147](https://github.com/opensearch-project/OpenSearch/pull/18147))
38+
- Fix object field exists query ([#17843](https://github.com/opensearch-project/OpenSearch/pull/17843))
39+
- Use Bad Request status for InputCoercionEcception ([#18161](https://github.com/opensearch-project/OpenSearch/pull/18161))
40+
- Null check field names in QueryStringQueryBuilder ([#18194](https://github.com/opensearch-project/OpenSearch/pull/18194))
41+
- Avoid NPE if on SnapshotInfo if 'shallow' boolean not present ([#18187](https://github.com/opensearch-project/OpenSearch/issues/18187))
3642
- Fix `addEmptyBuckets` while reducing histograms from consuming too much memory and tripping CircuitBreaker ([#17718](https://github.com/opensearch-project/OpenSearch/pull/17718))
3743

3844
### Security
3945

40-
[Unreleased 3.x]: https://github.com/opensearch-project/OpenSearch/compare/aa0e724e...main
46+
[Unreleased 3.x]: https://github.com/opensearch-project/OpenSearch/compare/3.0...main

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
[![Security Vulnerabilities](https://img.shields.io/github/issues/opensearch-project/OpenSearch/security%20vulnerability?labelColor=red)](https://github.com/opensearch-project/OpenSearch/issues?q=is%3Aissue+is%3Aopen+label%3A"security%20vulnerability")
88
[![Open Issues](https://img.shields.io/github/issues/opensearch-project/OpenSearch)](https://github.com/opensearch-project/OpenSearch/issues)
99
[![Open Pull Requests](https://img.shields.io/github/issues-pr/opensearch-project/OpenSearch)](https://github.com/opensearch-project/OpenSearch/pulls)
10-
[![2.19.2 Open Issues](https://img.shields.io/github/issues/opensearch-project/OpenSearch/v2.19.2)](https://github.com/opensearch-project/OpenSearch/issues?q=is%3Aissue+is%3Aopen+label%3A"v2.19.2")
10+
[![2.19.3 Open Issues](https://img.shields.io/github/issues/opensearch-project/OpenSearch/v2.19.3)](https://github.com/opensearch-project/OpenSearch/issues?q=is%3Aissue+is%3Aopen+label%3A"v2.19.3")
1111
[![2.18.1 Open Issues](https://img.shields.io/github/issues/opensearch-project/OpenSearch/v2.18.1)](https://github.com/opensearch-project/OpenSearch/issues?q=is%3Aissue+is%3Aopen+label%3A"v2.18.1")
1212
[![3.0.0 Open Issues](https://img.shields.io/github/issues/opensearch-project/OpenSearch/v3.0.0)](https://github.com/opensearch-project/OpenSearch/issues?q=is%3Aissue+is%3Aopen+label%3A"v3.0.0")
1313
[![GHA gradle check](https://github.com/opensearch-project/OpenSearch/actions/workflows/gradle-check.yml/badge.svg)](https://github.com/opensearch-project/OpenSearch/actions/workflows/gradle-check.yml)

‎build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -551,7 +551,6 @@ subprojects {
551551
includeClasses.add("org.opensearch.snapshots.SnapshotStatusApisIT")
552552
includeClasses.add("org.opensearch.test.rest.ClientYamlTestSuiteIT")
553553
includeClasses.add("org.opensearch.upgrade.DetectEsInstallationTaskTests")
554-
includeClasses.add("org.opensearch.cluster.MinimumClusterManagerNodesIT")
555554
}
556555
}
557556
}

‎buildSrc/src/main/groovy/org/opensearch/gradle/test/StandaloneRestTestPlugin.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ class StandaloneRestTestPlugin implements Plugin<Project> {
9898
eclipse.classpath.plusConfigurations = [project.configurations.getByName(JavaPlugin.TEST_RUNTIME_CLASSPATH_CONFIGURATION_NAME)]
9999

100100
IdeaModel idea = project.extensions.getByType(IdeaModel)
101-
idea.module.testSourceDirs += testSourceSet.java.srcDirs
101+
idea.module.testSources.from(testSourceSet.java.srcDirs)
102102
idea.module.scopes.put('TEST', [plus: [project.configurations.getByName(JavaPlugin.TEST_RUNTIME_CLASSPATH_CONFIGURATION_NAME)]] as Map<String, Collection<Configuration>>)
103103

104104
PrecommitTasks.create(project, false)

‎buildSrc/src/main/java/org/opensearch/gradle/Architecture.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ public enum Architecture {
3737
X64,
3838
ARM64,
3939
S390X,
40-
PPC64LE;
40+
PPC64LE,
41+
RISCV64;
4142

4243
public static Architecture current() {
4344
final String architecture = System.getProperty("os.arch", "");
@@ -51,6 +52,8 @@ public static Architecture current() {
5152
return S390X;
5253
case "ppc64le":
5354
return PPC64LE;
55+
case "riscv64":
56+
return RISCV64;
5457
default:
5558
throw new IllegalArgumentException("can not determine architecture from [" + architecture + "]");
5659
}

‎buildSrc/src/main/java/org/opensearch/gradle/DistributionDownloadPlugin.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,9 @@ private String dependencyNotation(OpenSearchDistribution distribution) {
244244
case PPC64LE:
245245
classifier = ":" + distribution.getPlatform() + "-ppc64le";
246246
break;
247+
case RISCV64:
248+
classifier = ":" + distribution.getPlatform() + "-riscv64";
249+
break;
247250
default:
248251
throw new IllegalArgumentException("Unsupported architecture: " + distribution.getArchitecture());
249252
}

‎buildSrc/src/main/java/org/opensearch/gradle/JavaVariant.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
abstract class JavaVariant implements Buildable, Iterable<File> {
2626

2727
private static final List<String> ALLOWED_ARCHITECTURES = Collections.unmodifiableList(
28-
Arrays.asList("aarch64", "x64", "s390x", "ppc64le")
28+
Arrays.asList("aarch64", "x64", "s390x", "ppc64le", "riscv64")
2929
);
3030
private static final List<String> ALLOWED_VENDORS = Collections.unmodifiableList(Arrays.asList("adoptium", "adoptopenjdk", "openjdk"));
3131
private static final List<String> ALLOWED_PLATFORMS = Collections.unmodifiableList(

‎buildSrc/src/main/java/org/opensearch/gradle/OpenSearchTestBasePlugin.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,6 @@ public void execute(Task t) {
166166
"java.security.properties",
167167
project.getRootProject().getLayout().getProjectDirectory() + "/distribution/src/config/" + securityFile
168168
);
169-
170169
// don't track these as inputs since they contain absolute paths and break cache relocatability
171170
File gradleHome = project.getGradle().getGradleUserHomeDir();
172171
String gradleVersion = project.getGradle().getGradleVersion();

‎buildSrc/src/main/java/org/opensearch/gradle/VersionProperties.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ public static Map<String, String> getVersions() {
9898
private static final String bundledJdkLinux_x64;
9999
private static final String bundledJdkLinux_s390x;
100100
private static final String bundledJdkLinux_ppc64le;
101+
private static final String bundledJdkLinux_riscv64;
101102
private static final String bundledJdkVendor;
102103
private static final Map<String, String> versions = new HashMap<String, String>();
103104

@@ -117,6 +118,7 @@ public static Map<String, String> getVersions() {
117118
bundledJdkLinux_x64 = props.getProperty("bundled_jdk_linux_x64", bundledJdkLinux);
118119
bundledJdkLinux_s390x = props.getProperty("bundled_jdk_linux_s390x", bundledJdkLinux);
119120
bundledJdkLinux_ppc64le = props.getProperty("bundled_jdk_linux_ppc64le", bundledJdkLinux);
121+
bundledJdkLinux_riscv64 = props.getProperty("bundled_jdk_linux_riscv64", bundledJdkLinux);
120122

121123
for (String property : props.stringPropertyNames()) {
122124
versions.put(property, props.getProperty(property));
@@ -155,6 +157,8 @@ private static String getBundledJdkLinux(String arch) {
155157
return bundledJdkLinux_s390x;
156158
case "ppc64le":
157159
return bundledJdkLinux_ppc64le;
160+
case "riscv64":
161+
return bundledJdkLinux_riscv64;
158162
default:
159163
throw new IllegalArgumentException("unknown platform [" + arch + "] for 'linux' platform");
160164
}

0 commit comments

Comments
 (0)