From c35335ecfe6da8ea9a12f6189e52c6bd4829f36e Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Wed, 12 Jun 2024 20:30:58 +0200 Subject: [PATCH 1/3] Pre release tidy up Changes: * expel all versions from child modules: they must be all top level depMgmt or pluginMgmt * fix Javadoc errors * updates --- build-plugin/pom.xml | 32 -------- common/pom.xml | 3 +- .../mvnd/common/InterpolationHelper.java | 2 +- .../org/mvndaemon/mvnd/common/OsUtils.java | 2 +- daemon/pom.xml | 1 - integration-tests/pom.xml | 4 - logging/pom.xml | 2 - native/pom.xml | 5 -- pom.xml | 80 +++++++++++++++++-- 9 files changed, 78 insertions(+), 53 deletions(-) diff --git a/build-plugin/pom.xml b/build-plugin/pom.xml index c2133360a..62ba7f435 100644 --- a/build-plugin/pom.xml +++ b/build-plugin/pom.xml @@ -33,28 +33,8 @@ 11 11 - - 2.28.0.Final - 3.9.6 - 3.13.0 - - - - org.apache.maven - maven-plugin-api - ${maven.version} - - - org.apache.maven.plugin-tools - maven-plugin-annotations - ${maven.plugin-tools.version} - - - - - org.apache.maven @@ -70,22 +50,10 @@ org.jboss.forge.roaster roaster-jdt - ${roaster.version} - - - - - org.apache.maven.plugins - maven-plugin-plugin - ${maven.plugin-tools.version} - - - - org.apache.maven.plugins diff --git a/common/pom.xml b/common/pom.xml index be2244477..2193e4301 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -68,7 +68,6 @@ org.apache.maven.daemon mvnd-build-maven-plugin - ${project.version} @@ -101,6 +100,7 @@ + org.apache.maven.plugins maven-compiler-plugin @@ -145,6 +145,7 @@ + org.apache.maven.plugins maven-compiler-plugin diff --git a/common/src/main/java/org/mvndaemon/mvnd/common/InterpolationHelper.java b/common/src/main/java/org/mvndaemon/mvnd/common/InterpolationHelper.java index 138b0cbde..e8301a894 100644 --- a/common/src/main/java/org/mvndaemon/mvnd/common/InterpolationHelper.java +++ b/common/src/main/java/org/mvndaemon/mvnd/common/InterpolationHelper.java @@ -75,7 +75,7 @@ public static void performSubstitution( *

* This method performs property variable substitution on the * specified value. If the specified value contains the syntax - * ${<prop-name>}, where <prop-name> + * {@code ${prop-name}}, where {@code prop-name} * refers to either a configuration property or a system property, * then the corresponding property value is substituted for the variable * placeholder. Multiple variable placeholders may exist in the diff --git a/common/src/main/java/org/mvndaemon/mvnd/common/OsUtils.java b/common/src/main/java/org/mvndaemon/mvnd/common/OsUtils.java index 0c591d676..460b9aa9e 100644 --- a/common/src/main/java/org/mvndaemon/mvnd/common/OsUtils.java +++ b/common/src/main/java/org/mvndaemon/mvnd/common/OsUtils.java @@ -138,7 +138,7 @@ private static void exec(String[] cmd, final List output) { /** * A simple wrapper over {@link Process} that manages its destroying and offers Java 8-like - * {@link #waitFor(long, TimeUnit, String[])} with timeout. + * {@link #waitFor(long)} with timeout. */ public static class CommandProcess implements AutoCloseable { public static final int TIMEOUT_EXIT_CODE = Integer.MIN_VALUE + 42; diff --git a/daemon/pom.xml b/daemon/pom.xml index 3db9945cb..bfc6977ed 100644 --- a/daemon/pom.xml +++ b/daemon/pom.xml @@ -94,7 +94,6 @@ org.eclipse.sisu org.eclipse.sisu.inject - ${sisu.version} compile diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index 1e723f15b..623df468a 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -40,8 +40,6 @@ org/junit/platform/junit-platform-commons/${junit-platform-launcher.version} org/junit/jupiter/junit-jupiter/${junit.jupiter.version} org/junit/jupiter/junit-jupiter-api/${junit.jupiter.version} - - 1.19.8 @@ -85,13 +83,11 @@ org.testcontainers testcontainers - ${testcontainers.version} test org.testcontainers junit-jupiter - ${testcontainers.version} test diff --git a/logging/pom.xml b/logging/pom.xml index d2dff80a2..82fb62f59 100644 --- a/logging/pom.xml +++ b/logging/pom.xml @@ -64,7 +64,6 @@ org.apache.maven.plugins maven-dependency-plugin - 3.6.1 extract @@ -90,7 +89,6 @@ org.codehaus.mojo build-helper-maven-plugin - 3.6.0 add-unpacked-source-dir diff --git a/native/pom.xml b/native/pom.xml index 626c6f31b..d9371901d 100644 --- a/native/pom.xml +++ b/native/pom.xml @@ -28,10 +28,6 @@ jar Maven Daemon - Native Library - - 4.7.6 - - org.junit.jupiter @@ -46,7 +42,6 @@ info.picocli picocli-codegen - ${picocli.version} test diff --git a/pom.xml b/pom.xml index e743da7db..2338f06c5 100644 --- a/pom.xml +++ b/pom.xml @@ -75,8 +75,8 @@ 1.0.0 - 3.25.3 - 1.26.1 + 3.26.0 + 1.26.2 22.3.1 0.10.2 @@ -84,11 +84,11 @@ 1.0 2.4.1 3.26.1 - 3.9.7 + 3.9.8-20240612.175612-19 1.9.20 1.7.36 - 0.9.0.M2 + 0.9.0.M3 3.2.0 @@ -97,10 +97,14 @@ 1.3.2 1.0.25 + 4.7.6 + 2.28.0.Final + 3.13.1 3.30.2-GA 1.4.20 1.3 - 0.6.5 + 0.6.6 + 1.19.8 @@ -162,6 +166,11 @@ maven-embedder ${maven.version} + + org.apache.maven + maven-plugin-api + ${maven.version} + org.apache.maven apache-maven @@ -169,6 +178,11 @@ bin tar.gz + + org.apache.maven.plugin-tools + maven-plugin-annotations + ${maven.plugin-tools.version} + org.apache.maven.resolver @@ -278,6 +292,12 @@ ${jansi.version} + + info.picocli + picocli-codegen + ${picocli.version} + + org.slf4j log4j-over-slf4j @@ -294,6 +314,12 @@ ${slf4j.version} + + org.jboss.forge.roaster + roaster-jdt + ${roaster.version} + + org.javassist javassist @@ -316,12 +342,28 @@ takari-smart-builder ${takari-smart-builder.version} + + + org.testcontainers + testcontainers + ${testcontainers.version} + + + org.testcontainers + junit-jupiter + ${testcontainers.version} + + + org.apache.maven.daemon + mvnd-build-maven-plugin + ${project.version} + com.diffplug.spotless spotless-maven-plugin @@ -398,6 +440,26 @@ native-maven-plugin ${graalvm.plugin.version} + + + org.apache.maven.plugins + maven-dependency-plugin + 3.7.0 + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.7.0 + + 8 + false + + + + org.apache.maven.plugins + maven-plugin-plugin + ${maven.plugin-tools.version} + org.apache.maven.plugins maven-release-plugin @@ -415,7 +477,13 @@ org.apache.maven.plugins maven-wrapper-plugin - 3.3.1 + 3.3.2 + + + + org.codehaus.mojo + build-helper-maven-plugin + 3.6.0 org.codehaus.mojo From b9da8aea833a7595cb2523d9eec6a63765ce70f0 Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Wed, 12 Jun 2024 20:38:20 +0200 Subject: [PATCH 2/3] Maven Wrapper 3.3.2 --- .mvn/wrapper/maven-wrapper.properties | 5 +++-- mvnw | 17 +++++++++++++---- mvnw.cmd | 5 ++++- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index fe378a151..23c7e5999 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.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.7/apache-maven-3.9.7-bin.zip diff --git a/mvnw b/mvnw index ac8e247e1..19529ddf8 100755 --- a/mvnw +++ b/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 || : diff --git a/mvnw.cmd b/mvnw.cmd index 1ff8c9ddc..b150b91ed 100644 --- a/mvnw.cmd +++ b/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" From 6b235946194a074fcb68ddc16a071dd69c66654f Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Thu, 13 Jun 2024 09:19:42 +0200 Subject: [PATCH 3/3] Make sure 'two twins' and locked properly (even if plexus unused) --- pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pom.xml b/pom.xml index 2338f06c5..84fa611cb 100644 --- a/pom.xml +++ b/pom.xml @@ -275,6 +275,11 @@ org.eclipse.sisu.inject ${sisu.version} + + org.eclipse.sisu + org.eclipse.sisu.plexus + ${sisu.version} + org.jline