From 7d92ddff5e54a6d121acc7b2c9430a6970478584 Mon Sep 17 00:00:00 2001
From: margarita <margarita.nedzelska@sonarsource.com>
Date: Tue, 17 Oct 2023 17:15:27 +0200
Subject: [PATCH 1/3] Add GE to SonarJava CI

---
 .cirrus.yml                | 5 +++++
 .gitignore                 | 1 +
 .mvn/extensions.xml        | 7 +++++++
 .mvn/gradle-enterprise.xml | 6 ++++++
 4 files changed, 19 insertions(+)
 create mode 100644 .mvn/extensions.xml
 create mode 100644 .mvn/gradle-enterprise.xml

diff --git a/.cirrus.yml b/.cirrus.yml
index 401b090e46a..302fbf6a47f 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -12,6 +12,11 @@ env:
   BURGR_URL: VAULT[development/kv/data/burgr data.url]
   BURGR_USERNAME: VAULT[development/kv/data/burgr data.cirrus_username]
   BURGR_PASSWORD: VAULT[development/kv/data/burgr data.cirrus_password]
+  GRADLE_ENTERPRISE_USERNAME: VAULT[development/team/sonarqube/kv/data/gradle-enterprise data.username]
+  GRADLE_ENTERPRISE_PASSWORD: VAULT[development/team/sonarqube/kv/data/gradle-enterprise data.password]
+  GRADLE_ENTERPRISE_URL: VAULT[development/team/sonarqube/kv/data/gradle-enterprise data.url]
+  GRADLE_ENTERPRISE_KEY: VAULT[development/team/sonarqube/kv/data/gradle-enterprise data.access-key]
+  GRADLE_ENTERPRISE_ACCESS_KEY: ${GRADLE_ENTERPRISE_URL}=${GRADLE_ENTERPRISE_KEY}
   # Use bash (instead of sh on linux or cmd.exe on windows)
   CIRRUS_SHELL: bash
   # Allows to run builds for the 50 last commits in a branch:
diff --git a/.gitignore b/.gitignore
index e738c017a0b..5ec30f71743 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,4 @@ Thumbs.db
 Desktop.ini
 
 .java-version
+.mvn/.gradle-enterprise/gradle-enterprise-workspace-id
diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
new file mode 100644
index 00000000000..6d265319961
--- /dev/null
+++ b/.mvn/extensions.xml
@@ -0,0 +1,7 @@
+<extensions>
+  <extension>
+    <groupId>com.gradle</groupId>
+    <artifactId>gradle-enterprise-maven-extension</artifactId>
+    <version>1.19.2</version>
+  </extension>
+</extensions>
diff --git a/.mvn/gradle-enterprise.xml b/.mvn/gradle-enterprise.xml
new file mode 100644
index 00000000000..cc023135961
--- /dev/null
+++ b/.mvn/gradle-enterprise.xml
@@ -0,0 +1,6 @@
+<gradleEnterprise>
+  <server>
+    <url>https://ae5480415855641419524dee8eb44d76-f3fa1c0f09cfc0bc.elb.eu-west-1.amazonaws.com</url>
+    <allowUntrusted>true</allowUntrusted>
+  </server>
+</gradleEnterprise>

From 3cfae693d89d2dfeca35814c9957595482670ab7 Mon Sep 17 00:00:00 2001
From: margarita <margarita.nedzelska@sonarsource.com>
Date: Thu, 19 Oct 2023 11:44:15 +0200
Subject: [PATCH 2/3] Fix env

---
 .cirrus.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 302fbf6a47f..d1f09ee914a 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -16,7 +16,6 @@ env:
   GRADLE_ENTERPRISE_PASSWORD: VAULT[development/team/sonarqube/kv/data/gradle-enterprise data.password]
   GRADLE_ENTERPRISE_URL: VAULT[development/team/sonarqube/kv/data/gradle-enterprise data.url]
   GRADLE_ENTERPRISE_KEY: VAULT[development/team/sonarqube/kv/data/gradle-enterprise data.access-key]
