From 2ad2d8ddbec0116fa64b678a9cdfe521344c3760 Mon Sep 17 00:00:00 2001
From: Jacek Poreda <jacek.poreda@sonarsource.com>
Date: Wed, 12 Apr 2023 14:30:53 +0200
Subject: [PATCH] SONAR-19005 Update Elasticsearch to 8.7.0

- update ES client to 7.17.9
- update ES modules used in test to 8.7.0
---
 build.gradle                   |  8 ++++----
 gradle.properties              | 10 +++++-----
 sonar-application/build.gradle |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/build.gradle b/build.gradle
index c54ad59cc36..ce2c55109cc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -327,13 +327,13 @@ subprojects {
         entry 'jetty-servlet'
       }
       // "elasticsearchDownloadUrlFile" and "elasticsearchDownloadSha512" must also be updated in gradle.properties
-      dependency('org.elasticsearch.client:elasticsearch-rest-high-level-client:7.17.8') {
+      dependency('org.elasticsearch.client:elasticsearch-rest-high-level-client:7.17.9') {
         exclude 'org.apache.logging.log4j:log4j-core'
       }
-      dependency 'org.elasticsearch.plugin:transport-netty4-client:7.17.8'
+      dependency 'org.elasticsearch.plugin:transport-netty4-client:7.17.9'
       dependency 'org.elasticsearch:mocksocket:1.2'
-      dependency 'org.codelibs.elasticsearch.module:analysis-common:7.17.1'
-      dependency 'org.codelibs.elasticsearch.module:reindex:7.17.1'
+      dependency 'org.codelibs.elasticsearch.module:analysis-common:7.17.9'
+      dependency 'org.codelibs.elasticsearch.module:reindex:7.17.9'
       dependency 'org.eclipse.jgit:org.eclipse.jgit:6.5.0.202303070854-r'
       dependency 'org.tmatesoft.svnkit:svnkit:1.10.11'
       dependency 'org.hamcrest:hamcrest-all:1.3'
diff --git a/gradle.properties b/gradle.properties
index 30b06f4a376..b240a3fbb46 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -7,10 +7,10 @@ org.gradle.jvmargs=-Xmx2048m
 org.gradle.caching=true
 org.gradle.vfs.watch=true
 # https://www.elastic.co/downloads/elasticsearch-no-jdk
-elasticsearchDownloadUrlPath=https://artifacts.elastic.co/downloads/elasticsearch/
+elasticsearchDownloadUrlPath=https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-8.7.0-linux-x86_64.tar.gz
 elasticsearchDownloadRepoxUrlPath=https://repox.jfrog.io/artifactory/sonarsource-bucket/sonarqube/elasticsearch/
-elasticsearchDownloadUrlFileNoJdk=elasticsearch-8.6.1-no-jdk-linux-x86_64.tar.gz
-elasticsearchDownloadUrlFileJdk=elasticsearch-8.6.1-linux-x86_64.tar.gz
-elasticsearchDownloadSha512NoJdk=b0da32bcd3edd78214164530c3fdeee6e7e0cd5e8a965251ebf1423bdd809a411fa654d4dd6dae37e5bf84174b4f5988f7388ce86d9363150d78ca87805d6d8a
-elasticsearchDownloadSha512Jdk=29ba49201bd4dd0c8b2e7a1cd96d90cc2876b40ee16b1cbc53f01bc450652b3d540522e6c92fb32e8cd972a67370dbdb4c4ae1e0c9fd570536b3da62cc8da65e
+elasticsearchDownloadUrlFileNoJdk=elasticsearch-8.7.0-no-jdk-linux-x86_64.tar.gz
+elasticsearchDownloadUrlFileJdk=elasticsearch-8.7.0-linux-x86_64.tar.gz
+elasticsearchDownloadSha512NoJdk=155ff74d55ff4ec9abe04877fd9da50f7083e5dee6c80fc85d61819fa1ca3e22dfa70478ab0632d89f1ec10153cfb38361c88a9babf4a4900cfd2d0639346673
+elasticsearchDownloadSha512Jdk=7ac6ee5e2e2ccee1ebb20a1c94992b90e879b8b37273d59ae1496b1e8ae5499ae1b6ddce8cea7dda3b63e7e45352735b2bd3328ad0fdd6d6aadb020de21eb894
 projectType=application
diff --git a/sonar-application/build.gradle b/sonar-application/build.gradle
index aaebfb4c7d4..261b5ea7d5d 100644
--- a/sonar-application/build.gradle
+++ b/sonar-application/build.gradle
@@ -326,8 +326,8 @@ task zip(type: Zip, dependsOn: [configurations.compileClasspath, downloadElastic
 
 // Check the size of the archive
 zip.doLast {
-  def minLength = 320000000
-  def maxLength = 357000000
+  def minLength = 330000000
+  def maxLength = 360000000
 
   def length = archiveFile.get().asFile.length()
   if (length < minLength)
-- 
2.39.5