From 745f631ba112c8e1abacaddb5e31d6b2d3ac1495 Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Wed, 22 May 2024 13:56:39 +0200 Subject: [PATCH 1/3] Fix the master build The build dependency update to beta-2 --- .mvn/wrapper/maven-wrapper.properties | 3 ++- logging/pom.xml | 3 +-- mvnw | 4 ++-- mvnw.cmd | 2 +- pom.xml | 27 +++++++++++++++++++++------ 5 files changed, 27 insertions(+), 12 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/logging/pom.xml b/logging/pom.xml index aa9bb186b..ad76eed16 100644 --- a/logging/pom.xml +++ b/logging/pom.xml @@ -73,7 +73,6 @@ org.apache.maven.plugins maven-dependency-plugin - 3.6.1 extract @@ -98,7 +97,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.5.0 + 3.6.0 add-unpacked-source-dir 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 0c3119537..d8af62c10 100644 --- a/pom.xml +++ b/pom.xml @@ -80,12 +80,12 @@ 1.26.1 22.3.1 - 0.10.1 + 0.10.2 4.0.21 1.0 2.4.1 3.26.1 - 4.0.0-beta-1-SNAPSHOT + 4.0.0-beta-2 2.0.0-alpha-11 2.0.11 @@ -96,7 +96,7 @@ 3.0.2 1.6.0 1.3.2 - 1.0.24 + 1.0.25 3.29.2-GA 1.4.20 @@ -336,6 +336,21 @@ + + + + true + never + fail + + + false + + maven-2117 + https://repository.apache.org/content/repositories/maven-2117/ + + + @@ -433,12 +448,12 @@ org.apache.maven.plugins maven-wrapper-plugin - 3.3.0 + 3.3.1 org.codehaus.mojo exec-maven-plugin - 3.2.0 + 3.3.0 @@ -466,7 +481,7 @@ - 3.5.4 + 3.6.3 [17,) From d873253b7388a375987ba312826a770d21de41e3 Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Wed, 22 May 2024 13:58:47 +0200 Subject: [PATCH 2/3] Implement upstream `-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 b8e461f19..ba9e40607 100644 --- a/daemon/src/main/java/org/apache/maven/cli/DaemonMavenCli.java +++ b/daemon/src/main/java/org/apache/maven/cli/DaemonMavenCli.java @@ -1141,6 +1141,7 @@ private void populateRequest( request.setMakeBehavior(determineMakeBehavior(commandLine)); request.setCacheNotFound(true); request.setCacheTransferError(false); + request.setIgnoreTransitiveRepositories(commandLine.hasOption(CLIManager.IGNORE_TRANSITIVE_REPOSITORIES)); performProjectActivation(commandLine, request.getProjectActivation()); performProfileActivation(commandLine, request.getProfileActivation()); From 0aee6741a94b1aca93aa4f2c74c7da243b5f6cfb Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Wed, 22 May 2024 14:07:14 +0200 Subject: [PATCH 3/3] Backport `-sadp` as well --- .../main/java/org/apache/maven/cli/DaemonMavenCli.java | 9 +++++++++ 1 file changed, 9 insertions(+) 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 ba9e40607..6129c961d 100644 --- a/daemon/src/main/java/org/apache/maven/cli/DaemonMavenCli.java +++ b/daemon/src/main/java/org/apache/maven/cli/DaemonMavenCli.java @@ -1141,6 +1141,15 @@ private void populateRequest( request.setMakeBehavior(determineMakeBehavior(commandLine)); request.setCacheNotFound(true); request.setCacheTransferError(false); + boolean strictArtifactDescriptorPolicy = commandLine.hasOption(CLIManager.STRICT_ARTIFACT_DESCRIPTOR_POLICY) + && Boolean.parseBoolean(commandLine.getOptionValue(CLIManager.STRICT_ARTIFACT_DESCRIPTOR_POLICY)); + if (strictArtifactDescriptorPolicy) { + request.setIgnoreMissingArtifactDescriptor(false); + request.setIgnoreInvalidArtifactDescriptor(false); + } else { + request.setIgnoreMissingArtifactDescriptor(true); + request.setIgnoreInvalidArtifactDescriptor(true); + } request.setIgnoreTransitiveRepositories(commandLine.hasOption(CLIManager.IGNORE_TRANSITIVE_REPOSITORIES)); performProjectActivation(commandLine, request.getProjectActivation());