Update to use DV Maven extension 1.21 and DV API

gradle · Apr 5, 2024 · dd7efe8 · dd7efe8
1 parent 66b3057
commit dd7efe8
Show file tree

Hide file tree

Showing 35 changed files with 108 additions and 114 deletions.
diff --git a/.github/workflows/maven-data-capturing-samples-verification.yml b/.github/workflows/maven-data-capturing-samples-verification.yml
@@ -42,16 +42,16 @@ jobs:
       - name: Provide data capture script to Maven build
         run: |
             # copy over sample script such that it gets pulled in by the Develocity extension
-            cp build-data-capturing-maven-samples/${{ matrix.sample-file }} common-develocity-maven-configuration/.mvn/gradle-enterprise-custom-user-data.groovy
+            cp build-data-capturing-maven-samples/${{ matrix.sample-file }} common-develocity-maven-configuration/.mvn/develocity-custom-user-data.groovy
       - name: Run Maven build
         id: mvn-build
         run: |
           delimiter="$(openssl rand -hex 8)"
           echo "mavenOutput<<${delimiter}" >> $GITHUB_OUTPUT
-          echo "$(mvn -f common-develocity-maven-configuration/pom.xml -Dgradle.enterprise.url=https://ge.solutions-team.gradle.com -X -B clean validate)" >> $GITHUB_OUTPUT
+          echo "$(mvn -f common-develocity-maven-configuration/pom.xml -Ddevelocity.url=https://ge.solutions-team.gradle.com -X -B clean validate)" >> $GITHUB_OUTPUT
           echo "${delimiter}" >> $GITHUB_OUTPUT
         env:
-          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_SOLUTIONS_ACCESS_TOKEN }}
+          DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_SOLUTIONS_ACCESS_TOKEN }}
       - name: Validate extension loaded
         # Asserting that extension was loaded checking a log entry
         run: exit 1

diff --git a/build-caching-maven-samples/.gitignore b/build-caching-maven-samples/.gitignore
@@ -1,3 +1,3 @@
-.mvn/.gradle-enterprise/gradle-enterprise-workspace-id
+.mvn/.develocity/develocity-workspace-id
 
 velocity.log
diff --git a/...-maven-samples/.mvn/gradle-enterprise.xml → ...caching-maven-samples/.mvn/develocity.xml b/...-maven-samples/.mvn/gradle-enterprise.xml → ...caching-maven-samples/.mvn/develocity.xml
@@ -1,11 +1,8 @@
-<gradleEnterprise>
+<develocity>
     <server>
         <url>https://localhost</url>
         <allowUntrusted>true</allowUntrusted>
     </server>
-    <buildScan>
-        <captureGoalInputFiles>true</captureGoalInputFiles>
-    </buildScan>
     <buildCache>
         <local>
             <enabled>true</enabled>
@@ -14,4 +11,4 @@
             <enabled>false</enabled>
         </remote>
     </buildCache>
-</gradleEnterprise>
+</develocity>
diff --git a/build-caching-maven-samples/.mvn/extensions.xml b/build-caching-maven-samples/.mvn/extensions.xml
@@ -1,12 +1,12 @@
 <extensions>
   <extension>
     <groupId>com.gradle</groupId>
-    <artifactId>gradle-enterprise-maven-extension</artifactId>
-    <version>1.20.1</version>
+    <artifactId>develocity-maven-extension</artifactId>
+    <version>1.21</version>
   </extension>
   <extension>
     <groupId>com.gradle</groupId>
     <artifactId>common-custom-user-data-maven-extension</artifactId>
-    <version>2</version>
+    <version>2.0</version>
   </extension>
 </extensions>
diff --git a/build-caching-maven-samples/animal-sniffer-project/pom.xml b/build-caching-maven-samples/animal-sniffer-project/pom.xml
@@ -39,9 +39,9 @@
       <plugins>
         <plugin>
           <groupId>com.gradle</groupId>