-  GRADLE_ENTERPRISE_ACCESS_KEY: ${GRADLE_ENTERPRISE_URL}=${GRADLE_ENTERPRISE_KEY}
   # Use bash (instead of sh on linux or cmd.exe on windows)
   CIRRUS_SHELL: bash
   # Allows to run builds for the 50 last commits in a branch:
@@ -64,6 +63,7 @@ build_task:
   maven_cache:
     folder: ${CIRRUS_WORKING_DIR}/.m2/repository
   build_script:
+    - export GRADLE_ENTERPRISE_ACCESS_KEY=${GRADLE_ENTERPRISE_URL}=${GRADLE_ENTERPRISE_KEY}
     - source cirrus-env BUILD
     - regular_mvn_build_deploy_analyze -Dsonar.analysisCache.enabled=true
     - ./check-license-compliance.sh
@@ -84,6 +84,7 @@ ws_scan_task:
   maven_cache:
     folder: ${CIRRUS_WORKING_DIR}/.m2/repository
   whitesource_script:
+    - export GRADLE_ENTERPRISE_ACCESS_KEY=${GRADLE_ENTERPRISE_URL}=${GRADLE_ENTERPRISE_KEY}
     - source cirrus-env QA
     - source set_maven_build_version $BUILD_NUMBER
     - mvn clean install -DskipTests -pl '!java-checks-test-sources'
@@ -100,6 +101,7 @@ qa_os_win_task:
   maven_cache:
     folder: ${CIRRUS_WORKING_DIR}/.m2/repository
   build_script:
+    - export GRADLE_ENTERPRISE_ACCESS_KEY=${GRADLE_ENTERPRISE_URL}=${GRADLE_ENTERPRISE_KEY}
     - source cirrus-env CI
     - mvn.cmd clean verify
   cleanup_before_cache_script: cleanup_maven_repository
@@ -123,6 +125,7 @@ plugin_qa_task:
   submodules_script:
     - git submodule update --init --recursive
   qa_script:
+    - export GRADLE_ENTERPRISE_ACCESS_KEY=${GRADLE_ENTERPRISE_URL}=${GRADLE_ENTERPRISE_KEY}
     - source cirrus-env QA
     - source set_maven_build_version $BUILD_NUMBER
     - cd docs/java-custom-rules-example
@@ -143,6 +146,7 @@ sanity_task:
   maven_cache:
     folder: ${CIRRUS_WORKING_DIR}/.m2/repository
   sanity_script:
+    - export GRADLE_ENTERPRISE_ACCESS_KEY=${GRADLE_ENTERPRISE_URL}=${GRADLE_ENTERPRISE_KEY}
     - source cirrus-env QA
     - source set_maven_build_version $BUILD_NUMBER
     - mvn clean install -Dmaven.test.skip=true
@@ -163,6 +167,7 @@ ruling_task:
   submodules_script:
     - git submodule update --init --recursive
   ruling_script:
+    - export GRADLE_ENTERPRISE_ACCESS_KEY=${GRADLE_ENTERPRISE_URL}=${GRADLE_ENTERPRISE_KEY}
     - source cirrus-env QA
     - source set_maven_build_version $BUILD_NUMBER
     - cd its/ruling
@@ -180,6 +185,7 @@ ruling_win_task:
   maven_cache:
     folder: ${CIRRUS_WORKING_DIR}/.m2/repository
   ruling_script:
+    - export GRADLE_ENTERPRISE_ACCESS_KEY=${GRADLE_ENTERPRISE_URL}=${GRADLE_ENTERPRISE_KEY}
     - source cirrus-env QA
     - source set_maven_build_version $BUILD_NUMBER
     - init_git_submodules its/sources

From 0e085a7b948f64e7ce967b68229373604c6803ee Mon Sep 17 00:00:00 2001
From: margarita <margarita.nedzelska@sonarsource.com>
Date: Thu, 19 Oct 2023 13:57:42 +0200
Subject: [PATCH 3/3] Fix env

