This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-mvnd.git
The following commit(s) were added to refs/heads/master by this push:
new b6e46908 Maven 4 beta-2 (#998)
b6e46908 is described below
commit b6e469089bd6f69fc2d6102ea956eed7818e93a6
Author: Tamas Cservenak <[email protected]>
AuthorDate: Wed May 22 14:45:33 2024 +0200
Maven 4 beta-2 (#998)
And fix the build w/ smaller cleanups, plugin updates and backport of
`-itr`, `-sadp`.
Changes:
* Maven 4 beta-2 (staged, on vote)
* Maven Wrapper 3.3.1 + script updates
* maven-plugin-tools 3.13.0
* buildhelper-maven-plugin 3.6.0
* graalvm plugin 0.10.2
* provisio 1.0.25
* exec-maven-plugin 3.3.0
* backport `-itr` and `-sadp` (Maven CLI)
---
.mvn/wrapper/maven-wrapper.properties | 3 ++-
.../java/org/apache/maven/cli/DaemonMavenCli.java | 10 ++++++++
logging/pom.xml | 3 +--
mvnw | 4 ++--
mvnw.cmd | 2 +-
pom.xml | 27 +++++++++++++++++-----
6 files changed, 37 insertions(+), 12 deletions(-)
diff --git a/.mvn/wrapper/maven-wrapper.properties
b/.mvn/wrapper/maven-wrapper.properties
index f8263060..fe378a15 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/daemon/src/main/java/org/apache/maven/cli/DaemonMavenCli.java
b/daemon/src/main/java/org/apache/maven/cli/DaemonMavenCli.java
index b8e461f1..6129c961 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,16 @@ public class DaemonMavenCli implements DaemonCli {
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());
performProfileActivation(commandLine, request.getProfileActivation());
diff --git a/logging/pom.xml b/logging/pom.xml
index aa9bb186..ad76eed1 100644
--- a/logging/pom.xml
+++ b/logging/pom.xml
@@ -73,7 +73,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>3.6.1</version>
<executions>
<execution>
<id>extract</id>
@@ -98,7 +97,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>3.5.0</version>
+ <version>3.6.0</version>
<executions>
<execution>
<id>add-unpacked-source-dir</id>
diff --git a/mvnw b/mvnw
index 08303327..ac8e247e 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 33cbf988..1ff8c9dd 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 0c311953..d8af62c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -80,12 +80,12 @@
<commons-compress.version>1.26.1</commons-compress.version>
<!-- cannot upgrade graalvm to 23.0.0 which requires JDK >= 20 -->
<graalvm.version>22.3.1</graalvm.version>
- <graalvm.plugin.version>0.10.1</graalvm.plugin.version>
+ <graalvm.plugin.version>0.10.2</graalvm.plugin.version>
<groovy.version>4.0.21</groovy.version>
<jakarta.inject.version>1.0</jakarta.inject.version>
<jansi.version>2.4.1</jansi.version>
<jline.version>3.26.1</jline.version>
- <maven.version>4.0.0-beta-1-SNAPSHOT</maven.version>
+ <maven.version>4.0.0-beta-2</maven.version>
<!-- Keep in sync with Maven -->
<maven.resolver.version>2.0.0-alpha-11</maven.resolver.version>
<slf4j.version>2.0.11</slf4j.version>
@@ -96,7 +96,7 @@
<groovy-maven-plugin.version>3.0.2</groovy-maven-plugin.version>
<mrm.version>1.6.0</mrm.version>
<junit-platform-launcher.version>1.3.2</junit-platform-launcher.version>
- <takari-provisio.version>1.0.24</takari-provisio.version>
+ <takari-provisio.version>1.0.25</takari-provisio.version>
<javassist.version>3.29.2-GA</javassist.version>
<xstream.version>1.4.20</xstream.version>
@@ -336,6 +336,21 @@
</dependencies>
</dependencyManagement>
+ <repositories>
+ <repository>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ <checksumPolicy>fail</checksumPolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <id>maven-2117</id>
+ <url>https://repository.apache.org/content/repositories/maven-2117/</url>
+ </repository>
+ </repositories>
+
<build>
<pluginManagement>
<plugins>
@@ -433,12 +448,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-wrapper-plugin</artifactId>
- <version>3.3.0</version>
+ <version>3.3.1</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <version>3.2.0</version>
+ <version>3.3.0</version>
</plugin>
</plugins>
</pluginManagement>
@@ -466,7 +481,7 @@
<configuration>
<rules>
<requireMavenVersion>
- <version>3.5.4</version>
+ <version>3.6.3</version>
</requireMavenVersion>
<requireJavaVersion>
<version>[17,)</version>
