This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a commit to branch mvnd-1.x
in repository https://gitbox.apache.org/repos/asf/maven-mvnd.git
The following commit(s) were added to refs/heads/mvnd-1.x by this push:
new e4c574bb [1.x] Maven 3.9.7 (#997)
e4c574bb is described below
commit e4c574bb48ef7e5768be12b059033ad0e4bf0722
Author: Tamas Cservenak <[email protected]>
AuthorDate: Wed May 22 14:45:18 2024 +0200
[1.x] Maven 3.9.7 (#997)
Plus some improvements, plugin updates and cleanups.
Changes:
* Maven 3.9.7 (staged, on vote)
* Maven Wrapper 3.3.1 + script updates
* maven-plugin-tools 3.13.0
* remove duplicate entry for maven-embedder (daemon)
* buildhelper-maven-plugin 3.6.0
* graalvm plugin 0.10.2
* provisio 1.0.25
* exec-maven-plugin 3.3.0
* backport `-itr` (Maven CLI)
Fixes #934
---
.mvn/wrapper/maven-wrapper.properties | 3 ++-
build-plugin/pom.xml | 2 +-
daemon/pom.xml | 4 ----
.../java/org/apache/maven/cli/DaemonMavenCli.java | 1 +
.../projects/extension-with-api/plugin/pom.xml | 13 +++++++++++
logging/pom.xml | 2 +-
mvnw | 4 ++--
mvnw.cmd | 2 +-
pom.xml | 27 +++++++++++++++++-----
9 files changed, 42 insertions(+), 16 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/build-plugin/pom.xml b/build-plugin/pom.xml
index 6ad3dd46..c2133360 100644
--- a/build-plugin/pom.xml
+++ b/build-plugin/pom.xml
@@ -36,7 +36,7 @@
<roaster.version>2.28.0.Final</roaster.version>
<maven.version>3.9.6</maven.version>
- <maven.plugin-tools.version>3.12.0</maven.plugin-tools.version>
+ <maven.plugin-tools.version>3.13.0</maven.plugin-tools.version>
</properties>
<dependencyManagement>
diff --git a/daemon/pom.xml b/daemon/pom.xml
index 4f7a890c..3db9945c 100644
--- a/daemon/pom.xml
+++ b/daemon/pom.xml
@@ -62,10 +62,6 @@
<groupId>org.apache.maven</groupId>
<artifactId>maven-embedder</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-embedder</artifactId>
- </dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-interactivity-api</artifactId>
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 142e1fa8..3d14afaf 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 @@ public class DaemonMavenCli implements DaemonCli {
request.setCacheNotFound(true);
request.setCacheTransferError(false);
+
request.setIgnoreTransitiveRepositories(commandLine.hasOption(CLIManager.IGNORE_TRANSITIVE_REPOSITORIES));
//
// Builder, concurrency and parallelism
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 0b702ef1..be6b846f 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 @@
<scope>provided</scope>
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <version>3.13.0</version>
+ <configuration>
+ <goalPrefix>extension-with-api</goalPrefix>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
\ No newline at end of file
diff --git a/logging/pom.xml b/logging/pom.xml
index de2b82e6..d2dff80a 100644
--- a/logging/pom.xml
+++ b/logging/pom.xml
@@ -90,7 +90,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 eb29b294..1210d8b2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,14 +79,14 @@
<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.25.1</jline.version>
- <maven.version>3.9.6</maven.version>
+ <maven.version>3.9.7</maven.version>
<!-- Keep in sync with Maven -->
- <maven.resolver.version>1.9.18</maven.resolver.version>
+ <maven.resolver.version>1.9.20</maven.resolver.version>
<slf4j.version>1.7.36</slf4j.version>
<sisu.version>0.9.0.M2</sisu.version>
@@ -95,7 +95,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>
@@ -319,6 +319,21 @@
</dependencies>
</dependencyManagement>
+ <repositories>
+ <repository>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ <checksumPolicy>fail</checksumPolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <id>maven-2125</id>
+ <url>https://repository.apache.org/content/repositories/maven-2125/</url>
+ </repository>
+ </repositories>
+
<build>
<pluginManagement>
<plugins>
@@ -415,12 +430,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>
