Skip to content

Commit 02382c3

Browse files
heemin32sashashura
authored andcommitted
Fix invalid search location of JDK for arm64 (opensearch-project#4613)
Related commit: 0e9f74e Signed-off-by: Heemin Kim <[email protected]> Signed-off-by: Heemin Kim <[email protected]>
1 parent dc47358 commit 02382c3

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

CHANGELOG.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,14 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
7777
- [Segment Replication] Update flaky testOnNewCheckpointFromNewPrimaryCancelOngoingReplication unit test ([#4414](https://github.com/opensearch-project/OpenSearch/pull/4414))
7878
- Fixed the `_cat/shards/10_basic.yml` test cases fix.
7979
- [Segment Replication] Fix timeout issue by calculating time needed to process getSegmentFiles ([#4426](https://github.com/opensearch-project/OpenSearch/pull/4426))
80-
- [Bug]: gradle check failing with java heap OutOfMemoryError (([#4328](https://github.com/opensearch-project/OpenSearch/
80+
- [Bug]: gradle check failing with java heap OutOfMemoryError ([#4328](https://github.com/opensearch-project/OpenSearch/))
8181
- `opensearch.bat` fails to execute when install path includes spaces ([#4362](https://github.com/opensearch-project/OpenSearch/pull/4362))
8282
- Getting security exception due to access denied 'java.lang.RuntimePermission' 'accessDeclaredMembers' when trying to get snapshot with S3 IRSA ([#4469](https://github.com/opensearch-project/OpenSearch/pull/4469))
8383
- Fixed flaky test `ResourceAwareTasksTests.testTaskIdPersistsInThreadContext` ([#4484](https://github.com/opensearch-project/OpenSearch/pull/4484))
8484
- Fixed the ignore_malformed setting to also ignore objects ([#4494](https://github.com/opensearch-project/OpenSearch/pull/4494))
8585
- [Segment Replication] Ignore lock file when testing cleanupAndPreserveLatestCommitPoint ([#4544](https://github.com/opensearch-project/OpenSearch/pull/4544))
8686
- Updated jackson to 2.13.4 and snakeyml to 1.32 ([#4556](https://github.com/opensearch-project/OpenSearch/pull/4556))
87+
- [Bug]: Fixed invalid location of JDK dependency for arm64 architecture([#4613](https://github.com/opensearch-project/OpenSearch/pull/4613))
8788

8889
### Security
8990
- CVE-2022-25857 org.yaml:snakeyaml DOS vulnerability ([#4341](https://github.com/opensearch-project/OpenSearch/pull/4341))

buildSrc/src/main/java/org/opensearch/gradle/Jdk.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ public void setArchitecture(final String architecture) {
128128
"unknown architecture [" + jdkArchitecture + "] for jdk [" + name + "], must be one of " + ALLOWED_ARCHITECTURES
129129
);
130130
}
131-
this.architecture.set(architecture);
131+
this.architecture.set(jdkArchitecture);
132132
}
133133

134134
public String getBaseVersion() {

0 commit comments

Comments
 (0)