From b42c016e7fd0d9a8821374c3aa554dd2b5bfba0c Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Wed, 23 Apr 2025 01:48:31 +0000 Subject: [PATCH 1/9] Bump main branch to be version 3.1.0 Signed-off-by: Peter Zhu --- buildSrc/version.properties | 2 +- gradle/libs.versions.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/buildSrc/version.properties b/buildSrc/version.properties index 61f4fbbf10b1d..f4cfdc39a6fc4 100644 --- a/buildSrc/version.properties +++ b/buildSrc/version.properties @@ -1,2 +1,2 @@ # Please use ../gradle/libs.versions.toml for dependency management -opensearch = 3.0.0 +opensearch = 3.1.0 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 51afc304263bf..b26c990158b70 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -opensearch = "3.0.0" +opensearch = "3.1.0" lucene = "10.1.0" bundled_jdk_vendor = "adoptium" From 961436536afb8890a5fe3a0e4eeb93166b8ed6f3 Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Wed, 23 Apr 2025 01:57:48 +0000 Subject: [PATCH 2/9] Update current version Signed-off-by: Peter Zhu --- libs/core/src/main/java/org/opensearch/Version.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/core/src/main/java/org/opensearch/Version.java b/libs/core/src/main/java/org/opensearch/Version.java index 1fd759494a19a..88b7f26778957 100644 --- a/libs/core/src/main/java/org/opensearch/Version.java +++ b/libs/core/src/main/java/org/opensearch/Version.java @@ -117,7 +117,7 @@ public class Version implements Comparable, 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 CURRENT = V_3_1_0; public static Version fromId(int id) { final Version known = LegacyESVersion.idToVersion.get(id); From 6ba0aeb660ff9928a04b49d6aa10aba0d849e821 Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Wed, 23 Apr 2025 02:04:47 +0000 Subject: [PATCH 3/9] Update bwc version Signed-off-by: Peter Zhu --- libs/core/src/main/java/org/opensearch/Version.java | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/core/src/main/java/org/opensearch/Version.java b/libs/core/src/main/java/org/opensearch/Version.java index 88b7f26778957..9700609a26435 100644 --- a/libs/core/src/main/java/org/opensearch/Version.java +++ b/libs/core/src/main/java/org/opensearch/Version.java @@ -117,6 +117,7 @@ public class Version implements Comparable, 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 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) { From ab4a50214eb109d549d4aeee069756c8c2263457 Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Wed, 23 Apr 2025 02:27:39 +0000 Subject: [PATCH 4/9] Update bwc version Signed-off-by: Peter Zhu --- .ci/bwcVersions | 1 + 1 file changed, 1 insertion(+) diff --git a/.ci/bwcVersions b/.ci/bwcVersions index e43e4c0fc40a6..77fb5a782c092 100644 --- a/.ci/bwcVersions +++ b/.ci/bwcVersions @@ -45,3 +45,4 @@ BWC_VERSION: - "2.19.0" - "2.19.1" - "2.19.2" + - "3.0.0" From 4d33bd4b172b072b82f3b55b3743925b302e93a3 Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Wed, 23 Apr 2025 01:48:31 +0000 Subject: [PATCH 5/9] Bump main branch to be version 3.1.0 Signed-off-by: Peter Zhu --- buildSrc/version.properties | 2 +- gradle/libs.versions.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/buildSrc/version.properties b/buildSrc/version.properties index 61f4fbbf10b1d..f4cfdc39a6fc4 100644 --- a/buildSrc/version.properties +++ b/buildSrc/version.properties @@ -1,2 +1,2 @@ # Please use ../gradle/libs.versions.toml for dependency management -opensearch = 3.0.0 +opensearch = 3.1.0 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 2a46687b61661..5ba8dd4a79311 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -opensearch = "3.0.0" +opensearch = "3.1.0" lucene = "10.1.0" bundled_jdk_vendor = "adoptium" From 136c7ba4c5ef14496f587e370ab3251ed15d7acc Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Wed, 23 Apr 2025 01:57:48 +0000 Subject: [PATCH 6/9] Update current version Signed-off-by: Peter Zhu --- libs/core/src/main/java/org/opensearch/Version.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/core/src/main/java/org/opensearch/Version.java b/libs/core/src/main/java/org/opensearch/Version.java index 1fd759494a19a..88b7f26778957 100644 --- a/libs/core/src/main/java/org/opensearch/Version.java +++ b/libs/core/src/main/java/org/opensearch/Version.java @@ -117,7 +117,7 @@ public class Version implements Comparable, 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 CURRENT = V_3_1_0; public static Version fromId(int id) { final Version known = LegacyESVersion.idToVersion.get(id); From df7d1236912b20b67973af3dba12b51b73672599 Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Wed, 23 Apr 2025 02:04:47 +0000 Subject: [PATCH 7/9] Update bwc version Signed-off-by: Peter Zhu --- libs/core/src/main/java/org/opensearch/Version.java | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/core/src/main/java/org/opensearch/Version.java b/libs/core/src/main/java/org/opensearch/Version.java index 88b7f26778957..9700609a26435 100644 --- a/libs/core/src/main/java/org/opensearch/Version.java +++ b/libs/core/src/main/java/org/opensearch/Version.java @@ -117,6 +117,7 @@ public class Version implements Comparable, 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 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) { From b461fe875ed9246efe93a71e424ba595027a11c4 Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Wed, 23 Apr 2025 02:27:39 +0000 Subject: [PATCH 8/9] Update bwc version Signed-off-by: Peter Zhu --- .ci/bwcVersions | 1 + 1 file changed, 1 insertion(+) diff --git a/.ci/bwcVersions b/.ci/bwcVersions index e43e4c0fc40a6..77fb5a782c092 100644 --- a/.ci/bwcVersions +++ b/.ci/bwcVersions @@ -45,3 +45,4 @@ BWC_VERSION: - "2.19.0" - "2.19.1" - "2.19.2" + - "3.0.0" From 33f071d9648437f3601c0e8a8b2cf716ecb94f09 Mon Sep 17 00:00:00 2001 From: Andrew Ross Date: Wed, 23 Apr 2025 15:36:20 -0700 Subject: [PATCH 9/9] Update java-versions.properties Signed-off-by: Andrew Ross --- .ci/java-versions.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci/java-versions.properties b/.ci/java-versions.properties index e290bda773f68..51dee79d6f872 100644 --- a/.ci/java-versions.properties +++ b/.ci/java-versions.properties @@ -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=