diff --git a/.gitignore b/.gitignore index 8170de9..0f2c0a3 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/maven-shade-plugin-3.1.0-source-release.zip +SOURCES/maven-shade-plugin-3.5.1-source-release.zip diff --git a/.maven-shade-plugin.metadata b/.maven-shade-plugin.metadata index a202676..bf0de55 100644 --- a/.maven-shade-plugin.metadata +++ b/.maven-shade-plugin.metadata @@ -1 +1 @@ -3d1012e380c5bb6d88f51a298aa302022a39e1ad SOURCES/maven-shade-plugin-3.1.0-source-release.zip +d3ee5a5dde7ef9d3f69e7629539f1ef0b52e6927 SOURCES/maven-shade-plugin-3.5.1-source-release.zip diff --git a/SOURCES/0001-Port-to-maven-dependency-tree-3.0.patch b/SOURCES/0001-Port-to-maven-dependency-tree-3.0.patch deleted file mode 100644 index a028a69..0000000 --- a/SOURCES/0001-Port-to-maven-dependency-tree-3.0.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 826c911c0b4c5b6890a7519ed60f426703b42605 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 a9d7c8e..361d697 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 -@@ -1138,7 +1138,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.13.5 - diff --git a/SPECS/maven-shade-plugin.spec b/SPECS/maven-shade-plugin.spec index 5206e82..3b95eca 100644 --- a/SPECS/maven-shade-plugin.spec +++ b/SPECS/maven-shade-plugin.spec @@ -1,22 +1,24 @@ Name: maven-shade-plugin -Version: 3.1.0 -Release: 3%{?dist} -Summary: This plugin provides the capability to package the artifact in an uber-jar +Version: 3.5.1 +Release: 5%{?dist} +Summary: Maven plugin for packaging artifacts in an uber-jar License: ASL 2.0 -URL: http://maven.apache.org/plugins/%{name} -BuildArch: noarch -Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip +URL: https://maven.apache.org/plugins/%{name} +Source0: https://repo1.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip -Patch0: 0001-Port-to-maven-dependency-tree-3.0.patch +BuildArch: noarch +ExclusiveArch: %{java_arches} noarch BuildRequires: maven-local -BuildRequires: mvn(com.google.guava:guava:19.0) BuildRequires: mvn(commons-io:commons-io) +BuildRequires: mvn(junit:junit) +BuildRequires: mvn(org.apache.commons:commons-lang3) BuildRequires: mvn(org.apache.maven:maven-artifact) BuildRequires: mvn(org.apache.maven:maven-core) BuildRequires: mvn(org.apache.maven:maven-model) BuildRequires: mvn(org.apache.maven:maven-plugin-api) +BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-plugins:pom:) BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) BuildRequires: mvn(org.apache.maven.shared:maven-artifact-transfer) @@ -24,33 +26,37 @@ BuildRequires: mvn(org.apache.maven.shared:maven-dependency-tree) BuildRequires: mvn(org.codehaus.plexus:plexus-component-annotations) BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) -BuildRequires: mvn(org.jdom:jdom) +BuildRequires: mvn(org.jdom:jdom2) +BuildRequires: mvn(org.mockito:mockito-all) BuildRequires: mvn(org.ow2.asm:asm) BuildRequires: mvn(org.ow2.asm:asm-commons) BuildRequires: mvn(org.vafer:jdependency) - +BuildRequires: mvn(xmlunit:xmlunit) +BuildRequires: mvn(org.slf4j:slf4j-api) +BuildRequires: mvn(javax.inject:javax.inject) +BuildRequires: mvn(org.apache.commons:commons-collections4) +BuildRequires: mvn(org.eclipse.sisu:sisu-maven-plugin) +BuildRequires: mvn(org.eclipse.sisu:org.eclipse.sisu.plexus) +BuildRequires: google-guice +BuildRequires: maven-plugin-testing-harness %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 %{name} - -%description javadoc -%{summary}. +%javadoc_package %prep %setup -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 +%pom_remove_dep 'org.eclipse.sisu:org.eclipse.sisu.inject:' + %build -# A class from aopalliance is not found. Simply adding BR does not solve it -%mvn_build -f +%mvn_build %install %mvn_install @@ -58,10 +64,98 @@ ln -s $(build-classpath plexus/utils) src/test/jars/plexus-utils-1.4.1.jar %files -f .mfiles %license LICENSE NOTICE -%files javadoc -f .mfiles-javadoc -%license LICENSE NOTICE - %changelog +* Mon Dec 16 2024 Arkady L. Shane - 3.5.1-5 +- Rebuilt for MSVSphere 10 + +* Tue Oct 29 2024 Troy Dawson - 3.5.1-5 +- Bump release for October 2024 mass rebuild: + Resolves: RHEL-64018 + +* Mon Jun 24 2024 Troy Dawson - 3.5.1-4 +- Bump release for June 2024 mass rebuild + +* Thu Jan 25 2024 Fedora Release Engineering - 3.5.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 3.5.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Dec 28 2023 Nicolas De Amicis - 3.5.1-1 +- Bump to 3.5.1 + +* Thu Jul 20 2023 Fedora Release Engineering - 3.5.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jul 13 2023 Nicolas De Amicis - 3.5.0-1 +- Update to upstream version 3.5.0 + +* Thu Jan 19 2023 Fedora Release Engineering - 3.4.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Oct 27 2022 Nicolas De Amicis - 3.4.1-1 +- Update to upstream version 3.4.1 + +* Sat Oct 01 2022 Nicolas De Amicis - 3.4.0-1 +- Update to upstream version 3.4.0 + +* Thu Jul 21 2022 Fedora Release Engineering - 3.3.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Fri Jul 08 2022 Jiri Vanek - 3.3.0-3 +- Rebuilt for Drop i686 JDKs + +* Thu Apr 07 2022 Didik Supriadi - 3.3.0-2 +- Enable tests + +* Thu Mar 31 2022 Nicolas De Amicis - 3.3.0-1 +- Bump version to 3.3.0 + +* Sat Feb 05 2022 Jiri Vanek - 3.2.4-7 +- Rebuilt for java-17-openjdk as system jdk + +* Thu Jan 20 2022 Fedora Release Engineering - 3.2.4-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 3.2.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jan 26 2021 Fedora Release Engineering - 3.2.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 3.2.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jul 10 2020 Jiri Vanek - 3.2.4-2 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Mon Jun 08 2020 Fabio Valentini - 3.2.4-1 +- Update to version 3.2.4. + +* Sat May 09 2020 Fabio Valentini - 3.2.3-1 +- Update to version 3.2.3. + +* Wed Jan 29 2020 Fedora Release Engineering - 3.2.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sun Nov 03 2019 Fabio Valentini - 3.2.1-2 +- Drop workaround for maven-artifact-transfer 0.11.0. + +* Sun Aug 18 2019 Fabio Valentini - 3.2.1-1 +- Update to version 3.2.1. + +* Thu Jul 25 2019 Fedora Release Engineering - 3.1.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Feb 01 2019 Fedora Release Engineering - 3.1.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 3.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Mon Jul 02 2018 Michael Simacek - 3.1.1-1 +- Update to upstream version 3.1.1 + * Wed Apr 11 2018 Mikolaj Izdebski - 3.1.0-3 - Switch BR to guava20