Merge pull request #925 from gradle/combined-prs-branch

Combined PRs
gradle · Oct 24, 2023 · 0ea3efe · 0ea3efe
2 parents 19a11f5 + 2b7dba5
commit 0ea3efe
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/maven-build-caching-samples-verification.yml b/.github/workflows/maven-build-caching-samples-verification.yml
@@ -21,7 +21,7 @@ jobs:
           java-version: '17'
           distribution: 'temurin'
       - name: Setup Node.js and Npm
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: '14'
       - name: Set up Yarn

diff --git a/build-caching-maven-samples/aspectj-project/pom.xml b/build-caching-maven-samples/aspectj-project/pom.xml
@@ -45,7 +45,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.1.2</version>
+                <version>3.2.1</version>
             </plugin>
         </plugins>
         <pluginManagement>

diff --git a/build-caching-maven-samples/pom.xml b/build-caching-maven-samples/pom.xml
@@ -84,12 +84,12 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>3.1.2</version>
+        <version>3.2.1</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>3.1.2</version>
+        <version>3.2.1</version>
       </plugin>
     </plugins>
   </build>

diff --git a/common-gradle-enterprise-gradle-configuration-groovy/settings.gradle b/common-gradle-enterprise-gradle-configuration-groovy/settings.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'com.gradle.enterprise' version '3.15.1'
-    id 'com.gradle.common-custom-user-data-gradle-plugin' version '1.11.3'
+    id 'com.gradle.common-custom-user-data-gradle-plugin' version '1.12'
 }
 
 def isCI = System.getenv('CI') != null // adjust to your CI provider

diff --git a/common-gradle-enterprise-gradle-configuration-kotlin/settings.gradle.kts b/common-gradle-enterprise-gradle-configuration-kotlin/settings.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     id("com.gradle.enterprise") version "3.15.1"
-    id("com.gradle.common-custom-user-data-gradle-plugin") version "1.11.3"
+    id("com.gradle.common-custom-user-data-gradle-plugin") version "1.12"
 }
 
 val isCI = !System.getenv("CI").isNullOrEmpty() // adjust to your CI provider

diff --git a/convention-gradle-enterprise-gradle-plugin/plugins/gradle-2-through-4/build.gradle b/convention-gradle-enterprise-gradle-plugin/plugins/gradle-2-through-4/build.gradle
@@ -14,7 +14,7 @@ repositories {
 dependencies {
     // must not be newer than 1.16 to be compatible with Gradle 2.x - 4.x
     implementation "com.gradle:build-scan-plugin:2.4.2"
-    implementation 'com.gradle:common-custom-user-data-gradle-plugin:1.11.3'
+    implementation 'com.gradle:common-custom-user-data-gradle-plugin:1.12'
 }
 
 java {

diff --git a/convention-gradle-enterprise-gradle-plugin/plugins/gradle-2-through-4/settings.gradle b/convention-gradle-enterprise-gradle-plugin/plugins/gradle-2-through-4/settings.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'com.gradle.enterprise' version '3.15.1'
-    id 'com.gradle.common-custom-user-data-gradle-plugin' version '1.11.3'
+    id 'com.gradle.common-custom-user-data-gradle-plugin' version '1.12'
     id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0'
 }
 

diff --git a/convention-gradle-enterprise-gradle-plugin/plugins/gradle-5-or-newer/build.gradle b/convention-gradle-enterprise-gradle-plugin/plugins/gradle-5-or-newer/build.gradle
@@ -13,7 +13,7 @@ repositories {
 
 dependencies {
     implementation 'com.gradle:gradle-enterprise-gradle-plugin:3.15.1'
-    implementation 'com.gradle:common-custom-user-data-gradle-plugin:1.11.3'
+    implementation 'com.gradle:common-custom-user-data-gradle-plugin:1.12'
 }
 
 java {

diff --git a/convention-gradle-enterprise-gradle-plugin/plugins/gradle-5-or-newer/settings.gradle b/convention-gradle-enterprise-gradle-plugin/plugins/gradle-5-or-newer/settings.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'com.gradle.enterprise' version '3.15.1'
-    id 'com.gradle.common-custom-user-data-gradle-plugin' version '1.11.3'
+    id 'com.gradle.common-custom-user-data-gradle-plugin' version '1.12'
     id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0'
 }