You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2022/07/17 13:25:49 UTC
[maven-gpg-plugin] branch MGPG-83 created (now 3b8bcea)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch MGPG-83
in repository https://gitbox.apache.org/repos/asf/maven-gpg-plugin.git
at 3b8bcea [MGPG-83] Require Maven 3.2.5+
This branch includes the following new commits:
new 3b8bcea [MGPG-83] Require Maven 3.2.5+
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven-gpg-plugin] 01/01: [MGPG-83] Require Maven 3.2.5+
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MGPG-83
in repository https://gitbox.apache.org/repos/asf/maven-gpg-plugin.git
commit 3b8bcea948c0f5fbb3fe9d848d535c4788b38c2b
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sun Jul 17 15:25:39 2022 +0200
[MGPG-83] Require Maven 3.2.5+
---
pom.xml | 4 ++--
.../java/org/apache/maven/plugins/gpg/SignAndDeployFileMojo.java | 9 ++++-----
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index c5db1da..9a6db6f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,7 +62,7 @@ under the License.
</distributionManagement>
<properties>
- <mavenVersion>3.0</mavenVersion>
+ <mavenVersion>3.2.5</mavenVersion>
<javaVersion>7</javaVersion>
<project.build.outputTimestamp>2021-05-05T16:39:01Z</project.build.outputTimestamp>
<resource.delimiter>@</resource.delimiter>
@@ -107,7 +107,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-artifact-transfer</artifactId>
- <version>0.12.0</version>
+ <version>0.13.1</version>
</dependency>
<dependency>
<!-- org.eclipse.aether.util.artifact.SubArtifact -->
diff --git a/src/main/java/org/apache/maven/plugins/gpg/SignAndDeployFileMojo.java b/src/main/java/org/apache/maven/plugins/gpg/SignAndDeployFileMojo.java
index b7bc314..872bf80 100644
--- a/src/main/java/org/apache/maven/plugins/gpg/SignAndDeployFileMojo.java
+++ b/src/main/java/org/apache/maven/plugins/gpg/SignAndDeployFileMojo.java
@@ -36,14 +36,13 @@ import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
import org.apache.maven.artifact.repository.MavenArtifactRepository;
import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
import org.apache.maven.execution.MavenSession;
-import org.apache.maven.model.InputLocation;
import org.apache.maven.model.Model;
import org.apache.maven.model.Parent;
import org.apache.maven.model.building.DefaultModelBuildingRequest;
import org.apache.maven.model.building.ModelBuildingRequest;
import org.apache.maven.model.building.ModelProblem;
-import org.apache.maven.model.building.ModelProblem.Severity;
import org.apache.maven.model.building.ModelProblemCollector;
+import org.apache.maven.model.building.ModelProblemCollectorRequest;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
import org.apache.maven.model.validation.ModelValidator;
@@ -692,11 +691,11 @@ public class SignAndDeployFileMojo
this.result = result;
}
- public void add( Severity severity, String message, InputLocation location, Exception cause )
+ public void add( ModelProblemCollectorRequest req )
{
- if ( !ModelProblem.Severity.WARNING.equals( severity ) )
+ if ( !ModelProblem.Severity.WARNING.equals( req.getSeverity() ) )
{
- result.add( message );
+ result.add( req.getMessage() );
}
}