From 962723fcf3b70c67e85b69920dceaf6d6b87fc66 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: May 31 2016 08:27:14 +0000 Subject: import rh-maven33-maven-gpg-plugin-1.4-11.13.el7 --- diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..1dfe76b --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/maven-gpg-plugin-1.4-source-release.zip diff --git a/.rh-maven33-maven-gpg-plugin.metadata b/.rh-maven33-maven-gpg-plugin.metadata new file mode 100644 index 0000000..dddd1bc --- /dev/null +++ b/.rh-maven33-maven-gpg-plugin.metadata @@ -0,0 +1 @@ +cd82f68a6cb299ce7ff6440c5a4be8c640c1a4e3 SOURCES/maven-gpg-plugin-1.4-source-release.zip diff --git a/README.md b/README.md deleted file mode 100644 index 98f42b4..0000000 --- a/README.md +++ /dev/null @@ -1,4 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/0001-Add-support-for-maven-3.patch b/SOURCES/0001-Add-support-for-maven-3.patch new file mode 100644 index 0000000..823430e --- /dev/null +++ b/SOURCES/0001-Add-support-for-maven-3.patch @@ -0,0 +1,63 @@ +From 900d254a483b8d751456afc444f9e67d85d03c0c Mon Sep 17 00:00:00 2001 +From: Stanislav Ochotnicky +Date: Wed, 20 Jul 2011 14:57:00 +0200 +Subject: [PATCH] Add support for maven 3 + +--- + pom.xml | 5 +++++ + .../maven/plugin/gpg/AscArtifactMetadata.java | 9 +++++++++ + .../maven/plugin/gpg/AttachedSignedArtifact.java | 2 +- + 3 files changed, 15 insertions(+), 1 deletions(-) + +diff --git a/pom.xml b/pom.xml +index d68cf39..d2f97b9 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -57,6 +57,11 @@ under the License. + + + org.apache.maven ++ maven-compat ++ ${mavenVersion} ++ ++ ++ org.apache.maven + maven-plugin-api + ${mavenVersion} + +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 +--- 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 ) + { +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 +--- 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 ) + { + return delegate.compareTo( o ); + } +-- +1.7.6 + diff --git a/SPECS/maven-gpg-plugin.spec b/SPECS/maven-gpg-plugin.spec new file mode 100644 index 0000000..ecc05a1 --- /dev/null +++ b/SPECS/maven-gpg-plugin.spec @@ -0,0 +1,163 @@ +%global pkg_name maven-gpg-plugin +%{?scl:%scl_package %{pkg_name}} +%{?maven_find_provides_and_requires} + +Name: %{?scl_prefix}%{pkg_name} +Version: 1.4 +Release: 11.13%{?dist} +Summary: Maven GPG Plugin + +License: ASL 2.0 +URL: http://maven.apache.org/plugins/maven-gpg-plugin/ +Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%{pkg_name}/%{version}/%{pkg_name}-%{version}-source-release.zip +Patch0: 0001-Add-support-for-maven-3.patch + +BuildArch: noarch + +BuildRequires: %{?scl_prefix}plexus-utils +BuildRequires: %{?scl_prefix_java_common}ant +BuildRequires: %{?scl_prefix}maven-local +BuildRequires: %{?scl_prefix}maven-install-plugin +BuildRequires: %{?scl_prefix}maven-compiler-plugin +BuildRequires: %{?scl_prefix}maven-plugin-plugin +BuildRequires: %{?scl_prefix}maven-resources-plugin +BuildRequires: %{?scl_prefix}maven-surefire-plugin +BuildRequires: %{?scl_prefix}maven-jar-plugin +BuildRequires: %{?scl_prefix}maven-javadoc-plugin + +# Uses system gpg binary for actual signing +Requires: gnupg + + +%description +This plugin signs all of the project's attached artifacts with +GnuPG. It adds goals gpg:sign and gpg:sign-and-deploy-file. + + +%package javadoc +Summary: Javadoc for %{pkg_name} + +%description javadoc +API documentation for %{pkg_name}. + +%prep +%setup -q -n %{pkg_name}-%{version} +%{?scl:scl enable %{scl} - <<"EOF"} +set -e -x + +# migrate to maven 3.x +%patch0 -p1 +sed -i 's/${mavenVersion}/3.0.4/' pom.xml +%{?scl:EOF} + +%build +%{?scl:scl enable %{scl} - <<"EOF"} +set -e -x +%mvn_build +%{?scl:EOF} + +%install +%{?scl:scl enable %{scl} - <<"EOF"} +set -e -x +%mvn_install +%{?scl:EOF} + +%files -f .mfiles +%dir %{_mavenpomdir}/%{pkg_name} +%dir %{_javadir}/%{pkg_name} +%doc LICENSE NOTICE + +%files javadoc -f .mfiles-javadoc +%doc LICENSE NOTICE + +%changelog +* Mon Feb 08 2016 Michal Srb - 1.4-11.13 +- Fix BR on maven-local & co. + +* Mon Jan 11 2016 Michal Srb - 1.4-11.12 +- maven33 rebuild #2 + +* Sat Jan 09 2016 Michal Srb - 1.4-11.11 +- maven33 rebuild + +* Thu Jan 15 2015 Mikolaj Izdebski - 1.4-11.10 +- Add directory ownership on %%{_mavenpomdir} subdir + +* Tue Jan 13 2015 Michael Simacek - 1.4-11.9 +- Mass rebuild 2015-01-13 + +* Tue Jan 06 2015 Michael Simacek - 1.4-11.8 +- Mass rebuild 2015-01-06 + +* Mon May 26 2014 Mikolaj Izdebski - 1.4-11.7 +- Mass rebuild 2014-05-26 + +* Wed Feb 19 2014 Mikolaj Izdebski - 1.4-11.6 +- Mass rebuild 2014-02-19 + +* Tue Feb 18 2014 Mikolaj Izdebski - 1.4-11.5 +- Mass rebuild 2014-02-18 + +* Tue Feb 18 2014 Mikolaj Izdebski - 1.4-11.4 +- Rebuild to fix incorrect auto-requires + +* Fri Feb 14 2014 Mikolaj Izdebski - 1.4-11.3 +- SCL-ize requires and build-requires + +* Thu Feb 13 2014 Mikolaj Izdebski - 1.4-11.2 +- Rebuild to regenerate auto-requires + +* Tue Feb 11 2014 Mikolaj Izdebski - 1.4-11.1 +- First maven30 software collection build + +* Fri Dec 27 2013 Daniel Mach - 1.4-11 +- Mass rebuild 2013-12-27 + +* Wed Jul 17 2013 Tomas Radej - 1.4-10 +- Added R on gnupg (used for actual singing) + +* Fri Jun 28 2013 Mikolaj Izdebski - 1.4-9 +- Rebuild to regenerate API documentation +- Resolves: CVE-2013-1571 + +* Tue Jun 25 2013 Tomas Radej - 1.4-8 +- Removed BR on ant-nodeps (no longer available) + +* Tue Feb 12 2013 Mikolaj Izdebski - 1.4-7 +- Use default packaging layout + +* Tue Feb 12 2013 Michal Srb - 1.4-6 +- Build with xmvn + +* Wed Feb 06 2013 Java SIG - 1.4-5 +- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild +- Replace maven BuildRequires with maven-local + +* Mon Nov 26 2012 Stanislav Ochotnicky - 1.4-4 +- Install LICENSE and NOTICE files (#879367) + +* Thu Jul 19 2012 Fedora Release Engineering - 1.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Fri Jan 13 2012 Fedora Release Engineering - 1.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Sep 6 2011 Alexander Kurtakov 1.4-1 +- Update to latest upstream version. + +* Mon Jun 13 2011 Stanislav Ochotnicky - 1.3-1 +- Update to latest upstream version + +* Fri Mar 25 2011 Alexander Kurtakov 1.2-1 +- Update to new upstream release. +- Adapt to current guidelines. + +* Tue Feb 08 2011 Fedora Release Engineering - 1.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Wed Jun 2 2010 Stanislav Ochotnicky - 1.1-2 +- Fix depmap call +- Add gnupg2 to Requires + +* Tue Jun 1 2010 Stanislav Ochotnicky - 1.1-1 +- Initial package