You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by gn...@apache.org on 2024/12/05 13:37:16 UTC
(maven-jar-plugin) branch master updated: [MJAR-321] Upgrade to Maven 4.0.0-beta-5 (#103)
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-jar-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new 11e7412 [MJAR-321] Upgrade to Maven 4.0.0-beta-5 (#103)
11e7412 is described below
commit 11e74126c9c714e7757cdbf1593e92c2397fafa7
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Thu Dec 5 14:37:10 2024 +0100
[MJAR-321] Upgrade to Maven 4.0.0-beta-5 (#103)
---
.github/workflows/maven-verify.yml | 4 ++--
pom.xml | 8 ++++----
src/it/MJAR-260-invalid-automatic-module-name/verify.bsh | 2 +-
.../java/org/apache/maven/plugins/jar/AbstractJarMojo.java | 12 ++++++------
4 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/.github/workflows/maven-verify.yml b/.github/workflows/maven-verify.yml
index 56062b5..96bece9 100644
--- a/.github/workflows/maven-verify.yml
+++ b/.github/workflows/maven-verify.yml
@@ -26,6 +26,6 @@ jobs:
name: Verify
uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v4
with:
- ff-maven: "4.0.0-beta-3" # Maven version for fail-fast-build
- maven-matrix: '[ "4.0.0-beta-3" ]'
+ ff-maven: "4.0.0-beta-5" # Maven version for fail-fast-build
+ maven-matrix: '[ "4.0.0-beta-5", "4.0.0-rc-1" ]'
jdk-matrix: '[ "17", "21" ]'
diff --git a/pom.xml b/pom.xml
index b5c73fc..928392e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,14 +74,14 @@
<properties>
<javaVersion>17</javaVersion>
- <mavenVersion>4.0.0-beta-3</mavenVersion>
+ <mavenVersion>4.0.0-beta-5</mavenVersion>
<guiceVersion>6.0.0</guiceVersion>
<junitVersion>5.10.2</junitVersion>
- <mavenArchiverVersion>4.0.0-beta-1</mavenArchiverVersion>
+ <mavenArchiverVersion>4.0.0-beta-3</mavenArchiverVersion>
<mavenFileManagementVersion>3.1.0</mavenFileManagementVersion>
<mavenPluginPluginVersion>4.0.0-beta-1</mavenPluginPluginVersion>
- <mavenPluginTestingVersion>4.0.0-beta-1</mavenPluginTestingVersion>
+ <mavenPluginTestingVersion>4.0.0-beta-2</mavenPluginTestingVersion>
<plexusArchiverVersion>4.10.0</plexusArchiverVersion>
<version.maven-plugin-tools>${mavenPluginPluginVersion}</version.maven-plugin-tools>
@@ -137,7 +137,7 @@
<version>${mavenFileManagementVersion}</version>
</dependency>
<dependency>
- <groupId>org.apache.maven</groupId>
+ <groupId>org.apache.maven.shared</groupId>
<artifactId>maven-archiver</artifactId>
<version>${mavenArchiverVersion}</version>
</dependency>
diff --git a/src/it/MJAR-260-invalid-automatic-module-name/verify.bsh b/src/it/MJAR-260-invalid-automatic-module-name/verify.bsh
index 3253895..5b9d457 100644
--- a/src/it/MJAR-260-invalid-automatic-module-name/verify.bsh
+++ b/src/it/MJAR-260-invalid-automatic-module-name/verify.bsh
@@ -45,7 +45,7 @@ try
String[] snippets = new String[] {
"[INFO] BUILD FAILURE",
"[ERROR] Failed to execute goal org.apache.maven.plugins:maven-jar-plugin",
- "Caused by: org.apache.maven.plugin.MojoExecutionException: Error assembling JAR",
+ "Caused by: org.apache.maven.api.plugin.MojoException: Error assembling JAR",
"Caused by: org.codehaus.plexus.archiver.jar.ManifestException: Invalid automatic module name: 'in-valid.name.with.new.keyword'"
};
diff --git a/src/main/java/org/apache/maven/plugins/jar/AbstractJarMojo.java b/src/main/java/org/apache/maven/plugins/jar/AbstractJarMojo.java
index dc1cd10..53b908a 100644
--- a/src/main/java/org/apache/maven/plugins/jar/AbstractJarMojo.java
+++ b/src/main/java/org/apache/maven/plugins/jar/AbstractJarMojo.java
@@ -26,7 +26,7 @@ import java.util.Arrays;
import java.util.Map;
import java.util.stream.Stream;
-import org.apache.maven.api.Artifact;
+import org.apache.maven.api.ProducedArtifact;
import org.apache.maven.api.Project;
import org.apache.maven.api.Session;
import org.apache.maven.api.di.Inject;
@@ -34,9 +34,9 @@ import org.apache.maven.api.plugin.Log;
import org.apache.maven.api.plugin.MojoException;
import org.apache.maven.api.plugin.annotations.Parameter;
import org.apache.maven.api.services.ProjectManager;
-import org.apache.maven.archiver.MavenArchiveConfiguration;
-import org.apache.maven.archiver.MavenArchiver;
-import org.apache.maven.archiver.MavenArchiverException;
+import org.apache.maven.shared.archiver.MavenArchiveConfiguration;
+import org.apache.maven.shared.archiver.MavenArchiver;
+import org.apache.maven.shared.archiver.MavenArchiverException;
import org.apache.maven.shared.model.fileset.FileSet;
import org.apache.maven.shared.model.fileset.util.FileSetManager;
import org.codehaus.plexus.archiver.Archiver;
@@ -305,9 +305,9 @@ public abstract class AbstractJarMojo implements org.apache.maven.api.plugin.Moj
getLog().info("Skipping packaging of the " + getType());
} else {
Path jarFile = createArchive();
- Artifact artifact;
+ ProducedArtifact artifact;
if (hasClassifier()) {
- artifact = session.createArtifact(
+ artifact = session.createProducedArtifact(
project.getGroupId(),
project.getArtifactId(),
project.getVersion(),