Update to upstream version 3.0.0

This commit is contained in:
Michael Simacek 2017-01-30 10:56:32 +01:00
parent a3ad475065
commit cbab4753a8
4 changed files with 25 additions and 22 deletions

1
.gitignore vendored
View File

@ -13,3 +13,4 @@ maven-shade-plugin-1.7.1-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
/maven-shade-plugin-3.0.0-source-release.zip

View File

@ -1,4 +1,4 @@
From cbce06292597d05b6406701b1e54d32a57a51c99 Mon Sep 17 00:00:00 2001
From 29d66485c635ae2dea9da2f7dedd29a41270f1fa Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Mon, 12 Oct 2015 16:40:07 +0200
Subject: [PATCH] Port to maven-dependency-tree 3.0
@ -8,10 +8,10 @@ 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 dea515d..e9862ad 100644
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
@@ -1113,7 +1113,12 @@ public class ShadeMojo
@@ -1130,7 +1130,12 @@ public class ShadeMojo
List<Dependency> transitiveDeps )
throws DependencyGraphBuilderException
{
@ -26,5 +26,5 @@ index dea515d..e9862ad 100644
for ( DependencyNode n2 : node.getChildren() )
{
--
2.5.5
2.9.3

View File

@ -1,5 +1,5 @@
Name: maven-shade-plugin
Version: 2.4.3
Version: 3.0.0
Release: 1%{?dist}
Summary: This plugin provides the capability to package the artifact in an uber-jar
License: ASL 2.0
@ -13,14 +13,13 @@ Patch0: 0001-Port-to-maven-dependency-tree-3.0.patch
BuildRequires: maven-local
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-compat)
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-plugins:pom:)
BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
BuildRequires: mvn(org.apache.maven.shared:maven-artifact-transfer)
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)
@ -29,7 +28,7 @@ BuildRequires: mvn(org.jdom:jdom)
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
@ -63,6 +62,9 @@ ln -s $(build-classpath plexus/utils) src/test/jars/plexus-utils-1.4.1.jar
%license LICENSE NOTICE
%changelog
* Mon Jan 30 2017 Michael Simacek <msimacek@redhat.com> - 3.0.0-1
- Update to upstream version 3.0.0
* Mon May 02 2016 Michael Simacek <msimacek@redhat.com> - 2.4.3-1
- Update to upstream version 2.4.3

View File

@ -1 +1 @@
47826f9711d19dd48d4fca5a01d37f77 maven-shade-plugin-2.4.3-source-release.zip
SHA512 (maven-shade-plugin-3.0.0-source-release.zip) = 746e563216f45a5a9967ab7b0bc18744a6db0709c92b393cc90a16ae65092286909590b2599fb060b44911cc48f16266541f28cdab5c9b0c1ed919b27aeca288