From c625d275a1ae57436f73c4cae61dd34ab5634636 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Oct 24 2017 09:10:25 +0000 Subject: import rh-maven35-maven-shade-plugin-3.0.0-2.2.el7 --- diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c115507 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/maven-shade-plugin-3.0.0-source-release.zip diff --git a/.rh-maven35-maven-shade-plugin.metadata b/.rh-maven35-maven-shade-plugin.metadata new file mode 100644 index 0000000..1331350 --- /dev/null +++ b/.rh-maven35-maven-shade-plugin.metadata @@ -0,0 +1 @@ +334ab5039f9c4e867e1feb2655d8a7a6afb35820 SOURCES/maven-shade-plugin-3.0.0-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-Port-to-maven-dependency-tree-3.0.patch b/SOURCES/0001-Port-to-maven-dependency-tree-3.0.patch new file mode 100644 index 0000000..eee1436 --- /dev/null +++ b/SOURCES/0001-Port-to-maven-dependency-tree-3.0.patch @@ -0,0 +1,30 @@ +From 29d66485c635ae2dea9da2f7dedd29a41270f1fa Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Mon, 12 Oct 2015 16:40:07 +0200 +Subject: [PATCH] Port to maven-dependency-tree 3.0 + +--- + src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java b/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java +index 6c516e9..0459b2f 100644 +--- a/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java ++++ b/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java +@@ -1130,7 +1130,12 @@ public class ShadeMojo + List transitiveDeps ) + throws DependencyGraphBuilderException + { +- DependencyNode node = dependencyGraphBuilder.buildDependencyGraph( project, null ); ++ ProjectBuildingRequest projectBuildingRequest = ++ new DefaultProjectBuildingRequest( session.getProjectBuildingRequest() ); ++ projectBuildingRequest.setLocalRepository( localRepository ); ++ projectBuildingRequest.setRemoteRepositories( remoteArtifactRepositories ); ++ projectBuildingRequest.setProject( project ); ++ DependencyNode node = dependencyGraphBuilder.buildDependencyGraph( projectBuildingRequest, null ); + boolean modified = false; + for ( DependencyNode n2 : node.getChildren() ) + { +-- +2.9.3 + diff --git a/SPECS/maven-shade-plugin.spec b/SPECS/maven-shade-plugin.spec new file mode 100644 index 0000000..ed5f2e0 --- /dev/null +++ b/SPECS/maven-shade-plugin.spec @@ -0,0 +1,188 @@ +%{?scl:%scl_package maven-shade-plugin} +%{!?scl:%global pkg_name %{name}} + +Name: %{?scl_prefix}maven-shade-plugin +Version: 3.0.0 +Release: 2.2%{?dist} +Summary: This plugin provides the capability to package the artifact in an uber-jar +License: ASL 2.0 +URL: http://maven.apache.org/plugins/%{pkg_name} +BuildArch: noarch + +Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%{pkg_name}/%{version}/%{pkg_name}-%{version}-source-release.zip + +Patch0: 0001-Port-to-maven-dependency-tree-3.0.patch + +BuildRequires: %{?scl_prefix}maven-local +BuildRequires: %{?scl_prefix}mvn(com.google.guava:guava) +BuildRequires: %{?scl_prefix}mvn(commons-io:commons-io) +BuildRequires: %{?scl_prefix}mvn(org.apache.maven:maven-artifact) +BuildRequires: %{?scl_prefix}mvn(org.apache.maven:maven-core) +BuildRequires: %{?scl_prefix}mvn(org.apache.maven:maven-model) +BuildRequires: %{?scl_prefix}mvn(org.apache.maven:maven-plugin-api) +BuildRequires: %{?scl_prefix}mvn(org.apache.maven.plugins:maven-plugins:pom:) +BuildRequires: %{?scl_prefix}mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) +BuildRequires: %{?scl_prefix}mvn(org.apache.maven.shared:maven-artifact-transfer) +BuildRequires: %{?scl_prefix}mvn(org.apache.maven.shared:maven-dependency-tree) +BuildRequires: %{?scl_prefix}mvn(org.codehaus.plexus:plexus-component-annotations) +BuildRequires: %{?scl_prefix}mvn(org.codehaus.plexus:plexus-component-metadata) +BuildRequires: %{?scl_prefix}mvn(org.codehaus.plexus:plexus-utils) +BuildRequires: %{?scl_prefix}mvn(org.jdom:jdom) +BuildRequires: %{?scl_prefix}mvn(org.ow2.asm:asm) +BuildRequires: %{?scl_prefix}mvn(org.ow2.asm:asm-commons) +BuildRequires: %{?scl_prefix}mvn(org.vafer:jdependency) + +%description +This plugin provides the capability to package the artifact in an +uber-jar, including its dependencies and to shade - i.e. rename - the +packages of some of the dependencies. + +%package javadoc +Summary: API documentation for %{pkg_name} + +%description javadoc +%{summary}. + +%prep +%setup -n %{pkg_name}-%{version} -q +%patch0 -p1 +rm src/test/jars/plexus-utils-1.4.1.jar +ln -s $(build-classpath plexus/utils) src/test/jars/plexus-utils-1.4.1.jar + +%build +# A class from aopalliance is not found. Simply adding BR does not solve it +%mvn_build -f + +%install +%mvn_install + +%files -f .mfiles +%license LICENSE NOTICE + +%files javadoc -f .mfiles-javadoc +%license LICENSE NOTICE + +%changelog +* Thu Jun 22 2017 Michael Simacek - 3.0.0-2.2 +- Mass rebuild 2017-06-22 + +* Wed Jun 21 2017 Java Maintainers - 3.0.0-2.1 +- Automated package import and SCL-ization + +* Fri Feb 10 2017 Fedora Release Engineering - 3.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Mon Jan 30 2017 Michael Simacek - 3.0.0-1 +- Update to upstream version 3.0.0 + +* Mon May 02 2016 Michael Simacek - 2.4.3-1 +- Update to upstream version 2.4.3 + +* Thu Feb 04 2016 Fedora Release Engineering - 2.4.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Oct 30 2015 Mikolaj Izdebski - 2.4.2-1 +- Update to upstream version 2.4.2 + +* Mon Oct 12 2015 Mikolaj Izdebski - 2.4.1-3 +- Fix Maven 3 patch + +* Mon Oct 12 2015 Mikolaj Izdebski - 2.4.1-2 +- Port to maven-dependency-tree 3.0 + +* Thu Jul 23 2015 Mikolaj Izdebski - 2.4.1-1 +- Update to upstream version 2.4.1 + +* Wed Jun 17 2015 Fedora Release Engineering - 2.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Fri Jun 12 2015 Mikolaj Izdebski - 2.4-1 +- Update to upstream version 2.4 + +* Tue Oct 14 2014 Mikolaj Izdebski - 2.3-5 +- Remove legacy Obsoletes/Provides for maven2 plugin + +* Mon Aug 4 2014 Mikolaj Izdebski - 2.3-4 +- Fix build-requires on parent POM + +* Sat Jun 07 2014 Fedora Release Engineering - 2.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Mon May 12 2014 Mikolaj Izdebski - 2.3-2 +- Add patch for MSHADE-168 +- Resolves: rhbz#1096583 + +* Fri May 2 2014 Mikolaj Izdebski - 2.3-1 +- Update to upstream version 2.3 + +* Tue Mar 04 2014 Stanislav Ochotnicky - 2.2-2 +- Use Requires: java-headless rebuild (#1067528) + +* Wed Dec 4 2013 Mikolaj Izdebski - 2.2-1 +- Update to upstream version 2.2 + +* Tue May 21 2013 Mikolaj Izdebski - 2.1-1 +- Update to upstream version 2.1 + +* Wed Apr 10 2013 Mikolaj Izdebski - 2.0-4 +- Build with xmvn + +* Thu Feb 14 2013 Fedora Release Engineering - 2.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Feb 06 2013 Java SIG - 2.0-2 +- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild +- Replace maven BuildRequires with maven-local + +* Thu Dec 13 2012 Tomas Radej - 2.0-1 +- Update to upstream 2.0 + +* Wed Nov 14 2012 Mikolaj Izdebski - 1.7.1-3 +- Install NOTICE file with javadoc package + +* Thu Jul 19 2012 Fedora Release Engineering - 1.7.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu Jul 5 2012 Alexander Kurtakov 1.7.1-1 +- Update to upstream 1.7.1. + +* Wed Jun 20 2012 Mikolaj Izdebski - 1.7-1 +- Update to upstream 1.7 + +* Fri Apr 6 2012 Alexander Kurtakov 1.6-1 +- Update to latest upstream release. + +* Mon Mar 05 2012 Jaromir Capik - 1.5-4 +- Migration to plexus-containers-component-metadata + +* Fri Jan 13 2012 Fedora Release Engineering - 1.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Wed Nov 23 2011 Stanislav Ochotnicky - 1.5-2 +- Fix depmap macro call + +* Tue Nov 1 2011 Alexander Kurtakov 1.5-1 +- Update to upstream 1.5 release. + +* Thu Jun 9 2011 Alexander Kurtakov 1.4-4 +- Build with maven 3.x. +- Use upstream source. +- Guidelines fixes. + +* Tue Feb 08 2011 Fedora Release Engineering - 1.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Wed Jan 26 2011 Stanislav Ochotnicky - 1.4-2 +- Add jdependency also to Requires + +* Thu Oct 14 2010 Pierre-Yves Chibon - 1.4-1 +- Update to 1.4 +- Add BR on jdependency >= 0.6 +- Add patch to add dependency on maven-artifact-manager + +* Thu Jul 8 2010 Stanislav Ochotnicky - 1.3.3-2 +- Replace plexus utils jar with symlink +- Create MAVEN_REPO_LOCAL dir before calling maven + +* Tue Jun 22 2010 Stanislav Ochotnicky - 1.3.3-1 +- Initial package