|
 |
0f684f |
From 900d254a483b8d751456afc444f9e67d85d03c0c Mon Sep 17 00:00:00 2001
|
|
|
0f684f |
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
|
|
|
0f684f |
Date: Wed, 20 Jul 2011 14:57:00 +0200
|
|
|
0f684f |
Subject: [PATCH] Add support for maven 3
|
|
|
0f684f |
|
|
|
0f684f |
---
|
|
|
0f684f |
pom.xml | 5 +++++
|
|
|
0f684f |
.../maven/plugin/gpg/AscArtifactMetadata.java | 9 +++++++++
|
|
|
0f684f |
.../maven/plugin/gpg/AttachedSignedArtifact.java | 2 +-
|
|
|
0f684f |
3 files changed, 15 insertions(+), 1 deletions(-)
|
|
|
0f684f |
|
|
|
0f684f |
diff --git a/pom.xml b/pom.xml
|
|
|
0f684f |
index d68cf39..d2f97b9 100644
|
|
|
0f684f |
--- a/pom.xml
|
|
|
0f684f |
+++ b/pom.xml
|
|
|
0f684f |
@@ -57,6 +57,11 @@ under the License.
|
|
|
0f684f |
<dependencies>
|
|
|
0f684f |
<dependency>
|
|
|
0f684f |
<groupId>org.apache.maven</groupId>
|
|
|
0f684f |
+ <artifactId>maven-compat</artifactId>
|
|
|
0f684f |
+ <version>${mavenVersion}</version>
|
|
|
0f684f |
+ </dependency>
|
|
|
0f684f |
+ <dependency>
|
|
|
0f684f |
+ <groupId>org.apache.maven</groupId>
|
|
|
0f684f |
<artifactId>maven-plugin-api</artifactId>
|
|
|
0f684f |
<version>${mavenVersion}</version>
|
|
|
0f684f |
</dependency>
|
|
|
0f684f |
diff --git a/src/main/java/org/apache/maven/plugin/gpg/AscArtifactMetadata.java b/src/main/java/org/apache/maven/plugin/gpg/AscArtifactMetadata.java
|
|
|
0f684f |
index b348c87..98bb5d8 100644
|
|
|
0f684f |
--- a/src/main/java/org/apache/maven/plugin/gpg/AscArtifactMetadata.java
|
|
|
0f684f |
+++ b/src/main/java/org/apache/maven/plugin/gpg/AscArtifactMetadata.java
|
|
|
0f684f |
@@ -85,6 +85,15 @@ public class AscArtifactMetadata
|
|
|
0f684f |
{
|
|
|
0f684f |
return getFilename();
|
|
|
0f684f |
}
|
|
|
0f684f |
+ public void merge( org.apache.maven.repository.legacy.metadata.ArtifactMetadata metadata )
|
|
|
0f684f |
+ {
|
|
|
0f684f |
+ AscArtifactMetadata m = (AscArtifactMetadata) metadata;
|
|
|
0f684f |
+ if ( !m.file.equals( file ) )
|
|
|
0f684f |
+ {
|
|
|
0f684f |
+ throw new IllegalStateException( "Cannot add two different pieces of metadata for: " + getKey() );
|
|
|
0f684f |
+ }
|
|
|
0f684f |
+ }
|
|
|
0f684f |
+
|
|
|
0f684f |
|
|
|
0f684f |
public void merge( ArtifactMetadata metadata )
|
|
|
0f684f |
{
|
|
|
0f684f |
diff --git a/src/main/java/org/apache/maven/plugin/gpg/AttachedSignedArtifact.java b/src/main/java/org/apache/maven/plugin/gpg/AttachedSignedArtifact.java
|
|
|
0f684f |
index a4baf8e..cc8e508 100644
|
|
|
0f684f |
--- a/src/main/java/org/apache/maven/plugin/gpg/AttachedSignedArtifact.java
|
|
|
0f684f |
+++ b/src/main/java/org/apache/maven/plugin/gpg/AttachedSignedArtifact.java
|
|
|
0f684f |
@@ -192,7 +192,7 @@ public class AttachedSignedArtifact
|
|
|
0f684f |
return delegate.equals( o );
|
|
|
0f684f |
}
|
|
|
0f684f |
|
|
|
0f684f |
- public int compareTo( Object o )
|
|
|
0f684f |
+ public int compareTo( Artifact o )
|
|
|
0f684f |
{
|
|
|
0f684f |
return delegate.compareTo( o );
|
|
|
0f684f |
}
|
|
|
0f684f |
--
|
|
|
0f684f |
1.7.6
|
|
|
0f684f |
|