From bf508afa17d4f97586ad4347bb2a7fac3f923e64 Mon Sep 17 00:00:00 2001
From: Gasper Kojek <gkojek@gradle.com>
Date: Mon, 3 Jun 2024 22:51:33 +0200
Subject: [PATCH 01/10] Added basic Develocity integration

---
 .mvn/develocity.xml | 45 +++++++++++++++++++++++++++++++++++++++++++++
 .mvn/extensions.xml | 13 +++++++++++++
 2 files changed, 58 insertions(+)
 create mode 100644 .mvn/develocity.xml
 create mode 100644 .mvn/extensions.xml

diff --git a/.mvn/develocity.xml b/.mvn/develocity.xml
new file mode 100644
index 000000000000..4a469f094a72
--- /dev/null
+++ b/.mvn/develocity.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+
+<!-- Common develocity.xml configuration for Maven shared between CI agents and developers building locally.
+
+     The build cache credentials required for CI builds to write to the remote build cache are read from environment variables.
+     Possibly, the credentials are configured in Jenkins via Credentials plugin (https://plugins.jenkins.io/credentials/) and
+     Credentials Binding plugin (https://plugins.jenkins.io/credentials-binding/), or the credentials are injected using the
+     vendor-specific mechanism of the CI server running the build.
+
+     Note: In the XML configuration below, you need to adjust
+
+             - the server url of your Develocity server
+             - the name of the environment variable that reveals the build is running in a CI environment
+             - the names of the environment variables holding the build cache credentials
+
+           to the specifics of your CI server settings. -->
+
+<develocity
+  xmlns="https://www.gradle.com/develocity-maven" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="https://www.gradle.com/develocity-maven https://www.gradle.com/schema/develocity-maven.xsd">
+  <server>
+    <url>https://ge.apache.org</url>
+    <allowUntrusted>false</allowUntrusted>
+  </server>
+  <buildScan>
+    <backgroundBuildScanUpload>#{isFalse(env['GITHUB_ACTIONS'])}</backgroundBuildScanUpload>
+    <obfuscation>
+      <ipAddresses>#{{'0.0.0.0'}}</ipAddresses>
+    </obfuscation>
+    <publishing>
+      <onlyIf>
+        <![CDATA[authenticated]]>
+      </onlyIf>
+    </publishing>
+  </buildScan>
+  <buildCache>
+    <local>
+      <enabled>false</enabled>
+    </local>
+    <remote>
+      <enabled>false</enabled>
+      <storeEnabled>#{isTrue(env['GITHUB_ACTIONS'])}</storeEnabled> <!-- adjust to your CI provider -->
+    </remote>
+  </buildCache>
+</develocity>
\ No newline at end of file
diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
new file mode 100644
index 000000000000..376697226377
--- /dev/null
+++ b/.mvn/extensions.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<extensions>
+  <extension>
+    <groupId>com.gradle</groupId>
+    <artifactId>develocity-maven-extension</artifactId>
+    <version>1.21.4</version>
+  </extension>
+  <extension>
+    <groupId>com.gradle</groupId>
+    <artifactId>common-custom-user-data-maven-extension</artifactId>
+    <version>2.0</version>
+  </extension>
+</extensions>
\ No newline at end of file

From e94e4284bc05e7fdd71b699d505514897089df9d Mon Sep 17 00:00:00 2001
From: Gasper Kojek <gkojek@gradle.com>
Date: Mon, 3 Jun 2024 22:55:05 +0200
Subject: [PATCH 02/10] Added develocity access key setup to github actions
 (maven) workflows

---
 .github/workflows/build.yml            | 3 +++
 .github/workflows/ci.yml               | 3 +++
 .github/workflows/codecov.yml          | 3 +++
 .github/workflows/linter.yml           | 3 +++
 .github/workflows/main-sonar-check.yml | 3 +++
 .github/workflows/rat.yml              | 3 +++
 .github/workflows/sonar-check.yml      | 3 +++
 .github/workflows/ui.yml               | 3 +++
 8 files changed, 24 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1c6c90a61837..566f4f1120be 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -26,6 +26,9 @@ concurrency:
 permissions:
   contents: read
 
+env:
+  DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+
 jobs:
   build:
     runs-on: ubuntu-22.04
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fac2d6266fa5..7b2840197499 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -26,6 +26,9 @@ concurrency:
 permissions:
   contents: read
 
+env:
+  DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+
 jobs:
   build:
     if: github.repository == 'apache/cloudstack'
diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml
index a8f923d708d4..45a43249b4ee 100644
--- a/.github/workflows/codecov.yml
+++ b/.github/workflows/codecov.yml
@@ -26,6 +26,9 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
+env:
+  DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+
 jobs:
   build:
     if: github.repository == 'apache/cloudstack'
diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
index 784df0cf03ca..b216f35ca823 100644
--- a/.github/workflows/linter.yml
+++ b/.github/workflows/linter.yml
@@ -26,6 +26,9 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
+env:
+  DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+
 jobs:
   pre-commit:
     name: Run pre-commit
diff --git a/.github/workflows/main-sonar-check.yml b/.github/workflows/main-sonar-check.yml
index 66bb1093e040..3fd6d37e4e18 100644
--- a/.github/workflows/main-sonar-check.yml
+++ b/.github/workflows/main-sonar-check.yml
@@ -26,6 +26,9 @@ permissions:
   contents: read # to fetch code (actions/checkout)
   pull-requests: write # for sonar to comment on pull-request
 
+env:
+  DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+
 jobs:
   build:
     if: github.repository == 'apache/cloudstack'
diff --git a/.github/workflows/rat.yml b/.github/workflows/rat.yml
index b8f83de81940..f4a7e32ff8cf 100644
--- a/.github/workflows/rat.yml
+++ b/.github/workflows/rat.yml
@@ -26,6 +26,9 @@ concurrency:
 permissions:
   contents: read
 
+env:
+  DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+
 jobs:
   build:
     runs-on: ubuntu-22.04
diff --git a/.github/workflows/sonar-check.yml b/.github/workflows/sonar-check.yml
index 2ebcf1fb2db7..94ec6faadf5c 100644
--- a/.github/workflows/sonar-check.yml
+++ b/.github/workflows/sonar-check.yml
@@ -27,6 +27,9 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
+env:
+  DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+
 jobs:
   build:
     if: github.repository == 'apache/cloudstack' && github.event.pull_request.head.repo.full_name == github.repository
diff --git a/.github/workflows/ui.yml b/.github/workflows/ui.yml
index 476526aff32c..fd575abb2e10 100644
--- a/.github/workflows/ui.yml
+++ b/.github/workflows/ui.yml
@@ -26,6 +26,9 @@ concurrency:
 permissions:
   contents: read
 
+env:
+  DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+
 jobs:
   build:
     runs-on: ubuntu-22.04

From 2601328052467b8dc3ca1249293a9fb9b8dbfb38 Mon Sep 17 00:00:00 2001
From: Gasper Kojek <gkojek@gradle.com>
Date: Mon, 3 Jun 2024 23:28:21 +0200
Subject: [PATCH 03/10] Cleanup

---
 .mvn/develocity.xml | 19 ++-----------------
 .mvn/extensions.xml |  2 +-
 2 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/.mvn/develocity.xml b/.mvn/develocity.xml
index 4a469f094a72..207fab6bc22b 100644
--- a/.mvn/develocity.xml
+++ b/.mvn/develocity.xml
@@ -1,20 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 
-<!-- Common develocity.xml configuration for Maven shared between CI agents and developers building locally.
-
-     The build cache credentials required for CI builds to write to the remote build cache are read from environment variables.
-     Possibly, the credentials are configured in Jenkins via Credentials plugin (https://plugins.jenkins.io/credentials/) and
-     Credentials Binding plugin (https://plugins.jenkins.io/credentials-binding/), or the credentials are injected using the
-     vendor-specific mechanism of the CI server running the build.
-
-     Note: In the XML configuration below, you need to adjust
-
-             - the server url of your Develocity server
-             - the name of the environment variable that reveals the build is running in a CI environment
-             - the names of the environment variables holding the build cache credentials
-
-           to the specifics of your CI server settings. -->
-
 <develocity
   xmlns="https://www.gradle.com/develocity-maven" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="https://www.gradle.com/develocity-maven https://www.gradle.com/schema/develocity-maven.xsd">
@@ -39,7 +24,7 @@
     </local>
     <remote>
       <enabled>false</enabled>
-      <storeEnabled>#{isTrue(env['GITHUB_ACTIONS'])}</storeEnabled> <!-- adjust to your CI provider -->
+      <storeEnabled>#{isTrue(env['GITHUB_ACTIONS'])}</storeEnabled>
     </remote>
   </buildCache>
-</develocity>
\ No newline at end of file
+</develocity>
diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
index 376697226377..ea686d82aaa2 100644
--- a/.mvn/extensions.xml
+++ b/.mvn/extensions.xml
@@ -10,4 +10,4 @@
     <artifactId>common-custom-user-data-maven-extension</artifactId>
     <version>2.0</version>
   </extension>
-</extensions>
\ No newline at end of file
+</extensions>

From 217cd5d82f70d7feea54a36128745c6ac3d67e02 Mon Sep 17 00:00:00 2001
From: Gasper Kojek <gkojek@gradle.com>
Date: Tue, 4 Jun 2024 16:15:12 +0200
Subject: [PATCH 04/10] Added licensing header to .mvn/extensions.xml

---
 .mvn/extensions.xml | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
index ea686d82aaa2..8f5335529d1d 100644
--- a/.mvn/extensions.xml
+++ b/.mvn/extensions.xml
@@ -1,4 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+
 <extensions>
   <extension>
     <groupId>com.gradle</groupId>

From 9c66ca41e8e5acdd72ac49d3798a4382347f75f8 Mon Sep 17 00:00:00 2001
From: Gasper Kojek <gkojek@gradle.com>
Date: Tue, 4 Jun 2024 17:06:30 +0200
Subject: [PATCH 05/10] Added lincesing info and .gitignore for develocity
 integration

---
 .gitignore          |  3 +++
 .mvn/develocity.xml | 20 ++++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/.gitignore b/.gitignore
index 648b93b06965..802ba4d5ab82 100644
--- a/.gitignore
+++ b/.gitignore
@@ -99,6 +99,9 @@ tools/marvin/marvin/cloudstackAPI/*
 unittest
 venv
 waf-*
+waf3-*
+
+**/.mvn/.develocity*
 
 # this ignores _all files starting with '.'. Don't do that!
 #.*
diff --git a/.mvn/develocity.xml b/.mvn/develocity.xml
index 207fab6bc22b..b935f389405f 100644
--- a/.mvn/develocity.xml
+++ b/.mvn/develocity.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 
 <develocity
   xmlns="https://www.gradle.com/develocity-maven" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

From c81c2375fac3ef5d2036fff39ab339185b946988 Mon Sep 17 00:00:00 2001
From: Gasper Kojek <gkojek@gradle.com>
Date: Fri, 14 Aug 2026 14:12:53 +0200
Subject: [PATCH 06/10] Point Develocity at develocity.apache.org

Signed-off-by: Gasper Kojek <gkojek@gradle.com>
---
 .mvn/develocity.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.mvn/develocity.xml b/.mvn/develocity.xml
index b935f389405f..bde8355a5e2f 100644
--- a/.mvn/develocity.xml
+++ b/.mvn/develocity.xml
@@ -24,7 +24,7 @@
   xmlns="https://www.gradle.com/develocity-maven" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="https://www.gradle.com/develocity-maven https://www.gradle.com/schema/develocity-maven.xsd">
   <server>
-    <url>https://ge.apache.org</url>
+    <url>https://develocity.apache.org</url>
     <allowUntrusted>false</allowUntrusted>
   </server>
   <buildScan>

From c4e35b02f353a26fbce2c41b3bb1453f5723cde4 Mon Sep 17 00:00:00 2001
From: Gasper Kojek <gkojek@gradle.com>
Date: Fri, 14 Aug 2026 14:15:41 +0200
Subject: [PATCH 07/10] Bump Develocity Maven extensions and drop unused access
 key env

- develocity-maven-extension 1.21.4 -> 2.5.0
- common-custom-user-data-maven-extension 2.0 -> 2.4.0

CCUD 2.4.0 targets develocity-maven-extension 2.5.0, and both are
compatible with the Develocity 2026.2.x server. Verified locally with
`mvn -N validate`: both extensions load and the existing
.mvn/develocity.xml is read and accepted unchanged.

Also drop DEVELOCITY_ACCESS_KEY from ui.yml and pre-commit.yml, which do
not run Maven.

Signed-off-by: Gasper Kojek <gkojek@gradle.com>
---
 .github/workflows/pre-commit.yml | 3 ---
 .github/workflows/ui.yml         | 3 ---
 .mvn/extensions.xml              | 4 ++--
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
index 91088afb996f..4de995479c59 100644
--- a/.github/workflows/pre-commit.yml
+++ b/.github/workflows/pre-commit.yml
@@ -26,9 +26,6 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
-env:
-  DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
-
 jobs:
   pre-commit:
     name: Run pre-commit
diff --git a/.github/workflows/ui.yml b/.github/workflows/ui.yml
index 160e0df6a6e3..7f23add660f0 100644
--- a/.github/workflows/ui.yml
+++ b/.github/workflows/ui.yml
@@ -32,9 +32,6 @@ concurrency:
 permissions:
   contents: read
 
-env:
-  DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
-
 jobs:
   build:
     runs-on: ubuntu-24.04
diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
index 8f5335529d1d..ef246414a405 100644
--- a/.mvn/extensions.xml
+++ b/.mvn/extensions.xml
@@ -24,11 +24,11 @@
   <extension>
     <groupId>com.gradle</groupId>
     <artifactId>develocity-maven-extension</artifactId>
-    <version>1.21.4</version>
+    <version>2.5.0</version>
   </extension>
   <extension>
     <groupId>com.gradle</groupId>
     <artifactId>common-custom-user-data-maven-extension</artifactId>
-    <version>2.0</version>
+    <version>2.4.0</version>
   </extension>
 </extensions>

From e4e5065f8431776c6ab3ef1b6a97dff33011605e Mon Sep 17 00:00:00 2001
From: Gasper Kojek <gkojek@gradle.com>
Date: Fri, 14 Aug 2026 14:28:48 +0200
Subject: [PATCH 08/10] Use the DEVELOCITY_ACCESS_KEY secret name

Signed-off-by: Gasper Kojek <gkojek@gradle.com>
---
 .github/workflows/build.yml            | 2 +-
 .github/workflows/ci.yml               | 2 +-
 .github/workflows/main-sonar-check.yml | 2 +-
 .github/workflows/rat.yml              | 2 +-
 .github/workflows/sonar-check.yml      | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 72c4dc1388cd..ddea27ad029a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -29,7 +29,7 @@ concurrency:
 permissions:
   contents: read
 env:
-  DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+  DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
 jobs:
   build:
     runs-on: ubuntu-24.04
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 95ab304c0f04..e7cb692bac29 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -29,7 +29,7 @@ concurrency:
 permissions:
   contents: read
 env:
-  DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+  DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
 jobs:
   build:
     if: github.repository == 'apache/cloudstack'
diff --git a/.github/workflows/main-sonar-check.yml b/.github/workflows/main-sonar-check.yml
index e2d81b81df66..d5d0c1fb1c5d 100644
--- a/.github/workflows/main-sonar-check.yml
+++ b/.github/workflows/main-sonar-check.yml
@@ -26,7 +26,7 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
 env:
-  DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+  DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
 jobs:
   build:
     if: github.repository == 'apache/cloudstack'
diff --git a/.github/workflows/rat.yml b/.github/workflows/rat.yml
index a13c4022ca94..f4f9e71d3c3f 100644
--- a/.github/workflows/rat.yml
+++ b/.github/workflows/rat.yml
@@ -29,7 +29,7 @@ concurrency:
 permissions:
   contents: read
 env:
-  DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+  DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
 jobs:
   build:
     runs-on: ubuntu-24.04
diff --git a/.github/workflows/sonar-check.yml b/.github/workflows/sonar-check.yml
index 17a95b35cbed..08f8c6518fa0 100644
--- a/.github/workflows/sonar-check.yml
+++ b/.github/workflows/sonar-check.yml
@@ -25,7 +25,7 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
 env:
-  DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+  DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
 jobs:
   build:
     name: Sonar JaCoCo Coverage

From e8d7b4ca5f391cf567e71346333b2bb6043407a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C5=A1per=20Kojek?= <gkojek@gradle.com>
Date: Mon, 12 Oct 2026 11:22:35 +0200
Subject: [PATCH 09/10] Update develocity-maven-extension version to 2.6.0

---
 .mvn/extensions.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
index ef246414a405..8118c8f9f463 100644
--- a/.mvn/extensions.xml
+++ b/.mvn/extensions.xml
@@ -24,7 +24,7 @@
   <extension>
     <groupId>com.gradle</groupId>
     <artifactId>develocity-maven-extension</artifactId>
-    <version>2.5.0</version>
+    <version>2.6.0</version>
   </extension>
   <extension>
     <groupId>com.gradle</groupId>

From d64adb46c2776d57ef4e69023c262a33a58b4e4a Mon Sep 17 00:00:00 2001
From: Gasper Kojek <gkojek@gradle.com>
Date: Mon, 12 Oct 2026 12:09:48 +0200
Subject: [PATCH 10/10] Scope DEVELOCITY_ACCESS_KEY to the Maven steps

Signed-off-by: Gasper Kojek <gkojek@gradle.com>
---
 .github/workflows/build.yml            |  4 ++--
 .github/workflows/ci.yml               | 10 ++++++++--
 .github/workflows/main-sonar-check.yml |  5 +++--
 .github/workflows/rat.yml              |  4 ++--
 .github/workflows/sonar-check.yml      |  5 +++--
 5 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ddea27ad029a..742faf57e4bb 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -28,8 +28,6 @@ concurrency:
   cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
 permissions:
   contents: read
-env:
-  DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
 jobs:
   build:
     runs-on: ubuntu-24.04
@@ -56,5 +54,7 @@ jobs:
       - name: Install Non-OSS
         uses: ./.github/actions/install-nonoss
       - name: Noredist Build
+        env:
+          DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
         run: |
           mvn -B -P developer,systemvm -Dsimulator -Dnoredist clean install -T$(nproc)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e7cb692bac29..d46df2f395f5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -28,8 +28,6 @@ concurrency:
   cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
 permissions:
   contents: read
-env:
-  DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
 jobs:
   build:
     if: github.repository == 'apache/cloudstack'
@@ -56,6 +54,8 @@ jobs:
           git status
           ipmitool -V
       - name: Build with Maven
+        env:
+          DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
         run: |
           mvn -B -P developer,systemvm -Dsimulator clean install -DskipTests=true -T$(nproc)
       - name: Archive artifacts
@@ -309,6 +309,8 @@ jobs:
           mkdir -p ~/.m2/repository
           tar -xzf /tmp/artifacts/m2-cloudstack.tar.gz -C ~/.m2/repository
       - name: Setup Simulator Prerequisites
+        env:
+          DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
         run: |
           sudo python3 -m pip install --upgrade netaddr mysql-connector-python
           python3 -m pip install --user --upgrade tools/marvin/dist/[mM]arvin-*.tar.gz
@@ -321,6 +323,8 @@ jobs:
           find . | grep "src/main/java" | sed 's/\/java\//\/java /g' | awk '{print "--sourcefiles", $1, "\\"}' | sort | uniq >> jacoco-report.sh
           echo "--xml jacoco-coverage.xml" >> jacoco-report.sh
       - name: Start CloudStack Management Server with Simulator
+        env:
+          DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
         run: |
           export MAVEN_OPTS="-Xmx4096m -XX:MaxMetaspaceSize=800m -Djava.security.egd=file:/dev/urandom  -javaagent:jacoco/lib/jacocoagent.jar=address=*,port=36320,output=tcpserver --add-opens=java.base/java.lang=ALL-UNNAMED --add-exports=java.base/sun.security.x509=ALL-UNNAMED --add-opens=java.base/jdk.internal.reflect=ALL-UNNAMED"
           echo -e "\nStarting simulator"
@@ -331,6 +335,8 @@ jobs:
           echo -e "\nStarting Advanced Zone DataCenter deployment"
           python3 tools/marvin/marvin/deployDataCenter.py -i setup/dev/advdualzone.cfg 2>&1 || true
       - name: Run Integration Tests with Simulator
+        env:
+          DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
         run: |
           mkdir -p integration-test-results/smoke/misc
           mkdir -p integration-test-results/component
diff --git a/.github/workflows/main-sonar-check.yml b/.github/workflows/main-sonar-check.yml
index d5d0c1fb1c5d..1c9f1273b976 100644
--- a/.github/workflows/main-sonar-check.yml
+++ b/.github/workflows/main-sonar-check.yml
@@ -25,8 +25,6 @@ on:
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
-env:
-  DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
 jobs:
   build:
     if: github.repository == 'apache/cloudstack'
@@ -51,9 +49,12 @@ jobs:
       - name: Install Non-OSS
         uses: ./.github/actions/install-nonoss
       - name: Run Build and Tests with Coverage
+        env:
+          DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
         run: mvn -B -T$(nproc) -P developer,systemvm,quality -Dsimulator -Dnoredist clean install
       - name: Upload to SonarQube
         env:
+          DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         run: mvn -B -P quality org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=apache_cloudstack -Dsonar.branch.name=${{ github.ref_name }}
diff --git a/.github/workflows/rat.yml b/.github/workflows/rat.yml
index f4f9e71d3c3f..365d91458450 100644
--- a/.github/workflows/rat.yml
+++ b/.github/workflows/rat.yml
@@ -28,8 +28,6 @@ concurrency:
   cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
 permissions:
   contents: read
-env:
-  DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
 jobs:
   build:
     runs-on: ubuntu-24.04
@@ -42,6 +40,8 @@ jobs:
       - name: Install Non-OSS
         uses: ./.github/actions/install-nonoss
       - name: RAT licence checks
+        env:
+          DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
         run: |
           mvn -P developer,systemvm -Dsimulator -Dnoredist -pl . org.apache.rat:apache-rat-plugin:0.12:check
       - name: Rat Report
diff --git a/.github/workflows/sonar-check.yml b/.github/workflows/sonar-check.yml
index 08f8c6518fa0..94b9b7a2b720 100644
--- a/.github/workflows/sonar-check.yml
+++ b/.github/workflows/sonar-check.yml
@@ -24,8 +24,6 @@ on:
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
-env:
-  DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
 jobs:
   build:
     name: Sonar JaCoCo Coverage
@@ -49,10 +47,13 @@ jobs:
       - name: Install Non-OSS
         uses: ./.github/actions/install-nonoss
       - name: Run Build and Tests with Coverage
+        env:
+          DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
         run: mvn -B -T$(nproc) -P developer,systemvm,quality -Dsimulator -Dnoredist clean install
       - name: Upload to SonarQube
         if: github.repository == 'apache/cloudstack' && github.event.pull_request.head.repo.full_name == github.repository
         env:
+          DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
           PR_ID: ${{ github.event.pull_request.number }}