Merge remote-tracking branch 'upstream/main' into opensearch-gradle-c…

…heck-ingore-fix-2
opensearch-project · Aug 2, 2022 · dc7f93c · dc7f93c
2 parents ed9245e + 66c24ff
commit dc7f93c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/.ci/bwcVersions b/.ci/bwcVersions
@@ -48,3 +48,4 @@ BWC_VERSION:
   - "2.1.0"
   - "2.1.1"
   - "2.2.0"
+  - "2.3.0"
diff --git a/buildSrc/src/main/java/org/opensearch/gradle/test/DistroTestPlugin.java b/buildSrc/src/main/java/org/opensearch/gradle/test/DistroTestPlugin.java
@@ -75,9 +75,9 @@
 import java.util.stream.Stream;
 
 public class DistroTestPlugin implements Plugin<Project> {
-    private static final String SYSTEM_JDK_VERSION = "11.0.15+10";
+    private static final String SYSTEM_JDK_VERSION = "11.0.16+8";
     private static final String SYSTEM_JDK_VENDOR = "adoptium";
-    private static final String GRADLE_JDK_VERSION = "17.0.3+7";
+    private static final String GRADLE_JDK_VERSION = "17.0.4+8";
     private static final String GRADLE_JDK_VENDOR = "adoptium";
 
     // all distributions used by distro tests. this is temporary until tests are per distribution

diff --git a/buildSrc/version.properties b/buildSrc/version.properties
@@ -2,7 +2,7 @@ opensearch        = 3.0.0
 lucene            = 9.3.0
 
 bundled_jdk_vendor = adoptium
-bundled_jdk = 17.0.3+7
+bundled_jdk = 17.0.4+8
 
 
 

diff --git a/server/src/main/java/org/opensearch/Version.java b/server/src/main/java/org/opensearch/Version.java
@@ -95,6 +95,7 @@ public class Version implements Comparable<Version>, ToXContentFragment {
     public static final Version V_2_1_0 = new Version(2010099, org.apache.lucene.util.Version.LUCENE_9_2_0);
     public static final Version V_2_1_1 = new Version(2010199, org.apache.lucene.util.Version.LUCENE_9_2_0);
     public static final Version V_2_2_0 = new Version(2020099, org.apache.lucene.util.Version.LUCENE_9_3_0);
+    public static final Version V_2_3_0 = new Version(2030099, org.apache.lucene.util.Version.LUCENE_9_3_0);
     public static final Version V_3_0_0 = new Version(3000099, org.apache.lucene.util.Version.LUCENE_9_3_0);
     public static final Version CURRENT = V_3_0_0;
-Original file line number
+Diff line change
@@ Expand Up / @@ -48,3 +48,4 @@ BWC_VERSION: @@
       - "2.1.0"
       - "2.1.1"
       - "2.2.0"
+      - "2.3.0"