From 7f23f51f6091e56daa0e15b6de2db7ed5af2bb0e Mon Sep 17 00:00:00 2001
From: Tyler Bertrand <tbertrand@gradle.com>
Date: Thu, 31 Oct 2024 14:16:11 -0500
Subject: [PATCH 1/4] Normalize manifest file

---
 pom.xml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/pom.xml b/pom.xml
index 3277e31bc..460738724 100644
--- a/pom.xml
+++ b/pom.xml
@@ -536,6 +536,22 @@
             <trimStackTrace>false</trimStackTrace>
           </configuration>
         </plugin>
+
+        <plugin>
+          <groupId>com.gradle</groupId>
+          <artifactId>develocity-maven-extension</artifactId>
+          <configuration>
+            <develocity>
+              <normalization>
+                <runtimeClassPath>
+                  <metaInf>
+                    <ignoreCompletely>true</ignoreCompletely>
+                  </metaInf>
+                </runtimeClassPath>
+              </normalization>
+            </develocity>
+          </configuration>
+        </plugin>
       </plugins>
     </pluginManagement>
 

From 371a5f8145d81ca8759666493d6fe81d6cc7ad61 Mon Sep 17 00:00:00 2001
From: Tyler Bertrand <tbertrand@gradle.com>
Date: Thu, 31 Oct 2024 14:35:25 -0500
Subject: [PATCH 2/4] Remove develocity-workspace-id from version control

This is an identifier captured by Develocity used to uniquely represent a given workspace should not be committed
---
 .mvn/.develocity/develocity-workspace-id | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 .mvn/.develocity/develocity-workspace-id

diff --git a/.mvn/.develocity/develocity-workspace-id b/.mvn/.develocity/develocity-workspace-id
deleted file mode 100644
index b79e6d095..000000000
--- a/.mvn/.develocity/develocity-workspace-id
+++ /dev/null
@@ -1 +0,0 @@
-h5io2ff2gzdbbjanvoljkzgzra
\ No newline at end of file

From ec430f034b0b08fa8de1c50d841bda45554f3896 Mon Sep 17 00:00:00 2001
From: Tyler Bertrand <tbertrand@gradle.com>
Date: Thu, 31 Oct 2024 15:24:07 -0500
Subject: [PATCH 3/4] Enable local build cache

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

diff --git a/.mvn/develocity.xml b/.mvn/develocity.xml
index 1fe2a983d..4f9fdf42d 100644
--- a/.mvn/develocity.xml
+++ b/.mvn/develocity.xml
@@ -33,7 +33,7 @@
     </buildScan>
     <buildCache>
         <local>
-            <enabled>false</enabled>
+            <enabled>true</enabled>
         </local>
         <remote>
             <enabled>false</enabled>

From 98f387b236575488c5e6f1e972cc4dd01dfbd833 Mon Sep 17 00:00:00 2001
From: Tyler Bertrand <tbertrand@gradle.com>
Date: Mon, 4 Nov 2024 12:00:49 -0600
Subject: [PATCH 4/4] Use develocity-actions/setup-maven to surface Build Scan
 links

Don't add PR comment with build scan links - scans aren't published for PR builds against forks
---
 .github/workflows/codeql-analysis.yml | 8 ++++++--
 .github/workflows/receive-pr.yml      | 7 +++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index e442a7ff4..710211c27 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -92,10 +92,14 @@ jobs:
         distribution: 'temurin'
         java-version: '21'
 
+    - name: Setup Develocity
+      uses: gradle/develocity-actions/setup-maven@v1.2
+      with:
+        add-pr-comment: false
+        develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
+
     - name: Compile project
       run: ./mvnw -B -ntp clean package -Pquickbuild -Dtoolchain.skip=true
-      env:
-        DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v2
diff --git a/.github/workflows/receive-pr.yml b/.github/workflows/receive-pr.yml
index 8945e262e..684c5cdea 100644
--- a/.github/workflows/receive-pr.yml
+++ b/.github/workflows/receive-pr.yml
@@ -28,6 +28,11 @@ jobs:
           java-version: '21'
           distribution: 'temurin'
           cache: 'maven'
+      - name: Setup Develocity
+        uses: gradle/develocity-actions/setup-maven@v1.2
+        with:
+          add-pr-comment: false
+          develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
 
       # Capture the PR number
       # https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#using-data-from-the-triggering-workflow
@@ -43,8 +48,6 @@ jobs:
       # Execute recipes
       - name: Apply OpenRewrite recipes
         run: ./mvnw -Dtoolchain.skip=true -Dlicense.skip=true -DskipTests=true -P openrewrite clean install
-        env:
-          DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
 
       # Capture the diff
       - name: Create patch