[maven-gpg-plugin] Update to upstream version 1.6
Mikolaj Izdebski
mizdebsk at fedoraproject.org
Fri Mar 20 10:54:38 UTC 2015
commit 756a727cefcd60312f1f20c27e5cdc8f77f2bf68
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Fri Mar 20 11:36:46 2015 +0100
Update to upstream version 1.6
...maven-3.patch => 0001-Port-to-Maven-3.3.1.patch | 100 +++++++++++----------
maven-gpg-plugin.spec | 10 ++-
sources | 2 +-
3 files changed, 61 insertions(+), 51 deletions(-)
---
diff --git a/0001-Add-support-for-maven-3.patch b/0001-Port-to-Maven-3.3.1.patch
similarity index 52%
rename from 0001-Add-support-for-maven-3.patch
rename to 0001-Port-to-Maven-3.3.1.patch
index 823430e..b69502c 100644
--- a/0001-Add-support-for-maven-3.patch
+++ b/0001-Port-to-Maven-3.3.1.patch
@@ -1,63 +1,71 @@
-From 900d254a483b8d751456afc444f9e67d85d03c0c Mon Sep 17 00:00:00 2001
-From: Stanislav Ochotnicky <sochotnicky at redhat.com>
-Date: Wed, 20 Jul 2011 14:57:00 +0200
-Subject: [PATCH] Add support for maven 3
+From 1d3eca7e7d7ba1a4a89b56519694eeee4ee91353 Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk at redhat.com>
+Date: Fri, 20 Mar 2015 11:53:02 +0100
+Subject: [PATCH] Port to Maven 3.3.1
---
- pom.xml | 5 +++++
- .../maven/plugin/gpg/AscArtifactMetadata.java | 9 +++++++++
- .../maven/plugin/gpg/AttachedSignedArtifact.java | 2 +-
- 3 files changed, 15 insertions(+), 1 deletions(-)
+ 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 d68cf39..d2f97b9 100644
+index f06d5fb..fea749f 100644
--- a/pom.xml
+++ b/pom.xml
-@@ -57,6 +57,11 @@ under the License.
- <dependencies>
- <dependency>
- <groupId>org.apache.maven</groupId>
-+ <artifactId>maven-compat</artifactId>
-+ <version>${mavenVersion}</version>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
- <version>${mavenVersion}</version>
- </dependency>
+@@ -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 b348c87..98bb5d8 100644
+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
-@@ -85,6 +85,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 )
- {
+@@ -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 a4baf8e..cc8e508 100644
+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
-@@ -192,7 +192,7 @@ public class AttachedSignedArtifact
- return delegate.equals( o );
- }
-
-- public int compareTo( Object o )
-+ public int compareTo( Artifact o )
+@@ -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 );
+- }
+ }
--
-1.7.6
+2.1.0
diff --git a/maven-gpg-plugin.spec b/maven-gpg-plugin.spec
index ffa8c96..a49b4ef 100644
--- a/maven-gpg-plugin.spec
+++ b/maven-gpg-plugin.spec
@@ -1,6 +1,6 @@
Name: maven-gpg-plugin
-Version: 1.5
-Release: 4%{?dist}
+Version: 1.6
+Release: 1%{?dist}
Summary: Maven GPG Plugin
License: ASL 2.0
URL: http://maven.apache.org/plugins/maven-gpg-plugin/
@@ -8,7 +8,7 @@ BuildArch: noarch
Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip
-Patch0: 0001-Add-support-for-maven-3.patch
+Patch0: 0001-Port-to-Maven-3.3.1.patch
BuildRequires: plexus-utils
BuildRequires: ant
@@ -33,7 +33,6 @@ API documentation for %{name}.
# migrate to maven 3.x
%patch0 -p1
-sed -i 's/${mavenVersion}/3.0.4/' pom.xml
%build
%mvn_build
@@ -49,6 +48,9 @@ sed -i 's/${mavenVersion}/3.0.4/' pom.xml
%doc LICENSE NOTICE
%changelog
+* Fri Mar 20 2015 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.6-1
+- Update to upstream version 1.6
+
* Tue Oct 14 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.5-4
- Update to current packaging guidelines
diff --git a/sources b/sources
index 0816e8e..46c30fe 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4b5b43f939dc62ecaabcd631f74648f5 maven-gpg-plugin-1.5-source-release.zip
+12952fb022bcdb88b53a0fae68cc6597 maven-gpg-plugin-1.6-source-release.zip
More information about the scm-commits
mailing list