---
 .cirrus.yml                | 7 -------
 .mvn/gradle-enterprise.xml | 1 +
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index d1f09ee914a..2605b507d19 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -63,7 +63,6 @@ build_task:
   maven_cache:
     folder: ${CIRRUS_WORKING_DIR}/.m2/repository
   build_script:
-    - export GRADLE_ENTERPRISE_ACCESS_KEY=${GRADLE_ENTERPRISE_URL}=${GRADLE_ENTERPRISE_KEY}
     - source cirrus-env BUILD
     - regular_mvn_build_deploy_analyze -Dsonar.analysisCache.enabled=true
     - ./check-license-compliance.sh
@@ -84,7 +83,6 @@ ws_scan_task:
   maven_cache:
     folder: ${CIRRUS_WORKING_DIR}/.m2/repository
   whitesource_script:
-    - export GRADLE_ENTERPRISE_ACCESS_KEY=${GRADLE_ENTERPRISE_URL}=${GRADLE_ENTERPRISE_KEY}
     - source cirrus-env QA
     - source set_maven_build_version $BUILD_NUMBER
     - mvn clean install -DskipTests -pl '!java-checks-test-sources'
@@ -101,7 +99,6 @@ qa_os_win_task:
   maven_cache:
     folder: ${CIRRUS_WORKING_DIR}/.m2/repository
   build_script:
-    - export GRADLE_ENTERPRISE_ACCESS_KEY=${GRADLE_ENTERPRISE_URL}=${GRADLE_ENTERPRISE_KEY}
     - source cirrus-env CI
     - mvn.cmd clean verify
   cleanup_before_cache_script: cleanup_maven_repository
@@ -125,7 +122,6 @@ plugin_qa_task:
   submodules_script:
     - git submodule update --init --recursive
   qa_script:
-    - export GRADLE_ENTERPRISE_ACCESS_KEY=${GRADLE_ENTERPRISE_URL}=${GRADLE_ENTERPRISE_KEY}
     - source cirrus-env QA
     - source set_maven_build_version $BUILD_NUMBER
     - cd docs/java-custom-rules-example
@@ -146,7 +142,6 @@ sanity_task:
   maven_cache:
     folder: ${CIRRUS_WORKING_DIR}/.m2/repository
   sanity_script:
-    - export GRADLE_ENTERPRISE_ACCESS_KEY=${GRADLE_ENTERPRISE_URL}=${GRADLE_ENTERPRISE_KEY}
     - source cirrus-env QA
     - source set_maven_build_version $BUILD_NUMBER
     - mvn clean install -Dmaven.test.skip=true
@@ -167,7 +162,6 @@ ruling_task:
   submodules_script:
     - git submodule update --init --recursive
   ruling_script:
-    - export GRADLE_ENTERPRISE_ACCESS_KEY=${GRADLE_ENTERPRISE_URL}=${GRADLE_ENTERPRISE_KEY}
     - source cirrus-env QA
     - source set_maven_build_version $BUILD_NUMBER
     - cd its/ruling
@@ -185,7 +179,6 @@ ruling_win_task:
   maven_cache:
     folder: ${CIRRUS_WORKING_DIR}/.m2/repository
   ruling_script:
-    - export GRADLE_ENTERPRISE_ACCESS_KEY=${GRADLE_ENTERPRISE_URL}=${GRADLE_ENTERPRISE_KEY}
     - source cirrus-env QA
     - source set_maven_build_version $BUILD_NUMBER
     - init_git_submodules its/sources
diff --git a/.mvn/gradle-enterprise.xml b/.mvn/gradle-enterprise.xml
index cc023135961..49984ae854e 100644
--- a/.mvn/gradle-enterprise.xml
+++ b/.mvn/gradle-enterprise.xml
@@ -2,5 +2,6 @@
   <server>
     <url>https://ae5480415855641419524dee8eb44d76-f3fa1c0f09cfc0bc.elb.eu-west-1.amazonaws.com</url>
     <allowUntrusted>true</allowUntrusted>
+    <accessKey>${env.GRADLE_ENTERPRISE_KEY}</accessKey>
   </server>
 </gradleEnterprise>