Combined PRs

build-caching-maven-samples/.mvn/extensions.xml

@@ -2,7 +2,7 @@
   <extension>
     <groupId>com.gradle</groupId>
     <artifactId>develocity-maven-extension</artifactId>
-    <version>1.23.2</version>
+    <version>2.0</version>
   </extension>
   <extension>
     <groupId>com.gradle</groupId>

common-develocity-gradle-configuration-groovy/settings.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'com.gradle.develocity' version '3.19.2'
+    id 'com.gradle.develocity' version '4.0'
     id 'com.gradle.common-custom-user-data-gradle-plugin' version '2.2.1'
 }
 

common-develocity-gradle-configuration-kotlin/settings.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("com.gradle.develocity") version "3.19.2"
+    id("com.gradle.develocity") version "4.0"
     id("com.gradle.common-custom-user-data-gradle-plugin") version "2.2.1"
 }
 

common-develocity-maven-configuration/.mvn/extensions.xml

@@ -3,7 +3,7 @@
     <extension>
         <groupId>com.gradle</groupId>
         <artifactId>develocity-maven-extension</artifactId>
-        <version>1.23.2</version>
+        <version>2.0</version>
     </extension>
     <extension>
         <groupId>com.gradle</groupId>

convention-develocity-gradle-plugin/plugins/gradle-5-or-newer/build.gradle

@@ -12,7 +12,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'com.gradle:develocity-gradle-plugin:3.19.2'
+    implementation 'com.gradle:develocity-gradle-plugin:4.0'
     implementation 'com.gradle:common-custom-user-data-gradle-plugin:2.2.1'
 }
 

convention-develocity-maven-extension/extension/pom.xml

@@ -26,7 +26,7 @@
         <dependency>
             <groupId>com.gradle</groupId>
             <artifactId>develocity-maven-extension</artifactId>
-            <version>1.23.2</version>
+            <version>2.0</version>
         </dependency>
         <dependency>
             <groupId>com.gradle</groupId>

convention-develocity-shared/convention-develocity-gradle-plugin/build.gradle.kts

@@ -9,7 +9,7 @@ repositories {
 }
 
 dependencies {
-    implementation("com.gradle:develocity-gradle-plugin:3.19.2")
+    implementation("com.gradle:develocity-gradle-plugin:4.0")
     implementation("com.gradle:common-custom-user-data-gradle-plugin:2.2.1")
     implementation(project(":convention-develocity-common"))
 }

convention-develocity-shared/convention-develocity-maven-extension/build.gradle.kts

@@ -11,7 +11,7 @@ repositories {
 dependencies {
     compileOnly("org.apache.maven:maven-core:3.9.9")
 
-    implementation("com.gradle:develocity-maven-extension:1.23.2")
+    implementation("com.gradle:develocity-maven-extension:2.0")
     implementation("com.gradle:common-custom-user-data-maven-extension:2.0.1")
     implementation(project(":convention-develocity-common"))
 }

custom-maven-distribution/create-custom-maven-distribution.sh

@@ -32,7 +32,7 @@ maven_conf=${maven_dir}/conf
 custom_maven_version=1.0.0
 custom_maven_zip=${maven_dir}-sample-${custom_maven_version}-bin.zip
 
-develocity_ext_version=1.23.2
+develocity_ext_version=2.0
 develocity_ext_jar=develocity-maven-extension-${develocity_ext_version}.jar
 
 develocity_sample_ext_version=2.0.1

rollout-maven-extension/.mvn/extensions.xml

@@ -7,7 +7,7 @@
     <extension>
         <groupId>com.gradle</groupId>
         <artifactId>develocity-maven-extension</artifactId>
-        <version>1.23.2</version>
+        <version>2.0</version>
     </extension>
     <extension>
         <groupId>com.gradle</groupId>