From df150c1a775551e6abd515ee3cf21d1534178df8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 3 Sep 2025 05:53:09 +0000 Subject: [PATCH 1/2] Bump the build-dependencies group with 6 updates Bumps the build-dependencies group with 6 updates: | Package | From | To | | --- | --- | --- | | [com.fasterxml.jackson.core:jackson-databind](https://github.com/FasterXML/jackson) | `2.19.2` | `2.20.0` | | [com.fasterxml.jackson.core:jackson-annotations](https://github.com/FasterXML/jackson) | `2.19.2` | `2.20` | | [com.puppycrawl.tools:checkstyle](https://github.com/checkstyle/checkstyle) | `11.0.0` | `11.0.1` | | [org.apache.maven.plugins:maven-wrapper-plugin](https://github.com/apache/maven-wrapper) | `3.3.2` | `3.3.3` | | [org.sonarsource.scanner.maven:sonar-maven-plugin](https://github.com/SonarSource/sonar-scanner-maven) | `5.1.0.4751` | `5.2.0.4988` | | [com.gradle:common-custom-user-data-maven-extension](https://github.com/gradle/common-custom-user-data-maven-extension) | `2.0.3` | `2.0.5` | Updates `com.fasterxml.jackson.core:jackson-databind` from 2.19.2 to 2.20.0 - [Commits](https://github.com/FasterXML/jackson/commits) Updates `com.fasterxml.jackson.core:jackson-annotations` from 2.19.2 to 2.20 - [Commits](https://github.com/FasterXML/jackson/commits) Updates `com.puppycrawl.tools:checkstyle` from 11.0.0 to 11.0.1 - [Release notes](https://github.com/checkstyle/checkstyle/releases) - [Commits](https://github.com/checkstyle/checkstyle/compare/checkstyle-11.0.0...checkstyle-11.0.1) Updates `org.apache.maven.plugins:maven-wrapper-plugin` from 3.3.2 to 3.3.3 - [Release notes](https://github.com/apache/maven-wrapper/releases) - [Commits](https://github.com/apache/maven-wrapper/compare/maven-wrapper-3.3.2...maven-wrapper-3.3.3) Updates `org.sonarsource.scanner.maven:sonar-maven-plugin` from 5.1.0.4751 to 5.2.0.4988 - [Release notes](https://github.com/SonarSource/sonar-scanner-maven/releases) - [Commits](https://github.com/SonarSource/sonar-scanner-maven/compare/5.1.0.4751...5.2.0.4988) Updates `com.gradle:common-custom-user-data-maven-extension` from 2.0.3 to 2.0.5 - [Release notes](https://github.com/gradle/common-custom-user-data-maven-extension/releases) - [Commits](https://github.com/gradle/common-custom-user-data-maven-extension/compare/v2.0.3...v2.0.5) --- updated-dependencies: - dependency-name: com.fasterxml.jackson.core:jackson-databind dependency-version: 2.20.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: build-dependencies - dependency-name: com.fasterxml.jackson.core:jackson-annotations dependency-version: '2.20' dependency-type: direct:production update-type: version-update:semver-minor dependency-group: build-dependencies - dependency-name: com.puppycrawl.tools:checkstyle dependency-version: 11.0.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: build-dependencies - dependency-name: org.apache.maven.plugins:maven-wrapper-plugin dependency-version: 3.3.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: build-dependencies - dependency-name: org.sonarsource.scanner.maven:sonar-maven-plugin dependency-version: 5.2.0.4988 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: build-dependencies - dependency-name: com.gradle:common-custom-user-data-maven-extension dependency-version: 2.0.5 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: build-dependencies ... Signed-off-by: dependabot[bot] --- .mvn/extensions.xml | 2 +- pom.xml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml index f5bcf6068..a351ee389 100644 --- a/.mvn/extensions.xml +++ b/.mvn/extensions.xml @@ -7,7 +7,7 @@ com.gradle common-custom-user-data-maven-extension - 2.0.3 + 2.0.5 org.hibernate.infra.develocity diff --git a/pom.xml b/pom.xml index d1c0248ac..2686dd4a5 100644 --- a/pom.xml +++ b/pom.xml @@ -201,8 +201,8 @@ 33.4.8-jre 6.2.10 4.0.0.Final - 2.19.2 - 2.19.2 + 2.20.0 + 2.20 1.17.7 @@ -219,7 +219,7 @@ overridden by a CI job of the Checkstyle project so that they can check for regressions. Which is obviously good for us, too. --> - 11.0.0 + 11.0.1 @@ -263,10 +263,10 @@ 1.3.0.Final 0.9.0.M4 2.18.0 - 3.3.2 + 3.3.3 2.46.1 0.8.13 - 5.1.0.4751 + 5.2.0.4988 1.0.2 From 31b93466fd43ad513a3c57138fb672a83193050f Mon Sep 17 00:00:00 2001 From: marko-bekhta Date: Wed, 3 Sep 2025 09:06:21 +0200 Subject: [PATCH 2/2] Regenerate the maven wrapper with the new plugin version Signed-off-by: marko-bekhta --- .mvn/wrapper/maven-wrapper.jar | Bin 63028 -> 63090 bytes .mvn/wrapper/maven-wrapper.properties | 20 ++--------------- mvnw | 30 +++++++++++++++----------- mvnw.cmd | 6 +++--- 4 files changed, 23 insertions(+), 33 deletions(-) diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar index 7967f30dd1d25fe1b79a4a6e50e2aaa0e425c02c..c4ffd252d5eb0fd89b7886915e2a44dccfefa8da 100644 GIT binary patch delta 5791 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

rnrrX}dG0!Yo`ZxM`Vkx(|^ z)~w?H_)s9|VhaP@x0Qf{S=`RWM)x#sa9#;W5KGB-8?MnLG9Gbwa`%GjtPp zKF5WXuN$w>SOE`aW;76p>>qgu zzsvatf6XZZ9L)a{(E<{N;KsMH0Obp~X-oFEM%078mcg$GflnSuEcxjI2Tr^V6yTP^ zV!s!JumKZX9}skAmIsOAK)^rV0~V1mZzT}p2O1X{aDpE|EJ7D6*sKc&tnd+Cx04+< z1h;%~aLbn>5arOvlCLcBV!dPUAi#8E11~Vt2#9r-SmLUs05Guxr#VTF|8wZwS<*js z0+|Sxeq;it+W~a;?`ob*w-aE$tc?ru#WE5$;Ea`C0gT;w0o5O;aG2c> zB+Snp#H4|eANVP60!&nM z_~}n1Og%xLPv%2_L%#vA*(7UN8v65e(auAd+FAV$A^?#5$@8x(;4Yc_JVX zJpxW`CRVU5lLIK*#5+p-g@n;Q!{Xn5;nLLnSs-*8baDiW5DF+f2Z@TnwRK!Z&61Sb z{Q!v}AW@sZ(}NdSV!{i$lP3xrx}rwGU=^5tJm6BECm{C&bQ@;a&@Z+2$u)t3tYDgH z5OC(ou!6Kzq(H|81D0(0cfoWgNInGTf-ubEN<5kQ-{;wQ6A2Tm1#uZ5dy^BFE3F`w zRFB2r7*QN{27`ocy#_I9ARL2#@}7WLOFxL60{+^f2bTW9k3igR6pxEwN9p%0zCRiq zr97AgIs_vq1Ric#;CxJMAz_cdV*AB?6+KCGY+r173eJuWxY?)@^o;^;ZR=w<9o*j3 WzKwvbPJypb6@Y06Ng6wS!u}6mf+1x9 delta 5924 zcmaJ_2RzjO|Gzuq?2)tXGD?z_Ei*2iy_1oZWJXq5$tfbM;$viQvd0l3kyJ#K$Sf

AG!O_C1ado|&ODBR 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/dev/null; then log "Found curl ... using curl" [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--silent" if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then - curl $QUIET -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" + curl ${QUIET:+"$QUIET"} -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" else - curl $QUIET --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" + curl ${QUIET:+"$QUIET"} --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" fi else log "Falling back to using Java to download" @@ -276,7 +282,7 @@ fi wrapperSha256Sum="" while IFS="=" read -r key value; do case "$key" in wrapperSha256Sum) - wrapperSha256Sum=$value + wrapperSha256Sum=$(trim "${value-}") break ;; esac @@ -284,7 +290,7 @@ done <"$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" if [ -n "$wrapperSha256Sum" ]; then wrapperSha256Result=false if command -v sha256sum >/dev/null; then - if echo "$wrapperSha256Sum $wrapperJarPath" | sha256sum -c >/dev/null 2>&1; then + if echo "$wrapperSha256Sum $wrapperJarPath" | sha256sum -c - >/dev/null 2>&1; then wrapperSha256Result=true fi elif command -v shasum >/dev/null; then diff --git a/mvnw.cmd b/mvnw.cmd index 4136715f0..768fac9b3 100644 --- a/mvnw.cmd +++ b/mvnw.cmd @@ -18,7 +18,7 @@ @REM ---------------------------------------------------------------------------- @REM ---------------------------------------------------------------------------- -@REM Apache Maven Wrapper startup batch script, version 3.3.2 +@REM Apache Maven Wrapper startup batch script, version 3.3.3 @REM @REM Required ENV vars: @REM JAVA_HOME - location of a JDK home dir @@ -119,7 +119,7 @@ SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain -set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar" +set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.3/maven-wrapper-3.3.3.jar" FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( IF "%%A"=="wrapperUrl" SET WRAPPER_URL=%%B @@ -133,7 +133,7 @@ if exist %WRAPPER_JAR% ( ) ) else ( if not "%MVNW_REPOURL%" == "" ( - SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar" + SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.3.3/maven-wrapper-3.3.3.jar" ) if "%MVNW_VERBOSE%" == "true" ( echo Couldn't find %WRAPPER_JAR%, downloading it ...