72 lines
2.6 KiB
Diff
72 lines
2.6 KiB
Diff
From 1d3eca7e7d7ba1a4a89b56519694eeee4ee91353 Mon Sep 17 00:00:00 2001
|
|
From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
|
Date: Fri, 20 Mar 2015 11:53:02 +0100
|
|
Subject: [PATCH] Port to Maven 3.3.1
|
|
|
|
---
|
|
pom.xml | 4 ++--
|
|
.../java/org/apache/maven/plugin/gpg/AscArtifactMetadata.java | 9 +++++++++
|
|
.../java/org/apache/maven/plugin/gpg/AttachedSignedArtifact.java | 6 ------
|
|
3 files changed, 11 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/pom.xml b/pom.xml
|
|
index f06d5fb..fea749f 100644
|
|
--- a/pom.xml
|
|
+++ b/pom.xml
|
|
@@ -57,7 +57,7 @@ under the License.
|
|
</distributionManagement>
|
|
|
|
<properties>
|
|
- <mavenVersion>2.2.1</mavenVersion>
|
|
+ <mavenVersion>3.3.1</mavenVersion>
|
|
</properties>
|
|
|
|
<dependencies>
|
|
@@ -68,7 +68,7 @@ under the License.
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.apache.maven</groupId>
|
|
- <artifactId>maven-project</artifactId>
|
|
+ <artifactId>maven-compat</artifactId>
|
|
<version>${mavenVersion}</version>
|
|
</dependency>
|
|
<dependency>
|
|
diff --git a/src/main/java/org/apache/maven/plugin/gpg/AscArtifactMetadata.java b/src/main/java/org/apache/maven/plugin/gpg/AscArtifactMetadata.java
|
|
index 00c62ee..acce010 100644
|
|
--- a/src/main/java/org/apache/maven/plugin/gpg/AscArtifactMetadata.java
|
|
+++ b/src/main/java/org/apache/maven/plugin/gpg/AscArtifactMetadata.java
|
|
@@ -90,6 +90,15 @@ public class AscArtifactMetadata
|
|
return getFilename();
|
|
}
|
|
|
|
+ public void merge( org.apache.maven.repository.legacy.metadata.ArtifactMetadata metadata )
|
|
+ {
|
|
+ AscArtifactMetadata m = (AscArtifactMetadata) metadata;
|
|
+ if ( !m.file.equals( file ) )
|
|
+ {
|
|
+ throw new IllegalStateException( "Cannot add two different pieces of metadata for: " + getKey() );
|
|
+ }
|
|
+ }
|
|
+
|
|
public void merge( ArtifactMetadata metadata )
|
|
{
|
|
AscArtifactMetadata m = (AscArtifactMetadata) metadata;
|
|
diff --git a/src/main/java/org/apache/maven/plugin/gpg/AttachedSignedArtifact.java b/src/main/java/org/apache/maven/plugin/gpg/AttachedSignedArtifact.java
|
|
index 3a4d431..f2fccda 100644
|
|
--- a/src/main/java/org/apache/maven/plugin/gpg/AttachedSignedArtifact.java
|
|
+++ b/src/main/java/org/apache/maven/plugin/gpg/AttachedSignedArtifact.java
|
|
@@ -308,10 +308,4 @@ public class AttachedSignedArtifact
|
|
{
|
|
return delegate.compareTo( o );
|
|
}
|
|
-
|
|
- public ArtifactMetadata getMetadata( Class<?> metadataClass )
|
|
- {
|
|
- // TODO Auto-generated method stub
|
|
- return delegate.getMetadata( metadataClass );
|
|
- }
|
|
}
|
|
--
|
|
2.1.0
|
|
|