From: Steve Marion <steve.marion@sonarsource.com>
Date: Fri, 10 May 2024 13:07:20 +0000 (+0200)
Subject: NO-JIRA rename es version variable client/server
X-Git-Tag: 10.6.0.92116~118
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3356fc08604e567bda8d5646af64099df7765b5a;p=sonarqube.git

NO-JIRA rename es version variable client/server
---

diff --git a/build.gradle b/build.gradle
index 6339a10c62c..846955b14dd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -210,7 +210,7 @@ subprojects {
   ext {
     protobufVersion = '3.24.2'
     springVersion = '5.3.31'
-    elasticSearchVersion = '7.17.20'
+    elasticSearchClientVersion = '7.17.20'
   }
 
   sonar {
@@ -412,10 +412,10 @@ subprojects {
         entry 'jetty-server'
         entry 'jetty-servlet'
       }
-      dependency("org.elasticsearch.client:elasticsearch-rest-high-level-client:${elasticSearchVersion}") {
+      dependency("org.elasticsearch.client:elasticsearch-rest-high-level-client:${elasticSearchClientVersion}") {
         exclude 'org.apache.logging.log4j:log4j-core'
       }
-      dependency "org.elasticsearch.plugin:transport-netty4-client:${elasticSearchVersion}"
+      dependency "org.elasticsearch.plugin:transport-netty4-client:${elasticSearchClientVersion}"
       dependency 'org.elasticsearch:mocksocket:1.2'
       dependency 'org.eclipse.jgit:org.eclipse.jgit:6.9.0.202403050737-r'
       dependency "org.codelibs.elasticsearch.module:analysis-common:7.17.18"
diff --git a/gradle.properties b/gradle.properties
index 12381c458a4..47cc69ea67e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,7 +13,7 @@ projectTitle=SonarQube
 org.gradle.jvmargs=-Xmx2048m
 org.gradle.caching=true
 org.gradle.vfs.watch=true
-elasticsearchVersion=8.13.4
+elasticSearchServerVersion=8.13.4
 projectType=application
 artifactoryUrl=https://repox.jfrog.io/repox
 jre_release_name=jdk-17.0.11+9
diff --git a/sonar-application/build.gradle b/sonar-application/build.gradle
index 255dfded337..9dab90e85b7 100644
--- a/sonar-application/build.gradle
+++ b/sonar-application/build.gradle
@@ -80,9 +80,9 @@ dependencies {
     def artifactoryUsername = System.env.'ARTIFACTORY_PRIVATE_USERNAME' ?: (project.hasProperty('artifactoryUsername') ? project.getProperty('artifactoryUsername') : '')
     def artifactoryPassword = System.env.'ARTIFACTORY_PRIVATE_PASSWORD' ?: (project.hasProperty('artifactoryPassword') ? project.getProperty('artifactoryPassword') : '')
     if (artifactoryUsername && artifactoryPassword) {
-      zipDist "sonarqube:elasticsearch:${elasticsearchVersion}-no-jdk-linux-x86_64@tar.gz"
+      zipDist "sonarqube:elasticsearch:${elasticSearchServerVersion}-no-jdk-linux-x86_64@tar.gz"
     } else {
-      zipDist "elasticsearch:elasticsearch:${elasticsearchVersion}-linux-x86_64@tar.gz"
+      zipDist "elasticsearch:elasticsearch:${elasticSearchServerVersion}-linux-x86_64@tar.gz"
     }
 
 }
@@ -449,4 +449,4 @@ def downloadJreFromAdoptium(os, arch, filename, sha256) {
     algorithm 'SHA-256'
     checksum sha256
   }
-}
\ No newline at end of file
+}