-          <artifactId>gradle-enterprise-maven-extension</artifactId>
+          <artifactId>develocity-maven-extension</artifactId>
           <configuration>
-            <gradleEnterprise>
+            <develocity>
               <plugins>
                 <plugin>
                   <groupId>org.codehaus.mojo</groupId>
@@ -116,7 +116,7 @@
                   </executions>
                 </plugin>
               </plugins>
-            </gradleEnterprise>
+            </develocity>
           </configuration>
         </plugin>
       </plugins>

diff --git a/build-caching-maven-samples/antlr3-project/pom.xml b/build-caching-maven-samples/antlr3-project/pom.xml
@@ -59,9 +59,9 @@
       <plugins>
         <plugin>
           <groupId>com.gradle</groupId>
-          <artifactId>gradle-enterprise-maven-extension</artifactId>
+          <artifactId>develocity-maven-extension</artifactId>
           <configuration>
-            <gradleEnterprise>
+            <develocity>
               <plugins>
                 <plugin>
                   <groupId>org.antlr</groupId>
@@ -117,7 +117,7 @@
                   </outputs>
                 </plugin>
               </plugins>
-            </gradleEnterprise>
+            </develocity>
           </configuration>
         </plugin>
       </plugins>

diff --git a/build-caching-maven-samples/asciidoctor-project/pom.xml b/build-caching-maven-samples/asciidoctor-project/pom.xml
@@ -58,9 +58,9 @@
       <plugins>
         <plugin>
           <groupId>com.gradle</groupId>
-          <artifactId>gradle-enterprise-maven-extension</artifactId>
+          <artifactId>develocity-maven-extension</artifactId>
           <configuration>
-            <gradleEnterprise>
+            <develocity>
               <plugins>
                 <plugin>
                   <groupId>org.asciidoctor</groupId>
@@ -174,7 +174,7 @@
                   </outputs>
                 </plugin>
               </plugins>
-            </gradleEnterprise>
+            </develocity>
           </configuration>
         </plugin>
       </plugins>

diff --git a/build-caching-maven-samples/aspectj-project/pom.xml b/build-caching-maven-samples/aspectj-project/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd
-        https://www.gradle.com/schema/gradle-enterprise-maven-project.xsd">
+        https://www.gradle.com/schema/develocity-maven-project.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
@@ -52,9 +52,9 @@
             <plugins>
                 <plugin>
                     <groupId>com.gradle</groupId>
-                    <artifactId>gradle-enterprise-maven-extension</artifactId>
+                    <artifactId>develocity-maven-extension</artifactId>
                     <configuration>
-                        <gradleEnterprise>
+                        <develocity>
                             <plugins>
                                 <plugin>
                                     <groupId>org.codehaus.mojo</groupId>
@@ -345,7 +345,7 @@
                                     </executions>
                                 </plugin>
                             </plugins>
-                        </gradleEnterprise>
+                        </develocity>
                     </configuration>
                 </plugin>
             </plugins>

diff --git a/build-caching-maven-samples/avro-project/pom.xml b/build-caching-maven-samples/avro-project/pom.xml
@@ -62,9 +62,9 @@
       <plugins>
         <plugin>
           <groupId>com.gradle</groupId>
-          <artifactId>gradle-enterprise-maven-extension</artifactId>
+          <artifactId>develocity-maven-extension</artifactId>
           <configuration>
-            <gradleEnterprise>
+            <develocity>
               <plugins>
                 <plugin>
                   <groupId>org.apache.avro</groupId>
@@ -120,7 +120,7 @@
                   </outputs>
                 </plugin>
               </plugins>
-            </gradleEnterprise>
+            </develocity>
           </configuration>
         </plugin>
       </plugins>

