Merge branch 'main' into upgradebot/bump-dv-maven-extension-1.23.2

Author: bigdaz

.github/dependabot.yml

@@ -1,18 +1,38 @@
 version: 2
+
 registries:
   gradle-plugin-portal:
     type: maven-repository
     url: https://plugins.gradle.org/m2
     username: dummy # Required by dependabot
     password: dummy # Required by dependabot
+
 updates:
   - package-ecosystem: "gradle"
     directory: "/"
     registries:
       - gradle-plugin-portal
     schedule:
-      interval: "daily"
+      interval: "weekly"
+    groups:
+      gradle-dependencies:
+        patterns:
+          - "*"
+
   - package-ecosystem: "maven"
     directory: "agent/service-message-maven-extension"
     schedule:
-      interval: "monthly"
+      interval: "weekly"
+    groups:
+      maven-dependencies:
+        patterns:
+          - "*"
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    groups:
+      github-actions:
+        patterns:
+          - "*"

.github/workflows/build-verification.yml

@@ -13,20 +13,20 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             -   name: Check out project
-                uses: actions/checkout@v3
+                uses: actions/checkout@v4
             -   name: Set up JDK 6
-                uses: actions/setup-java@v3
+                uses: actions/setup-java@v4
                 with:
                     java-version: '6.0.119'
                     distribution: 'zulu'
                     architecture: x64
             -   name: Set up JDK 11
-                uses: actions/setup-java@v3
+                uses: actions/setup-java@v4
                 with:
                     java-version: '11'
                     distribution: 'liberica'
             -   name: Setup Gradle
-                uses: gradle/gradle-build-action@v2
+                uses: gradle/actions/setup-gradle@v4
             -   name: Build and bundle plugin artifact
                 run: ./gradlew clean build -Porg.gradle.java.installations.fromEnv=JAVA_HOME_6_0_119_X64 -PjavaCompilerVersion=6
                 env:

.github/workflows/development-release.yml

@@ -15,20 +15,20 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             -   name: Check out project
-                uses: actions/checkout@v3
+                uses: actions/checkout@v4
             -   name: Set up JDK 6
-                uses: actions/setup-java@v3
+                uses: actions/setup-java@v4
                 with:
                     java-version: '6.0.119'
                     distribution: 'zulu'
                     architecture: x64
             -   name: Set up JDK 11
-                uses: actions/setup-java@v3
+                uses: actions/setup-java@v4
                 with:
                     java-version: '11'
                     distribution: 'liberica'
             -   name: Setup Gradle
-                uses: gradle/gradle-build-action@v2
+                uses: gradle/actions/setup-gradle@v4
                 with:
                     dependency-graph: generate-and-submit
             -   name: Build and bundle plugin artifact
@@ -45,7 +45,7 @@ jobs:
                     DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
                     GITHUB_DEPENDENCY_GRAPH_ENABLED: false
             -   name: Upload plugin artifact
-                uses: actions/upload-artifact@v3
+                uses: actions/upload-artifact@v4
                 with:
                     name: teamcity-build-scan-plugin
                     path: build/distributions/teamcity-build-scan-plugin-*.zip

.github/workflows/gradle-dependency-graph.yml

@@ -0,0 +1,24 @@
+name: Dependency Graph Submission
+on:
+  push:
+    branches: [ 'main' ]
+
+permissions:
+  contents: write
+
+jobs:
+  dependency-submission:
+    name: Submission
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out project
+        uses: actions/checkout@v4
+      - name: Set up JDK 11
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'liberica'
+          java-version: 11
+      - name: Generate and submit dependency graph
+        uses: gradle/actions/dependency-submission@v4
+        with:
+          develocity-access-key: ${{ secrets.DV_ACCESS_KEY }}

.github/workflows/gradle-wrapper-validation.yml

@@ -14,20 +14,20 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             -   name: Check out project
-                uses: actions/checkout@v3
+                uses: actions/checkout@v4
             -   name: Set up JDK 6
-                uses: actions/setup-java@v3
+                uses: actions/setup-java@v4
                 with:
                     java-version: '6.0.119'
                     distribution: 'zulu'
                     architecture: x64
             -   name: Set up JDK 11
-                uses: actions/setup-java@v3
+                uses: actions/setup-java@v4
                 with:
                     java-version: '11'
                     distribution: 'liberica'
             -   name: Setup Gradle
-                uses: gradle/gradle-build-action@v2
+                uses: gradle/actions/setup-gradle@v4
             -   name: Build and bundle plugin artifact
                 run: ./gradlew clean build -PRELEASE -Porg.gradle.java.installations.fromEnv=JAVA_HOME_6_0_119_X64 -PjavaCompilerVersion=6
                 env:
@@ -47,7 +47,7 @@ jobs:
                     GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
                     DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
             -   name: Upload plugin artifact
-                uses: actions/upload-artifact@v3
+                uses: actions/upload-artifact@v4
                 with:
                     name: teamcity-build-scan-plugin
                     path: build/distributions/teamcity-build-scan-plugin-*.zip

.github/workflows/production-release.yml

@@ -1,5 +1,5 @@
 <p align="left">
-  <a href="https://github.com/etiennestuder/teamcity-build-scan-plugin/actions?query=workflow%3A%22Build+Gradle+project%22"><img src="https://github.com/etiennestuder/teamcity-build-scan-plugin/workflows/Build%20Gradle%20project/badge.svg"></a>
+  <a href="https://github.com/etiennestuder/teamcity-build-scan-plugin/actions?query=workflow%3A%22Verify+Build%22"><img src="https://github.com/etiennestuder/teamcity-build-scan-plugin/workflows/Verify%20Build/badge.svg"></a>
 </p>
 
 teamcity-build-scan-plugin

README.md

@@ -17,13 +17,13 @@ configurations {
 dependencies {
     mvnExtensions project(path: ':agent:service-message-maven-extension', configuration: 'mvnExtension')
     mvnExtensions 'com.gradle:develocity-maven-extension:1.23.2'
-    mvnExtensions 'com.gradle:common-custom-user-data-maven-extension:2.0'
+    mvnExtensions 'com.gradle:common-custom-user-data-maven-extension:2.0.1'
 
     testImplementation gradleTestKit()
-    testImplementation ('io.ratpack:ratpack-groovy-test:1.10.0-milestone-10') {
+    testImplementation ('io.ratpack:ratpack-groovy-test:1.10.0-milestone-38') {
         exclude group: 'org.codehaus.groovy', module: 'groovy-all'
     }
-    testImplementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.17.1'
+    testImplementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.18.3'
     testImplementation('org.spockframework:spock-core:2.3-groovy-3.0')
     testImplementation('org.spockframework:spock-junit4:2.3-groovy-3.0')
 }

agent/build.gradle

@@ -8,6 +8,6 @@
     <extension>
         <groupId>com.gradle</groupId>
         <artifactId>common-custom-user-data-maven-extension</artifactId>
-        <version>2.0</version>
+        <version>2.0.1</version>
     </extension>
 </extensions>

agent/service-message-maven-extension/.mvn/extensions.xml

@@ -16,7 +16,7 @@
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-core</artifactId>
-            <version>3.6.3</version>
+            <version>3.9.9</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -49,7 +49,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.13.0</version>
+                <version>3.14.0</version>
                 <configuration>
                     <source>1.8</source>
                     <target>1.8</target>
@@ -65,7 +65,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.2.5</version>
+                <version>3.5.2</version>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.plexus</groupId>
@@ -82,7 +82,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.5.2</version>
+                <version>3.6.0</version>
                 <executions>
                     <execution>
                         <phase>package</phase>