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 2022/01/28 22:14:44 UTC
[maven-gpg-plugin] branch mvn4 created (now 2af2d7b)
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a change to branch mvn4
in repository https://gitbox.apache.org/repos/asf/maven-gpg-plugin.git.
at 2af2d7b mvn4 aggregator
This branch includes the following new commits:
new 2af2d7b mvn4 aggregator
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: mvn4 aggregator
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch mvn4
in repository https://gitbox.apache.org/repos/asf/maven-gpg-plugin.git
commit 2af2d7bf8df4171ba78edca0b01675dd5fcf6cd0
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Jan 28 23:14:42 2022 +0100
mvn4 aggregator
---
pom.xml | 10 +++++-----
.../org/apache/maven/plugins/gpg/SignAndDeployFileMojo.java | 10 +++++-----
.../java/org/apache/maven/plugins/gpg/it/InvokerTestUtils.java | 2 +-
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/pom.xml b/pom.xml
index c5db1da..9f4a5ff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,8 +62,8 @@ under the License.
</distributionManagement>
<properties>
- <mavenVersion>3.0</mavenVersion>
- <javaVersion>7</javaVersion>
+ <mavenVersion>4.0.0-alpha-1-SNAPSHOT</mavenVersion>
+ <javaVersion>8</javaVersion>
<project.build.outputTimestamp>2021-05-05T16:39:01Z</project.build.outputTimestamp>
<resource.delimiter>@</resource.delimiter>
</properties>
@@ -107,13 +107,13 @@ under the License.
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-artifact-transfer</artifactId>
- <version>0.12.0</version>
+ <version>2.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<!-- org.eclipse.aether.util.artifact.SubArtifact -->
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-util</artifactId>
- <version>1.4.1</version>
+ <version>1.8.0-SNAPSHOT</version>
<optional>true</optional>
</dependency>
<dependency>
@@ -149,7 +149,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-invoker</artifactId>
- <version>3.1.0</version>
+ <version>3.2.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
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..3b76bb8 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,12 @@ public class SignAndDeployFileMojo
this.result = result;
}
- public void add( Severity severity, String message, InputLocation location, Exception cause )
+ @Override
+ 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() );
}
}
diff --git a/src/test/java/org/apache/maven/plugins/gpg/it/InvokerTestUtils.java b/src/test/java/org/apache/maven/plugins/gpg/it/InvokerTestUtils.java
index 3dd041d..70e3741 100644
--- a/src/test/java/org/apache/maven/plugins/gpg/it/InvokerTestUtils.java
+++ b/src/test/java/org/apache/maven/plugins/gpg/it/InvokerTestUtils.java
@@ -73,7 +73,7 @@ public class InvokerTestUtils
final InvocationResult result;
final File buildLog = new File( request.getBaseDirectory( request.getPomFile().getParentFile() ), "build.log" );
- try ( final PrintStream buildLogStream = new PrintStream( buildLog ) )
+ try ( PrintStream buildLogStream = new PrintStream( buildLog ) )
{
final InvocationOutputHandler buildLogOutputHandler = new PrintStreamHandler( buildLogStream, false );
final InvokerLogger logger = new PrintStreamLogger( buildLogStream, InvokerLogger.DEBUG );