diff --git a/build-caching-maven-samples/clojure-project/pom.xml b/build-caching-maven-samples/clojure-project/pom.xml
@@ -1,6 +1,6 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd
-  https://www.gradle.com/schema/gradle-enterprise-maven-project.xsd">
+  https://www.gradle.com/schema/develocity-maven-project.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>clojure-project</artifactId>
   <packaging>jar</packaging>
@@ -57,9 +57,9 @@
       <plugins>
         <plugin>
           <groupId>com.gradle</groupId>
-          <artifactId>gradle-enterprise-maven-extension</artifactId>
+          <artifactId>develocity-maven-extension</artifactId>
           <configuration>
-            <gradleEnterprise>
+            <develocity>
               <plugins>
                 <plugin>
                   <groupId>com.theoryinpractise</groupId>
@@ -212,7 +212,7 @@
                   </outputs>
                 </plugin>
               </plugins>
-            </gradleEnterprise>
+            </develocity>
           </configuration>
         </plugin>
       </plugins>

diff --git a/build-caching-maven-samples/duplicate-finder-project/pom.xml b/build-caching-maven-samples/duplicate-finder-project/pom.xml
@@ -42,9 +42,9 @@
       <plugins>
         <plugin>
           <groupId>com.gradle</groupId>
-          <artifactId>gradle-enterprise-maven-extension</artifactId>
+          <artifactId>develocity-maven-extension</artifactId>
           <configuration>
-            <gradleEnterprise>
+            <develocity>
               <plugins>
                 <plugin>
                   <groupId>org.basepom.maven</groupId>
@@ -115,7 +115,7 @@
                   </outputs>
                 </plugin>
               </plugins>
-            </gradleEnterprise>
+            </develocity>
           </configuration>
         </plugin>
       </plugins>

diff --git a/build-caching-maven-samples/enforcer-project/pom.xml b/build-caching-maven-samples/enforcer-project/pom.xml
@@ -94,9 +94,9 @@
       <plugins>
         <plugin>
           <groupId>com.gradle</groupId>
-          <artifactId>gradle-enterprise-maven-extension</artifactId>
+          <artifactId>develocity-maven-extension</artifactId>
           <configuration>
-            <gradleEnterprise>
+            <develocity>
               <plugins>
                 <plugin>
                   <groupId>org.apache.maven.plugins</groupId>
@@ -224,7 +224,7 @@
                   </executions>
                 </plugin>
               </plugins>
-            </gradleEnterprise>
+            </develocity>
           </configuration>
         </plugin>
       </plugins>

diff --git a/build-caching-maven-samples/exec-yarn-project/pom.xml b/build-caching-maven-samples/exec-yarn-project/pom.xml
@@ -52,9 +52,9 @@
         <!-- Make yarn build cacheable -->
         <plugin>
           <groupId>com.gradle</groupId>
-          <artifactId>gradle-enterprise-maven-extension</artifactId>
+          <artifactId>develocity-maven-extension</artifactId>
           <configuration>
-            <gradleEnterprise>
+            <develocity>
               <plugins>
                 <plugin>
                   <groupId>org.codehaus.mojo</groupId>
@@ -174,7 +174,7 @@
                   </executions>
                 </plugin>
               </plugins>
-            </gradleEnterprise>
+            </develocity>
           </configuration>
         </plugin>
       </plugins>

diff --git a/build-caching-maven-samples/kotlin-project/pom.xml b/build-caching-maven-samples/kotlin-project/pom.xml
@@ -66,9 +66,9 @@
             <plugins>
                 <plugin>
                     <groupId>com.gradle</groupId>
-                    <artifactId>gradle-enterprise-maven-extension</artifactId>
+                    <artifactId>develocity-maven-extension</artifactId>
                     <configuration>
-                        <gradleEnterprise>
+                        <develocity>
                             <plugins>
                                 <plugin>
                                     <groupId>org.jetbrains.kotlin</groupId>
@@ -199,7 +199,7 @@
                                     </localState>
                                 </plugin>
                             </plugins>
-                        </gradleEnterprise>
+                        </develocity>
                     </configuration>
                 </plugin>
             </plugins>

