Skip to content

Bump main branch to be version 3.1.0 #18043

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Apr 26, 2025
Merged

Bump main branch to be version 3.1.0 #18043

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b42c016
Bump main branch to be version 3.1.0
peterzhuamazon Apr 23, 2025
9614365
Update current version
peterzhuamazon Apr 23, 2025
6ba0aeb
Update bwc version
peterzhuamazon Apr 23, 2025
ab4a502
Update bwc version
peterzhuamazon Apr 23, 2025
4d33bd4
Bump main branch to be version 3.1.0
peterzhuamazon Apr 23, 2025
136c7ba
Update current version
peterzhuamazon Apr 23, 2025
df7d123
Update bwc version
peterzhuamazon Apr 23, 2025
b461fe8
Update bwc version
peterzhuamazon Apr 23, 2025
33f071d
Update java-versions.properties
andrross Apr 23, 2025
9ec341c
Merge remote-tracking branch 'upstream/main' into bump-main-3.1.0
peterzhuamazon Apr 25, 2025
ad52d58
Merge branch 'bump-main-3.1.0' of github.com:peterzhuamazon/OpenSearc…
peterzhuamazon Apr 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .ci/bwcVersions
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,4 @@ BWC_VERSION:
- "2.19.0"
- "2.19.1"
- "2.19.2"
- "3.0.0"
4 changes: 2 additions & 2 deletions .ci/java-versions.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# are 'java' or 'openjdk' followed by the major release number.

# See please https://docs.gradle.org/8.10/userguide/upgrading_version_8.html#minimum_daemon_jvm_version
OPENSEARCH_BUILD_JAVA=openjdk17
OPENSEARCH_RUNTIME_JAVA=java11
OPENSEARCH_BUILD_JAVA=openjdk21
OPENSEARCH_RUNTIME_JAVA=java21
GRADLE_TASK=build
GRADLE_EXTRA_ARGS=
2 changes: 1 addition & 1 deletion buildSrc/version.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# Please use ../gradle/libs.versions.toml for dependency management
opensearch = 3.0.0
opensearch = 3.1.0
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[versions]
opensearch = "3.0.0"
opensearch = "3.1.0"
lucene = "10.1.0"

bundled_jdk_vendor = "adoptium"
Expand Down
3 changes: 2 additions & 1 deletion libs/core/src/main/java/org/opensearch/Version.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,8 @@ public class Version implements Comparable<Version>, ToXContentFragment {
public static final Version V_2_19_1 = new Version(2190199, org.apache.lucene.util.Version.LUCENE_9_12_1);
public static final Version V_2_19_2 = new Version(2190299, org.apache.lucene.util.Version.LUCENE_9_12_1);
public static final Version V_3_0_0 = new Version(3000099, org.apache.lucene.util.Version.LUCENE_10_1_0);
public static final Version CURRENT = V_3_0_0;
public static final Version V_3_1_0 = new Version(3010099, org.apache.lucene.util.Version.LUCENE_10_1_0);
public static final Version CURRENT = V_3_1_0;

public static Version fromId(int id) {
final Version known = LegacyESVersion.idToVersion.get(id);
Expand Down
Loading