From c02499c7c3f41504aa4447a8a213a5e829f09f55 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 11 Sep 2017 11:09:11 +0200 Subject: [PATCH] Update to upstream version 3.1.0 --- .gitignore | 1 + 0001-Port-to-maven-dependency-tree-3.0.patch | 34 ++++++++++---------- maven-shade-plugin.spec | 7 ++-- sources | 2 +- 4 files changed, 24 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index 9d84165..d49909e 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ maven-shade-plugin-1.7.1-source-release.zip /maven-shade-plugin-2.4.2-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 diff --git a/0001-Port-to-maven-dependency-tree-3.0.patch b/0001-Port-to-maven-dependency-tree-3.0.patch index eee1436..a028a69 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 29d66485c635ae2dea9da2f7dedd29a41270f1fa Mon Sep 17 00:00:00 2001 +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 @@ -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 6c516e9..0459b2f 100644 +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 -@@ -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() ) - { +@@ -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.9.3 +2.13.5 diff --git a/maven-shade-plugin.spec b/maven-shade-plugin.spec index eff3308..9bf10e3 100644 --- a/maven-shade-plugin.spec +++ b/maven-shade-plugin.spec @@ -1,6 +1,6 @@ Name: maven-shade-plugin -Version: 3.0.0 -Release: 3%{?dist} +Version: 3.1.0 +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} @@ -62,6 +62,9 @@ ln -s $(build-classpath plexus/utils) src/test/jars/plexus-utils-1.4.1.jar %license LICENSE NOTICE %changelog +* Mon Sep 11 2017 Mikolaj Izdebski - 3.1.0-1 +- Update to upstream version 3.1.0 + * Wed Jul 26 2017 Fedora Release Engineering - 3.0.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild diff --git a/sources b/sources index fc20390..3641df0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (maven-shade-plugin-3.0.0-source-release.zip) = 746e563216f45a5a9967ab7b0bc18744a6db0709c92b393cc90a16ae65092286909590b2599fb060b44911cc48f16266541f28cdab5c9b0c1ed919b27aeca288 +SHA512 (maven-shade-plugin-3.1.0-source-release.zip) = fa083184ecb4ede8ba97278de1b69786d1508866e9469a3307e832b6ce428c7e5ce1328317c35afd78b72b143d9d30c4a1efd8cbe102c25679e76b0a1fea559f