From 8e755cd4555c958f874c0e7ae095716a460dc8d8 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Aug 18 2019 15:26:14 +0000 Subject: update to version 3.2.1 --- diff --git a/.gitignore b/.gitignore index b765b03..991964f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,13 @@ -maven-shade-plugin-1.3.3.tar.xz +/results_* +/*.src.rpm + +/maven-shade-plugin-1.3.3.tar.xz /maven-shade-plugin-1.4.tar.xz /maven-shade-plugin-1.4-source-release.zip -maven-shade-plugin-1.5-source-release.zip -maven-shade-plugin-1.6-source-release.zip +/maven-shade-plugin-1.5-source-release.zip +/maven-shade-plugin-1.6-source-release.zip /maven-shade-plugin-1.7-source-release.zip -maven-shade-plugin-1.7.1-source-release.zip +/maven-shade-plugin-1.7.1-source-release.zip /maven-shade-plugin-2.0-source-release.zip /maven-shade-plugin-2.1-source-release.zip /maven-shade-plugin-2.2-source-release.zip @@ -15,4 +18,4 @@ maven-shade-plugin-1.7.1-source-release.zip /maven-shade-plugin-2.4.3-source-release.zip /maven-shade-plugin-3.0.0-source-release.zip /maven-shade-plugin-3.1.0-source-release.zip -/maven-shade-plugin-3.1.1-source-release.zip +/maven-shade-plugin-3.2.1-source-release.zip diff --git a/0001-Port-to-maven-dependency-tree-3.0.patch b/0001-Port-to-maven-dependency-tree-3.0.patch deleted file mode 100644 index 05dd113..0000000 --- a/0001-Port-to-maven-dependency-tree-3.0.patch +++ /dev/null @@ -1,30 +0,0 @@ -From b5f9a9c64f42b7452681dc53e67e8cbae4de1105 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 - ---- - .../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 d7011f9..02450a2 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.17.1 - diff --git a/maven-shade-plugin.spec b/maven-shade-plugin.spec index 001acc7..db6f6bb 100644 --- a/maven-shade-plugin.spec +++ b/maven-shade-plugin.spec @@ -1,6 +1,6 @@ Name: maven-shade-plugin -Version: 3.1.1 -Release: 4%{?dist} +Version: 3.2.1 +Release: 1%{?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/%{name} @@ -8,11 +8,10 @@ BuildArch: noarch Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip -Patch0: 0001-Port-to-maven-dependency-tree-3.0.patch - BuildRequires: maven-local -BuildRequires: mvn(com.google.guava:guava:19.0) +BuildRequires: mvn(com.google.guava:guava) BuildRequires: mvn(commons-io:commons-io) +BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.maven:maven-artifact) BuildRequires: mvn(org.apache.maven:maven-core) BuildRequires: mvn(org.apache.maven:maven-model) @@ -26,10 +25,11 @@ 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: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) %description This plugin provides the capability to package the artifact in an @@ -45,13 +45,18 @@ Summary: API documentation for %{name} %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 'com.google.guava:guava:' +%pom_add_dep 'com.google.guava:guava' + +sed -i 's/import org\.apache\.maven\.shared\.transfer\.artifact\.\(.*\)/import org.apache.maven.shared.artifact.\1/' src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java +sed -i 's/import org\.apache\.maven\.shared\.transfer\.artifact\.\(.*\)/import org.apache.maven.shared.artifact.\1/' src/test/java/org/apache/maven/plugins/shade/mojo/ShadeMojoTest.java + %build -# A class from aopalliance is not found. Simply adding BR does not solve it -%mvn_build -f +%mvn_build %install %mvn_install @@ -63,6 +68,9 @@ ln -s $(build-classpath plexus/utils) src/test/jars/plexus-utils-1.4.1.jar %license LICENSE NOTICE %changelog +* 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 diff --git a/sources b/sources index cc06021..7e72da1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (maven-shade-plugin-3.1.1-source-release.zip) = 390993bcb61d5c46126f0fd74574014e88fffd11e147217aafe47594ae6d80597419ce43b194e9ac82df662b95d5f8bbd364ac603cde62ecd2d2c9e42fc175de +SHA512 (maven-shade-plugin-3.2.1-source-release.zip) = 6916f93db460b6c8e87dcc10a9f12fe789bfb6c81f7f77365bdcfad9c2fb04139808ca6bf2d56d160de0d29a01393cb3cfd233cace88f83dc6db978c14bc3f86