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

Author: bigdaz

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.23.2                                      | 2.0                                          |
+| Next                         | 1.23.2                                      | 2.0.1                                        |
 | 0.35                         | 1.18.1                                      | 1.12.2                                       |
 | 0.34                         | 1.18                                        | 1.12.2                                       |
 | 0.33                         | 1.16.1                                      | 1.11.1                                       |

agent/service-message-maven-extension/.mvn/wrapper/maven-wrapper.properties

@@ -14,5 +14,6 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-wrapperVersion=3.3.1
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip
+wrapperVersion=3.3.2
+distributionType=only-script
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip

agent/service-message-maven-extension/mvnw

@@ -19,7 +19,7 @@
 # ----------------------------------------------------------------------------
 
 # ----------------------------------------------------------------------------
-# Apache Maven Wrapper startup batch script, version 3.3.1
+# Apache Maven Wrapper startup batch script, version 3.3.2
 #
 # Optional ENV vars
 # -----------------
@@ -97,11 +97,19 @@ die() {
   exit 1
 }
 
+trim() {
+  # MWRAPPER-139:
+  #   Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds.
+  #   Needed for removing poorly interpreted newline sequences when running in more
+  #   exotic environments such as mingw bash on Windows.
+  printf "%s" "${1}" | tr -d '[:space:]'
+}
+
 # parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties
 while IFS="=" read -r key value; do
   case "${key-}" in
-  distributionUrl) distributionUrl="${value-}" ;;
-  distributionSha256Sum) distributionSha256Sum="${value-}" ;;
+  distributionUrl) distributionUrl=$(trim "${value-}") ;;
+  distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;;
   esac
 done <"${0%/*}/.mvn/wrapper/maven-wrapper.properties"
 [ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in ${0%/*}/.mvn/wrapper/maven-wrapper.properties"
@@ -131,7 +139,8 @@ esac
 distributionUrlName="${distributionUrl##*/}"
 distributionUrlNameMain="${distributionUrlName%.*}"
 distributionUrlNameMain="${distributionUrlNameMain%-bin}"
-MAVEN_HOME="$HOME/.m2/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")"
+MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}"
+MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")"
 
 exec_maven() {
   unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || :

agent/service-message-maven-extension/mvnw.cmd

@@ -19,7 +19,7 @@
 @REM ----------------------------------------------------------------------------
 
 @REM ----------------------------------------------------------------------------
-@REM Apache Maven Wrapper startup batch script, version 3.3.1
+@REM Apache Maven Wrapper startup batch script, version 3.3.2
 @REM
 @REM Optional ENV vars
 @REM   MVNW_REPOURL - repo url base for downloading maven distribution
@@ -79,6 +79,9 @@ if ($env:MVNW_REPOURL) {
 $distributionUrlName = $distributionUrl -replace '^.*/',''
 $distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$',''
 $MAVEN_HOME_PARENT = "$HOME/.m2/wrapper/dists/$distributionUrlNameMain"
+if ($env:MAVEN_USER_HOME) {
+  $MAVEN_HOME_PARENT = "$env:MAVEN_USER_HOME/wrapper/dists/$distributionUrlNameMain"
+}
 $MAVEN_HOME_NAME = ([System.Security.Cryptography.MD5]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join ''
 $MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME"
 

agent/src/main/java/nu/studer/teamcity/buildscan/agent/BuildScanServiceMessageInjector.java

@@ -43,7 +43,7 @@ public class BuildScanServiceMessageInjector extends AgentLifeCycleAdapter {
     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.23.2.jar";
-    private static final String COMMON_CUSTOM_USER_DATA_EXT_MAVEN = "common-custom-user-data-maven-extension-2.0.jar";
+    private static final String COMMON_CUSTOM_USER_DATA_EXT_MAVEN = "common-custom-user-data-maven-extension-2.0.1.jar";
 
     // TeamCity Command-line runner
 

agent/src/test/groovy/nu/studer/teamcity/buildscan/agent/maven/BaseExtensionApplicationTest.groovy

@@ -39,7 +39,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.23.2'
-    static final String CCUD_EXTENSION_VERSION = '2.0'
+    static final String CCUD_EXTENSION_VERSION = '2.0.1'
 
     @TempDir
     File checkoutDir

src/test/groovy/nu/studer/teamcity/buildscan/connection/DevelocityConnectionProviderTest.groovy

@@ -52,7 +52,7 @@ class DevelocityConnectionProviderTest extends Specification {
         DEVELOCITY_PLUGIN_VERSION               | '3.17.4'                        | 'Develocity Gradle Plugin Version'
         CCUD_PLUGIN_VERSION                     | '2.2.1'                         | 'Common Custom User Data Gradle Plugin Version'
         DEVELOCITY_EXTENSION_VERSION            | '1.23.2'                        | 'Develocity Maven Extension Version'
-        CCUD_EXTENSION_VERSION                  | '2.0'                           | 'Common Custom User Data Maven Extension Version'
+        CCUD_EXTENSION_VERSION                  | '2.0.1'                         | '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'
         INSTRUMENT_COMMAND_LINE_BUILD_STEP      | 'true'                          | 'Instrument Command Line Build Steps'