diff --git a/build-caching-maven-samples/pmd-project/pom.xml b/build-caching-maven-samples/pmd-project/pom.xml
@@ -35,9 +35,9 @@
       <plugins>
         <plugin>
           <groupId>com.gradle</groupId>
-          <artifactId>gradle-enterprise-maven-extension</artifactId>
+          <artifactId>develocity-maven-extension</artifactId>
           <configuration>
-            <gradleEnterprise>
+            <develocity>
               <plugins>
                 <plugin>
                   <artifactId>maven-pmd-plugin</artifactId>
@@ -295,7 +295,7 @@
                   </executions>
                 </plugin>
               </plugins>
-            </gradleEnterprise>
+            </develocity>
           </configuration>
         </plugin>
       </plugins>

diff --git a/build-caching-maven-samples/protobuf-project/pom.xml b/build-caching-maven-samples/protobuf-project/pom.xml
@@ -65,9 +65,9 @@
       <plugins>
         <plugin>
           <groupId>com.gradle</groupId>
-          <artifactId>gradle-enterprise-maven-extension</artifactId>
+          <artifactId>develocity-maven-extension</artifactId>
           <configuration>
-            <gradleEnterprise>
+            <develocity>
               <plugins>
                 <plugin>
                   <groupId>com.github.os72</groupId>
@@ -126,7 +126,7 @@
                   </outputs>
                 </plugin>
               </plugins>
-            </gradleEnterprise>
+            </develocity>
           </configuration>
         </plugin>
       </plugins>

diff --git a/build-caching-maven-samples/spotbugs-project/pom.xml b/build-caching-maven-samples/spotbugs-project/pom.xml
@@ -39,9 +39,9 @@
       <plugins>
         <plugin>
           <groupId>com.gradle</groupId>
-          <artifactId>gradle-enterprise-maven-extension</artifactId>
+          <artifactId>develocity-maven-extension</artifactId>
           <configuration>
-            <gradleEnterprise>
+            <develocity>
               <plugins>
                 <plugin>
                   <groupId>com.github.spotbugs</groupId>
@@ -154,7 +154,7 @@
                   </executions>
                 </plugin>
               </plugins>
-            </gradleEnterprise>
+            </develocity>
           </configuration>
         </plugin>
       </plugins>

diff --git a/build-caching-maven-samples/spotless-project/pom.xml b/build-caching-maven-samples/spotless-project/pom.xml
@@ -51,9 +51,9 @@
             <plugins>
                 <plugin>
                     <groupId>com.gradle</groupId>
-                    <artifactId>gradle-enterprise-maven-extension</artifactId>
+                    <artifactId>develocity-maven-extension</artifactId>
                     <configuration>
-                        <gradleEnterprise>
+                        <develocity>
                             <plugins>
                                 <plugin>
                                     <groupId>com.diffplug.spotless</groupId>
@@ -226,7 +226,7 @@
                                     </outputs>
                                 </plugin>
                             </plugins>
-                        </gradleEnterprise>
+                        </develocity>
                     </configuration>
                 </plugin>
             </plugins>

diff --git a/build-caching-maven-samples/spring-cloud-contract-project/pom.xml b/build-caching-maven-samples/spring-cloud-contract-project/pom.xml
@@ -62,9 +62,9 @@
       <plugins>
         <plugin>
           <groupId>com.gradle</groupId>
-          <artifactId>gradle-enterprise-maven-extension</artifactId>
+          <artifactId>develocity-maven-extension</artifactId>
           <configuration>
-            <gradleEnterprise>
+            <develocity>
               <plugins>
                 <plugin>
                   <groupId>org.springframework.cloud</groupId>
@@ -206,7 +206,7 @@
                   </executions>
                 </plugin>
               </plugins>
-            </gradleEnterprise>
+            </develocity>
           </configuration>
         </plugin>
       </plugins>