From 1cc18dbd92e35e1ba2ad9f29f54b08cc7685bf0c Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: May 31 2016 09:03:09 +0000 Subject: import rh-maven33-maven-dependency-plugin-2.7-3.14.el7 --- diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..df59697 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/maven-dependency-plugin-2.7-source-release.zip diff --git a/.rh-maven33-maven-dependency-plugin.metadata b/.rh-maven33-maven-dependency-plugin.metadata new file mode 100644 index 0000000..3f8bdea --- /dev/null +++ b/.rh-maven33-maven-dependency-plugin.metadata @@ -0,0 +1 @@ +0a8a3b03b4a39e41db5454f9b011dc664b727cf7 SOURCES/maven-dependency-plugin-2.7-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-setThreshold-stub.patch b/SOURCES/0001-Add-setThreshold-stub.patch new file mode 100644 index 0000000..3b04c33 --- /dev/null +++ b/SOURCES/0001-Add-setThreshold-stub.patch @@ -0,0 +1,33 @@ +From 052c1cafc64c7fa4a15e9a8f2dedfa9d5cdbf19a Mon Sep 17 00:00:00 2001 +From: Stanislav Ochotnicky +Date: Mon, 25 Jul 2011 14:44:11 +0200 +Subject: [PATCH] Add setThreshold stub + +This is needed for proper working with our maven3-only stack +--- + .../dependency/utils/DependencySilentLog.java | 11 +++++++++++ + 1 files changed, 11 insertions(+), 0 deletions(-) + +diff --git a/src/main/java/org/apache/maven/plugin/dependency/utils/DependencySilentLog.java b/src/main/java/org/apache/maven/plugin/dependency/utils/DependencySilentLog.java +index e8cba42..3b45f5e 100644 +--- a/src/main/java/org/apache/maven/plugin/dependency/utils/DependencySilentLog.java ++++ b/src/main/java/org/apache/maven/plugin/dependency/utils/DependencySilentLog.java +@@ -324,4 +324,15 @@ public class DependencySilentLog + { + return null; + } ++ ++ /** ++ * By default, do nothing. ++ * ++ * @see org.codehaus.plexus.logging.Logger#setThreshold(int) ++ */ ++ public void setThreshold(int level) ++ { ++ // nop ++ } ++ + } +-- +1.7.6 + diff --git a/SOURCES/maven-dependency-plugin-commons-io.patch b/SOURCES/maven-dependency-plugin-commons-io.patch new file mode 100644 index 0000000..232bb9f --- /dev/null +++ b/SOURCES/maven-dependency-plugin-commons-io.patch @@ -0,0 +1,17 @@ +diff --git a/pom.xml b/pom.xml +index c3d92dc..bd58801 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -206,6 +206,12 @@ under the License. + + + ++ org.apache.commons ++ commons-io ++ 3.2.1 ++ ++ ++ + commons-collections + commons-collections + 3.2.1 diff --git a/SOURCES/maven-dependency-plugin-core.patch b/SOURCES/maven-dependency-plugin-core.patch new file mode 100644 index 0000000..42f0b77 --- /dev/null +++ b/SOURCES/maven-dependency-plugin-core.patch @@ -0,0 +1,16 @@ +diff --git a/pom.xml b/pom.xml +index bd58801..1a3f62f 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -92,6 +92,11 @@ under the License. + + + org.apache.maven ++ maven-core ++ ${mavenVersion} ++ ++ ++ org.apache.maven + maven-artifact + ${mavenVersion} + diff --git a/SOURCES/maven-dependency-plugin-removed-exception-catching.patch b/SOURCES/maven-dependency-plugin-removed-exception-catching.patch new file mode 100644 index 0000000..e18d67c --- /dev/null +++ b/SOURCES/maven-dependency-plugin-removed-exception-catching.patch @@ -0,0 +1,27 @@ +From a9316856e6c53eba9f444c85dfdfeff6d0f0f5b7 Mon Sep 17 00:00:00 2001 +From: Michal Srb +Date: Fri, 15 Mar 2013 13:53:16 +0100 +Subject: [PATCH] removed exception catching + +--- + .../apache/maven/plugin/dependency/resolvers/ResolvePluginsMojo.java | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolvePluginsMojo.java b/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolvePluginsMojo.java +index bc509dd..476f520 100644 +--- a/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolvePluginsMojo.java ++++ b/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolvePluginsMojo.java +@@ -143,10 +143,6 @@ public class ResolvePluginsMojo + { + throw new MojoExecutionException( "Nested:", e ); + } +- catch ( final InvalidDependencyVersionException e ) +- { +- throw new MojoExecutionException( "Nested:", e ); +- } + catch ( final ArtifactFilterException e ) + { + throw new MojoExecutionException( "Nested:", e ); +-- +1.8.1.4 + diff --git a/SPECS/maven-dependency-plugin.spec b/SPECS/maven-dependency-plugin.spec new file mode 100644 index 0000000..c9650a1 --- /dev/null +++ b/SPECS/maven-dependency-plugin.spec @@ -0,0 +1,196 @@ +%global pkg_name maven-dependency-plugin +%{?scl:%scl_package %{pkg_name}} +%{?maven_find_provides_and_requires} + +Name: %{?scl_prefix}%{pkg_name} +Version: 2.7 +Release: 3.14%{?dist} +Summary: Plugin to manipulate, copy and unpack local and remote artifacts + +License: ASL 2.0 +URL: http://maven.apache.org/plugins/%{pkg_name} +Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%{pkg_name}/%{version}/%{pkg_name}-%{version}-source-release.zip +Patch0: 0001-Add-setThreshold-stub.patch +# Added apache-commons-io dep +Patch1: %{pkg_name}-commons-io.patch +# Added maven-core dep +Patch2: %{pkg_name}-core.patch +# Removed exception catching as it has already been done +# (not upstreamable) +Patch4: %{pkg_name}-removed-exception-catching.patch + +BuildArch: noarch + +BuildRequires: %{?scl_prefix}plexus-utils +BuildRequires: %{?scl_prefix_java_common}ant +BuildRequires: %{?scl_prefix_java_common}apache-commons-io +BuildRequires: %{?scl_prefix}maven-local +BuildRequires: %{?scl_prefix}maven-install-plugin +BuildRequires: %{?scl_prefix}maven-compiler-plugin +BuildRequires: %{?scl_prefix}maven-dependency-tree +BuildRequires: %{?scl_prefix}maven-plugin-plugin +BuildRequires: %{?scl_prefix}maven-plugin-annotations +BuildRequires: %{?scl_prefix}maven-resources-plugin +BuildRequires: %{?scl_prefix}maven-surefire-plugin +BuildRequires: %{?scl_prefix}maven-surefire-provider-junit +BuildRequires: %{?scl_prefix}maven-jar-plugin +BuildRequires: %{?scl_prefix}maven-javadoc-plugin +BuildRequires: %{?scl_prefix}maven-dependency-analyzer +BuildRequires: %{?scl_prefix}maven-common-artifact-filters +BuildRequires: %{?scl_prefix}maven-file-management +BuildRequires: %{?scl_prefix}maven-project +BuildRequires: %{?scl_prefix}maven-artifact-manager +BuildRequires: %{?scl_prefix}maven-plugin-testing-tools + + +%description + +The dependency plugin provides the capability to manipulate +artifacts. It can copy and/or unpack artifacts from local or remote +repositories to a specified location. + +%package javadoc +Summary: API documentation for %{pkg_name} + +%description javadoc +%{summary}. + + +%prep +%setup -q -n %{pkg_name}-%{version} +%{?scl:scl enable %{scl} - <<"EOF"} +set -e -x + +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch4 -p1 + +sed -i \ + 's:org.codehaus.classworlds.ClassRealm:org.codehaus.plexus.classworlds.realm.ClassRealm:' \ + src/test/java/org/apache/maven/plugin/dependency/its/AbstractDependencyPluginITCase.java +%{?scl:EOF} + + +%build +%{?scl:scl enable %{scl} - <<"EOF"} +set -e -x +# Tests fail to compile because they use unsupported legacy API. +%mvn_build -f +%{?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 - 2.7-3.14 +- Fix BR on maven-local & co. + +* Mon Jan 11 2016 Michal Srb - 2.7-3.13 +- maven33 rebuild #2 + +* Sat Jan 09 2016 Michal Srb - 2.7-3.12 +- maven33 rebuild + +* Thu Jan 15 2015 Mikolaj Izdebski - 2.7-3.11 +- Add directory ownership on %%{_mavenpomdir} subdir + +* Tue Jan 13 2015 Michael Simacek - 2.7-3.10 +- Mass rebuild 2015-01-13 + +* Mon Jan 12 2015 Michael Simacek - 2.7-3.9 +- Rebuild to regenerate requires from java-common + +* Tue Jan 06 2015 Michael Simacek - 2.7-3.8 +- Mass rebuild 2015-01-06 + +* Mon May 26 2014 Mikolaj Izdebski - 2.7-3.7 +- Mass rebuild 2014-05-26 + +* Wed Feb 19 2014 Mikolaj Izdebski - 2.7-3.6 +- Mass rebuild 2014-02-19 + +* Tue Feb 18 2014 Mikolaj Izdebski - 2.7-3.5 +- Mass rebuild 2014-02-18 + +* Tue Feb 18 2014 Mikolaj Izdebski - 2.7-3.4 +- Rebuild to fix incorrect auto-requires + +* Fri Feb 14 2014 Mikolaj Izdebski - 2.7-3.3 +- SCL-ize requires and build-requires + +* Thu Feb 13 2014 Mikolaj Izdebski - 2.7-3.2 +- Rebuild to regenerate auto-requires + +* Tue Feb 11 2014 Mikolaj Izdebski - 2.7-3.1 +- First maven30 software collection build + +* Fri Dec 27 2013 Daniel Mach - 2.7-3 +- Mass rebuild 2013-12-27 + +* Fri Jun 28 2013 Mikolaj Izdebski - 2.7-2 +- Rebuild to regenerate API documentation +- Resolves: CVE-2013-1571 + +* Fri Mar 15 2013 Michal Srb - 2.7-1 +- Update to upstream version 2.7 + +* Thu Feb 14 2013 Fedora Release Engineering - 2.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Jan 23 2013 Mikolaj Izdebski - 2.6-1 +- Update to upstream version 2.6 +- Build with xmvn +- Install license files + +* Tue Jan 22 2013 Mikolaj Izdebski - 2.5.1-2 +- Remove unneeded BR: asm2 + +* Tue Aug 28 2012 Mikolaj Izdebski - 2.5.1-1 +- Update to upstream version 2.5.1 + +* Thu Jul 19 2012 Fedora Release Engineering - 2.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Tue Feb 21 2012 Tomas Radej - 2.4-1 +- Updated to the upstream version +- Partially removed a test because of a legacy class use +- Removed exception checking as it has already been done + +* Fri Jan 13 2012 Alexander Kurtakov 2.3-3 +- Add missing BR. + +* Fri Jan 13 2012 Fedora Release Engineering - 2.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Mon Jul 11 2011 Stanislav Ochotnicky - 2.3-1 +- Update to latest upstream + +* Tue Jun 28 2011 Alexander Kurtakov 2.2-2 +- BR/R maven-shared-file-management. + +* Tue Apr 26 2011 Alexander Kurtakov 2.2-1 +- Update to 2.2 final release. + +* Tue Feb 08 2011 Fedora Release Engineering - 2.2-0.4.svn949573 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Tue Sep 7 2010 Stanislav Ochotnicky - 2.2-0.3.svn949573 +- Fix test case to expect new classworlds + +* Tue Jun 15 2010 Alexander Kurtakov 2.2-0.2.svn949573 +- Add missing Requires. + +* Thu Jun 3 2010 Stanislav Ochotnicky - 2.2-0.1.svn949573 +- Initial package