Skip to content

Commit 4094287

Browse files
authored
Fix issue with updating core with a patch number other than 0 (#19377)
* Fix issue with updating core with a patch number other than 0 Signed-off-by: Craig Perkins <[email protected]> * Add to CHANGELOG Signed-off-by: Craig Perkins <[email protected]> --------- Signed-off-by: Craig Perkins <[email protected]>
1 parent b9781c1 commit 4094287

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
2626
- Avoid primary shard failure caused by merged segment warmer exceptions ([#19436](https://github.com/opensearch-project/OpenSearch/pull/19436))
2727
- Fix pull-based ingestion out-of-bounds offset scenarios and remove persisted offsets ([#19607](https://github.com/opensearch-project/OpenSearch/pull/19607))
2828
- [Star Tree] Fix sub-aggregator casting for search with profile=true ([19652](https://github.com/opensearch-project/OpenSearch/pull/19652))
29+
- Fix issue with updating core with a patch number other than 0 ([#19377](https://github.com/opensearch-project/OpenSearch/pull/19377))
2930

3031
### Dependencies
3132
- Update to Gradle 9.1 ([#19575](https://github.com/opensearch-project/OpenSearch/pull/19575))

buildSrc/src/main/java/org/opensearch/gradle/info/GlobalBuildInfoPlugin.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,10 +149,8 @@ private static BwcVersions resolveBwcVersions(File root) {
149149
// todo redesign this terrible unreliable hack; should NEVER rely on parsing a source file
150150
// for now, we hack the hack
151151
File versionsFile = new File(root, DEFAULT_VERSION_JAVA_FILE_PATH);
152-
File legacyVersionsFile = new File(root, DEFAULT_LEGACY_VERSION_JAVA_FILE_PATH);
153-
try (FileInputStream fis = new FileInputStream(versionsFile); FileInputStream fis2 = new FileInputStream(legacyVersionsFile)) {
152+
try (FileInputStream fis = new FileInputStream(versionsFile)) {
154153
List<String> versionLines = IOUtils.readLines(fis, "UTF-8");
155-
versionLines.addAll(IOUtils.readLines(fis2, "UTF-8"));
156154
return new BwcVersions(versionLines);
157155
} catch (IOException e) {
158156
throw new IllegalStateException("Unable to resolve bwc versions from versionsFile.", e);

0 commit comments

Comments
 (0)