SONAR-14455 Upgrade Elasticsearch client dependencies to 7.10.2

diff --git a/build.gradle b/build.gradle
index 09f6c81fc797b24a36d15c0226fb109e68a0c9b2..4c1a4b79624435b0c9aa24a221ddf3a058ecb233 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -348,12 +348,12 @@ subprojects {
         entry 'jetty-server'
         entry 'jetty-servlet'
       }
-      dependency('org.elasticsearch.client:elasticsearch-rest-high-level-client:7.9.3') {
+      dependency('org.elasticsearch.client:elasticsearch-rest-high-level-client:7.10.2') {
         exclude 'commons-logging:commons-logging'
       }
-      dependency 'org.elasticsearch.plugin:transport-netty4-client:7.9.3'
+      dependency 'org.elasticsearch.plugin:transport-netty4-client:7.10.2'
       dependency 'org.elasticsearch:mocksocket:1.0'
-      dependency 'org.codelibs.elasticsearch.module:analysis-common:7.9.3'
+      dependency 'org.codelibs.elasticsearch.module:analysis-common:7.10.2'
       dependency 'org.eclipse.jgit:org.eclipse.jgit:5.9.0.202009080501-r'
       dependency 'org.tmatesoft.svnkit:svnkit:1.10.1'
       dependency 'org.hamcrest:hamcrest-all:1.3'

diff --git a/server/sonar-webserver-es/src/main/java/org/sonar/server/issue/index/IssueIndex.java b/server/sonar-webserver-es/src/main/java/org/sonar/server/issue/index/IssueIndex.java
index 77c7eaf35175c3e5b501f0ede052105243e086bd..6ffa2356051c75ddf06dbb371596b97905fe5a51 100644 (file)
--- a/server/sonar-webserver-es/src/main/java/org/sonar/server/issue/index/IssueIndex.java
+++ b/server/sonar-webserver-es/src/main/java/org/sonar/server/issue/index/IssueIndex.java
@@ -52,7 +52,7 @@ import org.elasticsearch.search.aggregations.bucket.MultiBucketsAggregation;
 import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.filter.ParsedFilter;
 import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramInterval;
-import org.elasticsearch.search.aggregations.bucket.histogram.ExtendedBounds;
+import org.elasticsearch.search.aggregations.bucket.histogram.LongBounds;
 import org.elasticsearch.search.aggregations.bucket.terms.IncludeExclude;
 import org.elasticsearch.search.aggregations.bucket.terms.ParsedStringTerms;
 import org.elasticsearch.search.aggregations.bucket.terms.Terms;
@@ -808,7 +808,7 @@ public class IssueIndex {
           .format(DateUtils.DATETIME_FORMAT)
           .timeZone(Optional.ofNullable(query.timeZone()).orElse(system.getDefaultTimeZone().toZoneId()))
           // ES dateHistogram bounds are inclusive while createdBefore parameter is exclusive
-          .extendedBounds(new ExtendedBounds(startInclusive ? startTime : (startTime + 1), endTime - 1L));
+          .extendedBounds(new LongBounds(startInclusive ? startTime : (startTime + 1), endTime - 1L));
         addEffortAggregationIfNeeded(query, dateHistogram);
         t.subAggregation(dateHistogram);
       });