Update to upstream version 3.1.1

This commit is contained in:
Michael Simacek 2018-07-02 15:46:25 +02:00
parent 3e580fbf2c
commit eea433d604
4 changed files with 26 additions and 21 deletions

1
.gitignore vendored
View File

@ -15,3 +15,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

View File

@ -1,14 +1,14 @@
From 826c911c0b4c5b6890a7519ed60f426703b42605 Mon Sep 17 00:00:00 2001
From b5f9a9c64f42b7452681dc53e67e8cbae4de1105 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
---
src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java | 7 ++++++-
.../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
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
@ -26,5 +26,5 @@ index a9d7c8e..361d697 100644
for ( DependencyNode n2 : node.getChildren() )
{
--
2.13.5
2.17.1

View File

@ -1,6 +1,6 @@
Name: maven-shade-plugin
Version: 3.1.0
Release: 3%{?dist}
Version: 3.1.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}
@ -17,6 +17,7 @@ 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,7 +25,7 @@ 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.ow2.asm:asm)
BuildRequires: mvn(org.ow2.asm:asm-commons)
BuildRequires: mvn(org.vafer:jdependency)
@ -62,6 +63,9 @@ ln -s $(build-classpath plexus/utils) src/test/jars/plexus-utils-1.4.1.jar
%license LICENSE NOTICE
%changelog
* Mon Jul 02 2018 Michael Simacek <msimacek@redhat.com> - 3.1.1-1
- Update to upstream version 3.1.1
* Wed Apr 11 2018 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.1.0-3
- Switch BR to guava20

View File

@ -1 +1 @@
SHA512 (maven-shade-plugin-3.1.0-source-release.zip) = fa083184ecb4ede8ba97278de1b69786d1508866e9469a3307e832b6ce428c7e5ce1328317c35afd78b72b143d9d30c4a1efd8cbe102c25679e76b0a1fea559f
SHA512 (maven-shade-plugin-3.1.1-source-release.zip) = 390993bcb61d5c46126f0fd74574014e88fffd11e147217aafe47594ae6d80597419ce43b194e9ac82df662b95d5f8bbd364ac603cde62ecd2d2c9e42fc175de