From 158ffb962ab4ccac27ec6357859ca82379c910a7 Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Wed, 22 May 2024 12:42:49 +0200 Subject: [PATCH 1/4] Maven 3.9.7 Plus some improvements, plugin updates and cleanups. --- build-plugin/pom.xml | 2 +- daemon/pom.xml | 4 ---- logging/pom.xml | 2 +- pom.xml | 27 +++++++++++++++++++++------ 4 files changed, 23 insertions(+), 12 deletions(-) diff --git a/build-plugin/pom.xml b/build-plugin/pom.xml index 6ad3dd464..c2133360a 100644 --- a/build-plugin/pom.xml +++ b/build-plugin/pom.xml @@ -36,7 +36,7 @@ 2.28.0.Final 3.9.6 - 3.12.0 + 3.13.0 diff --git a/daemon/pom.xml b/daemon/pom.xml index 4f7a890cc..3db9945cb 100644 --- a/daemon/pom.xml +++ b/daemon/pom.xml @@ -62,10 +62,6 @@ org.apache.maven maven-embedder - - org.apache.maven - maven-embedder - org.codehaus.plexus plexus-interactivity-api diff --git a/logging/pom.xml b/logging/pom.xml index de2b82e6c..d2dff80a2 100644 --- a/logging/pom.xml +++ b/logging/pom.xml @@ -90,7 +90,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.5.0 + 3.6.0 add-unpacked-source-dir diff --git a/pom.xml b/pom.xml index eb29b2945..9860e53b8 100644 --- a/pom.xml +++ b/pom.xml @@ -79,14 +79,14 @@ 1.26.1 22.3.1 - 0.10.1 + 0.10.2 4.0.21 1.0 2.4.1 3.25.1 - 3.9.6 + 3.9.7 - 1.9.18 + 1.9.20 1.7.36 0.9.0.M2 @@ -95,7 +95,7 @@ 3.0.2 1.6.0 1.3.2 - 1.0.24 + 1.0.25 3.29.2-GA 1.4.20 @@ -319,6 +319,21 @@ + + + + true + never + fail + + + false + + maven-2125 + https://repository.apache.org/content/repositories/maven-2125/ + + + @@ -415,12 +430,12 @@ org.apache.maven.plugins maven-wrapper-plugin - 3.3.0 + 3.3.2 org.codehaus.mojo exec-maven-plugin - 3.2.0 + 3.3.0 From 8e2ca040acded8672420252b0e30587b73e22663 Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Wed, 22 May 2024 12:46:28 +0200 Subject: [PATCH 2/4] Oops, wrapper 3.3.2 is still on vote --- .mvn/wrapper/maven-wrapper.properties | 3 ++- mvnw | 4 ++-- mvnw.cmd | 2 +- pom.xml | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index f82630602..fe378a151 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -14,4 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.8/apache-maven-3.8.8-bin.zip +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 diff --git a/mvnw b/mvnw index 08303327c..ac8e247e1 100755 --- a/mvnw +++ b/mvnw @@ -19,7 +19,7 @@ # ---------------------------------------------------------------------------- # ---------------------------------------------------------------------------- -# Apache Maven Wrapper startup batch script, version 3.3.0 +# Apache Maven Wrapper startup batch script, version 3.3.1 # # Optional ENV vars # ----------------- @@ -199,7 +199,7 @@ elif set_java_home; then public static void main( String[] args ) throws Exception { setDefault( new Downloader() ); - java.nio.file.Files.copy( new java.net.URL( args[0] ).openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() ); + java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() ); } } END diff --git a/mvnw.cmd b/mvnw.cmd index 33cbf988c..1ff8c9ddc 100644 --- a/mvnw.cmd +++ b/mvnw.cmd @@ -19,7 +19,7 @@ @REM ---------------------------------------------------------------------------- @REM ---------------------------------------------------------------------------- -@REM Apache Maven Wrapper startup batch script, version 3.3.0 +@REM Apache Maven Wrapper startup batch script, version 3.3.1 @REM @REM Optional ENV vars @REM MVNW_REPOURL - repo url base for downloading maven distribution diff --git a/pom.xml b/pom.xml index 9860e53b8..1210d8b2b 100644 --- a/pom.xml +++ b/pom.xml @@ -430,7 +430,7 @@ org.apache.maven.plugins maven-wrapper-plugin - 3.3.2 + 3.3.1 org.codehaus.mojo From 5f77769cebdb9757fd48b37245e7f6b52301d0ff Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Wed, 22 May 2024 13:06:37 +0200 Subject: [PATCH 3/4] Specify plugin version and goalPrefix --- .../test/projects/extension-with-api/plugin/pom.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/integration-tests/src/test/projects/extension-with-api/plugin/pom.xml b/integration-tests/src/test/projects/extension-with-api/plugin/pom.xml index 0b702ef12..be6b846fa 100644 --- a/integration-tests/src/test/projects/extension-with-api/plugin/pom.xml +++ b/integration-tests/src/test/projects/extension-with-api/plugin/pom.xml @@ -60,4 +60,17 @@ provided + + + + + org.apache.maven.plugins + maven-plugin-plugin + 3.13.0 + + extension-with-api + + + + \ No newline at end of file From 591eb14211f7da84887b6be41927c796ca06de62 Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Wed, 22 May 2024 13:34:00 +0200 Subject: [PATCH 4/4] Implement CLI `-itr` option --- daemon/src/main/java/org/apache/maven/cli/DaemonMavenCli.java | 1 + 1 file changed, 1 insertion(+) diff --git a/daemon/src/main/java/org/apache/maven/cli/DaemonMavenCli.java b/daemon/src/main/java/org/apache/maven/cli/DaemonMavenCli.java index 142e1fa8c..3d14afaf2 100644 --- a/daemon/src/main/java/org/apache/maven/cli/DaemonMavenCli.java +++ b/daemon/src/main/java/org/apache/maven/cli/DaemonMavenCli.java @@ -1385,6 +1385,7 @@ private static void populateRequest( request.setCacheNotFound(true); request.setCacheTransferError(false); + request.setIgnoreTransitiveRepositories(commandLine.hasOption(CLIManager.IGNORE_TRANSITIVE_REPOSITORIES)); // // Builder, concurrency and parallelism