From fe178208f494fe88500b95da22d17c630254125f Mon Sep 17 00:00:00 2001 From: bot-githubaction Date: Wed, 11 Sep 2024 02:23:55 +0000 Subject: [PATCH] Bump references to Develocity Maven extension from 1.21.4 to 1.22.1 --- README.md | 2 +- agent/build.gradle | 2 +- agent/service-message-maven-extension/.mvn/extensions.xml | 2 +- agent/service-message-maven-extension/pom.xml | 4 ++-- .../buildscan/agent/BuildScanServiceMessageInjector.java | 2 +- .../buildscan/agent/maven/BaseExtensionApplicationTest.groovy | 2 +- src/main/resources/default-plugin-versions.properties | 2 +- .../connection/DevelocityConnectionProviderTest.groovy | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 94124291..8cc029cb 100644 --- a/README.md +++ b/README.md @@ -175,7 +175,7 @@ For Maven builds, the version of the Develocity Maven extension automatically ap | TC Build Scan plugin version | Injected Develocity Maven extension version | Injected Common CCUD Maven extension version | |------------------------------|---------------------------------------------|----------------------------------------------| -| Next | 1.21.4 | 2.0 | +| Next | 1.22.1 | 2.0 | | 0.35 | 1.18.1 | 1.12.2 | | 0.34 | 1.18 | 1.12.2 | | 0.33 | 1.16.1 | 1.11.1 | diff --git a/agent/build.gradle b/agent/build.gradle index 787cb05b..0a967579 100644 --- a/agent/build.gradle +++ b/agent/build.gradle @@ -16,7 +16,7 @@ configurations { dependencies { mvnExtensions project(path: ':agent:service-message-maven-extension', configuration: 'mvnExtension') - mvnExtensions 'com.gradle:develocity-maven-extension:1.21.4' + mvnExtensions 'com.gradle:develocity-maven-extension:1.22.1' mvnExtensions 'com.gradle:common-custom-user-data-maven-extension:2.0' testImplementation gradleTestKit() diff --git a/agent/service-message-maven-extension/.mvn/extensions.xml b/agent/service-message-maven-extension/.mvn/extensions.xml index 7cf3cab8..fd623c76 100644 --- a/agent/service-message-maven-extension/.mvn/extensions.xml +++ b/agent/service-message-maven-extension/.mvn/extensions.xml @@ -3,7 +3,7 @@ com.gradle develocity-maven-extension - 1.21.4 + 1.22.1 com.gradle diff --git a/agent/service-message-maven-extension/pom.xml b/agent/service-message-maven-extension/pom.xml index 255ee042..2bae28cd 100644 --- a/agent/service-message-maven-extension/pom.xml +++ b/agent/service-message-maven-extension/pom.xml @@ -28,13 +28,13 @@ com.gradle gradle-enterprise-maven-extension - 1.21.4 + 1.22.1 provided com.gradle develocity-maven-extension - 1.21.4 + 1.22.1 provided diff --git a/agent/src/main/java/nu/studer/teamcity/buildscan/agent/BuildScanServiceMessageInjector.java b/agent/src/main/java/nu/studer/teamcity/buildscan/agent/BuildScanServiceMessageInjector.java index e0fc1f28..59e16ece 100644 --- a/agent/src/main/java/nu/studer/teamcity/buildscan/agent/BuildScanServiceMessageInjector.java +++ b/agent/src/main/java/nu/studer/teamcity/buildscan/agent/BuildScanServiceMessageInjector.java @@ -42,7 +42,7 @@ public class BuildScanServiceMessageInjector extends AgentLifeCycleAdapter { private static final String MAVEN_RUNNER = "Maven2"; private static final String MAVEN_CMD_PARAMS = "runnerArgs"; private static final String BUILD_SCAN_EXT_MAVEN = "service-message-maven-extension-1.0.jar"; - private static final String DEVELOCITY_EXT_MAVEN = "develocity-maven-extension-1.21.4.jar"; + private static final String DEVELOCITY_EXT_MAVEN = "develocity-maven-extension-1.22.1.jar"; private static final String COMMON_CUSTOM_USER_DATA_EXT_MAVEN = "common-custom-user-data-maven-extension-2.0.jar"; // TeamCity Command-line runner diff --git a/agent/src/test/groovy/nu/studer/teamcity/buildscan/agent/maven/BaseExtensionApplicationTest.groovy b/agent/src/test/groovy/nu/studer/teamcity/buildscan/agent/maven/BaseExtensionApplicationTest.groovy index 1b3d50bc..492ba505 100644 --- a/agent/src/test/groovy/nu/studer/teamcity/buildscan/agent/maven/BaseExtensionApplicationTest.groovy +++ b/agent/src/test/groovy/nu/studer/teamcity/buildscan/agent/maven/BaseExtensionApplicationTest.groovy @@ -38,7 +38,7 @@ abstract class BaseExtensionApplicationTest extends Specification { static final String DEVELOCITY_URL_STR = System.getenv('DEVELOCITY_TEST_INSTANCE') static final URI DEVELOCITY_URL = DEVELOCITY_URL_STR ? new URI(DEVELOCITY_URL_STR) : null - static final String DEVELOCITY_EXTENSION_VERSION = '1.21.4' + static final String DEVELOCITY_EXTENSION_VERSION = '1.22.1' static final String CCUD_EXTENSION_VERSION = '2.0' @TempDir diff --git a/src/main/resources/default-plugin-versions.properties b/src/main/resources/default-plugin-versions.properties index 929be15e..0c1da550 100644 --- a/src/main/resources/default-plugin-versions.properties +++ b/src/main/resources/default-plugin-versions.properties @@ -1,4 +1,4 @@ gradleEnterprisePluginVersion=3.17.4 commonCustomUserDataPluginVersion=2.0.1 -gradleEnterpriseExtensionVersion=1.21.4 +gradleEnterpriseExtensionVersion=1.22.1 commonCustomUserDataExtensionVersion=2.0 diff --git a/src/test/groovy/nu/studer/teamcity/buildscan/connection/DevelocityConnectionProviderTest.groovy b/src/test/groovy/nu/studer/teamcity/buildscan/connection/DevelocityConnectionProviderTest.groovy index 98c1d44c..938a3ea5 100644 --- a/src/test/groovy/nu/studer/teamcity/buildscan/connection/DevelocityConnectionProviderTest.groovy +++ b/src/test/groovy/nu/studer/teamcity/buildscan/connection/DevelocityConnectionProviderTest.groovy @@ -51,7 +51,7 @@ class DevelocityConnectionProviderTest extends Specification { ALLOW_UNTRUSTED_SERVER | 'true' | 'Allow Untrusted Server' DEVELOCITY_PLUGIN_VERSION | '3.17.4' | 'Develocity Gradle Plugin Version' CCUD_PLUGIN_VERSION | '2.0.1' | 'Common Custom User Data Gradle Plugin Version' - DEVELOCITY_EXTENSION_VERSION | '1.21.4' | 'Develocity Maven Extension Version' + DEVELOCITY_EXTENSION_VERSION | '1.22.1' | 'Develocity Maven Extension Version' CCUD_EXTENSION_VERSION | '2.0' | 'Common Custom User Data Maven Extension Version' CUSTOM_DEVELOCITY_EXTENSION_COORDINATES | 'com.company:my-ge-extension' | 'Develocity Maven Extension Custom Coordinates' CUSTOM_CCUD_EXTENSION_COORDINATES | 'com.company:my-ccud-extension' | 'Common Custom User Data Maven Extension Custom Coordinates'