Merge branch 'main' into add_jackson_to_server

opensearch-project · Nov 25, 2022 · a814b11 · a814b11
2 parents 181da45 + f7ba51e
commit a814b11
Show file tree

Hide file tree

Showing 13 changed files with 12 additions and 10 deletions.
diff --git a/build.gradle b/build.gradle
@@ -450,12 +450,11 @@ gradle.projectsEvaluated {
 }
 
 // test retry configuration
-boolean isCiServer = System.getenv().containsKey("CI")
 subprojects {
   apply plugin: "org.gradle.test-retry"
   tasks.withType(Test).configureEach {
     retry {
-      if (isCiServer) {
+      if (BuildParams.isCi()) {
         maxRetries = 3
         maxFailures = 10
       }

diff --git a/buildSrc/version.properties b/buildSrc/version.properties
@@ -28,8 +28,8 @@ netty             = 4.1.84.Final
 joda              = 2.10.13
 
 # client dependencies
-httpclient5       = 5.1.3
-httpcore5         = 5.1.4
+httpclient5       = 5.1.4
+httpcore5         = 5.1.5
 httpclient        = 4.5.13
 httpcore          = 4.4.15
 httpasyncclient   = 4.1.5

diff --git a/client/rest/licenses/httpclient5-5.1.3.jar.sha1 b/client/rest/licenses/httpclient5-5.1.3.jar.sha1
diff --git a/client/rest/licenses/httpclient5-5.1.4.jar.sha1 b/client/rest/licenses/httpclient5-5.1.4.jar.sha1
@@ -0,0 +1 @@
+208f9eed6d6ab709e2ae7a75b457ef60c0baefa5
diff --git a/client/rest/licenses/httpcore5-5.1.4.jar.sha1 b/client/rest/licenses/httpcore5-5.1.4.jar.sha1
diff --git a/client/rest/licenses/httpcore5-5.1.5.jar.sha1 b/client/rest/licenses/httpcore5-5.1.5.jar.sha1
@@ -0,0 +1 @@
+df9da3a1fa2351c4790245400ed28d78a8ddd3fc
diff --git a/client/rest/licenses/httpcore5-h2-5.1.4.jar.sha1 b/client/rest/licenses/httpcore5-h2-5.1.4.jar.sha1
diff --git a/client/rest/licenses/httpcore5-h2-5.1.5.jar.sha1 b/client/rest/licenses/httpcore5-h2-5.1.5.jar.sha1
@@ -0,0 +1 @@
+624660339afd5006d427457e6b10b10b32fd86f1
diff --git a/client/sniffer/licenses/httpclient5-5.1.3.jar.sha1 b/client/sniffer/licenses/httpclient5-5.1.3.jar.sha1
diff --git a/client/sniffer/licenses/httpclient5-5.1.4.jar.sha1 b/client/sniffer/licenses/httpclient5-5.1.4.jar.sha1
@@ -0,0 +1 @@
+208f9eed6d6ab709e2ae7a75b457ef60c0baefa5
diff --git a/client/sniffer/licenses/httpcore5-5.1.4.jar.sha1 b/client/sniffer/licenses/httpcore5-5.1.4.jar.sha1
diff --git a/client/sniffer/licenses/httpcore5-5.1.5.jar.sha1 b/client/sniffer/licenses/httpcore5-5.1.5.jar.sha1
@@ -0,0 +1 @@
+df9da3a1fa2351c4790245400ed28d78a8ddd3fc
diff --git a/server/src/main/java/org/opensearch/Version.java b/server/src/main/java/org/opensearch/Version.java
@@ -86,7 +86,10 @@ public class Version implements Comparable<Version>, ToXContentFragment {
 
     // UNRELEASED
     public static final Version V_2_4_1 = new Version(2040199, org.apache.lucene.util.Version.LUCENE_9_4_1);
-    public static final Version V_2_5_0 = new Version(2050099, org.apache.lucene.util.Version.LUCENE_9_4_1);
+    public static final Version V_2_5_0 = new Version(
+        2050099,
+        org.apache.lucene.util.Version.fromBits(9, 4, 2) /** needs updated 9.5.0 snapshots */
+    );
     public static final Version V_3_0_0 = new Version(3000099, org.apache.lucene.util.Version.LUCENE_9_5_0);
     public static final Version CURRENT = V_3_0_0;