diff --git a/.gitignore b/.gitignore index c61f8ca..a2f6636 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ maven-shade-plugin-1.7.1-source-release.zip /maven-shade-plugin-2.4-source-release.zip /maven-shade-plugin-2.4.1-source-release.zip /maven-shade-plugin-2.4.2-source-release.zip +/maven-shade-plugin-2.4.3-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 index 52288ec..f704cdd 100644 --- a/0001-Port-to-maven-dependency-tree-3.0.patch +++ b/0001-Port-to-maven-dependency-tree-3.0.patch @@ -1,4 +1,4 @@ -From 1b54b0ba9268a9abcf7d8b12bc631ea965690666 Mon Sep 17 00:00:00 2001 +From cbce06292597d05b6406701b1e54d32a57a51c99 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 @@ -8,23 +8,23 @@ Subject: [PATCH] Port to maven-dependency-tree 3.0 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 8e9d895..cb3b7ac 100644 +index dea515d..e9862ad 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 -@@ -1112,7 +1112,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() ) - { +@@ -1113,7 +1113,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.4.3 +2.5.5 diff --git a/maven-shade-plugin.spec b/maven-shade-plugin.spec index 49d4511..ea98a1c 100644 --- a/maven-shade-plugin.spec +++ b/maven-shade-plugin.spec @@ -1,6 +1,6 @@ Name: maven-shade-plugin -Version: 2.4.2 -Release: 2%{?dist} +Version: 2.4.3 +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} @@ -63,6 +63,9 @@ ln -s $(build-classpath plexus/utils) src/test/jars/plexus-utils-1.4.1.jar %license LICENSE NOTICE %changelog +* 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 diff --git a/sources b/sources index 2e76e79..3a0c762 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e9a108463ef54a20b0a23983cb96b814 maven-shade-plugin-2.4.2-source-release.zip +47826f9711d19dd48d4fca5a01d37f77 maven-shade-plugin-2.4.3-source-release.zip