apache/maven-mvnd
1
0
Fork 0
mirror of https://github.com/apache/maven-mvnd.git synced 2025-10-17 07:54:20 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[1.x] Maven 3.9.7 (#997)

Browse Source 
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
This commit is contained in:
Tamas Cservenak
2024-05-22 14:45:18 +02:00
committed by GitHub
parent a172d93f5b
commit e4c574bb48
9 changed files with 42 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.mvn/wrapper/maven-wrapper.properties vendored
View File

@@ -14,4 +14,5 @@
# KIND, either express or implied. See the License for the # KIND, either express or implied. See the License for the
# specific language governing permissions and limitations # specific language governing permissions and limitations
# under the License. # 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

2
build-plugin/pom.xml
View File

@@ -36,7 +36,7 @@
<roaster.version>2.28.0.Final</roaster.version> <roaster.version>2.28.0.Final</roaster.version>
<maven.version>3.9.6</maven.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> </properties>
<dependencyManagement> <dependencyManagement>

4
daemon/pom.xml
View File

@@ -62,10 +62,6 @@
<groupId>org.apache.maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-embedder</artifactId> <artifactId>maven-embedder</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-embedder</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-interactivity-api</artifactId> <artifactId>plexus-interactivity-api</artifactId>

1
daemon/src/main/java/org/apache/maven/cli/DaemonMavenCli.java
View File

@@ -1385,6 +1385,7 @@ public class DaemonMavenCli implements DaemonCli {
request.setCacheNotFound(true); request.setCacheNotFound(true);
request.setCacheTransferError(false); request.setCacheTransferError(false);
request.setIgnoreTransitiveRepositories(commandLine.hasOption(CLIManager.IGNORE_TRANSITIVE_REPOSITORIES));
// //
// Builder, concurrency and parallelism // Builder, concurrency and parallelism

13
integration-tests/src/test/projects/extension-with-api/plugin/pom.xml
View File

@@ -60,4 +60,17 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
</dependencies> </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> </project>

2
logging/pom.xml
View File

@@ -90,7 +90,7 @@
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId> <artifactId>build-helper-maven-plugin</artifactId>
<version>3.5.0</version> <version>3.6.0</version>
<executions> <executions>
<execution> <execution>
<id>add-unpacked-source-dir</id> <id>add-unpacked-source-dir</id>

4
mvnw vendored
View File

@@ -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 # Optional ENV vars
# ----------------- # -----------------
@@ -199,7 +199,7 @@ elif set_java_home; then
public static void main( String[] args ) throws Exception public static void main( String[] args ) throws Exception
{ {
setDefault( new Downloader() ); 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 END

2
mvnw.cmd vendored
View File

@@ -19,7 +19,7 @@
@REM ---------------------------------------------------------------------------- @REM ----------------------------------------------------------------------------
@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
@REM Optional ENV vars @REM Optional ENV vars
@REM MVNW_REPOURL - repo url base for downloading maven distribution @REM MVNW_REPOURL - repo url base for downloading maven distribution

27
pom.xml
View File

@@ -79,14 +79,14 @@
<commons-compress.version>1.26.1</commons-compress.version> <commons-compress.version>1.26.1</commons-compress.version>
<!-- cannot upgrade graalvm to 23.0.0 which requires JDK >= 20 --> <!-- cannot upgrade graalvm to 23.0.0 which requires JDK >= 20 -->
<graalvm.version>22.3.1</graalvm.version> <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> <groovy.version>4.0.21</groovy.version>
<jakarta.inject.version>1.0</jakarta.inject.version> <jakarta.inject.version>1.0</jakarta.inject.version>
<jansi.version>2.4.1</jansi.version> <jansi.version>2.4.1</jansi.version>
<jline.version>3.25.1</jline.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 --> <!-- 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> <slf4j.version>1.7.36</slf4j.version>
<sisu.version>0.9.0.M2</sisu.version> <sisu.version>0.9.0.M2</sisu.version>
@@ -95,7 +95,7 @@
<groovy-maven-plugin.version>3.0.2</groovy-maven-plugin.version> <groovy-maven-plugin.version>3.0.2</groovy-maven-plugin.version>
<mrm.version>1.6.0</mrm.version> <mrm.version>1.6.0</mrm.version>
<junit-platform-launcher.version>1.3.2</junit-platform-launcher.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> <javassist.version>3.29.2-GA</javassist.version>
<xstream.version>1.4.20</xstream.version> <xstream.version>1.4.20</xstream.version>
@@ -319,6 +319,21 @@
</dependencies> </dependencies>
</dependencyManagement> </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> <build>
<pluginManagement> <pluginManagement>
<plugins> <plugins>
@@ -415,12 +430,12 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-wrapper-plugin</artifactId> <artifactId>maven-wrapper-plugin</artifactId>
<version>3.3.0</version> <version>3.3.1</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId> <artifactId>exec-maven-plugin</artifactId>
<version>3.2.0</version> <version>3.3.0</version>
</plugin> </plugin>
</plugins> </plugins>
</pluginManagement> </pluginManagement>