Update to upstream version 2.4
This commit is contained in:
parent
a5dfd5ce10
commit
94cc47c243
1
.gitignore
vendored
1
.gitignore
vendored
@ -9,3 +9,4 @@ maven-shade-plugin-1.7.1-source-release.zip
|
||||
/maven-shade-plugin-2.1-source-release.zip
|
||||
/maven-shade-plugin-2.2-source-release.zip
|
||||
/maven-shade-plugin-2.3-source-release.zip
|
||||
/maven-shade-plugin-2.4-source-release.zip
|
||||
|
@ -1,22 +0,0 @@
|
||||
diff --git a/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ManifestResourceTransformer.java b/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ManifestResourceTransformer.java
|
||||
index 644fad6..74bf3b7 100644
|
||||
--- a/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ManifestResourceTransformer.java
|
||||
+++ b/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ManifestResourceTransformer.java
|
||||
@@ -47,7 +47,7 @@ public class ManifestResourceTransformer
|
||||
// Configuration
|
||||
private String mainClass;
|
||||
|
||||
- private Map<String, Attributes> manifestEntries;
|
||||
+ private Map<String, String> manifestEntries;
|
||||
|
||||
// Fields
|
||||
private boolean manifestDiscovered;
|
||||
@@ -101,7 +101,7 @@ public class ManifestResourceTransformer
|
||||
|
||||
if ( manifestEntries != null )
|
||||
{
|
||||
- for ( Map.Entry<String, Attributes> entry : manifestEntries.entrySet() )
|
||||
+ for ( Map.Entry<String, String> entry : manifestEntries.entrySet() )
|
||||
{
|
||||
attributes.put( new Attributes.Name( entry.getKey() ), entry.getValue() );
|
||||
}
|
@ -1,16 +1,12 @@
|
||||
Name: maven-shade-plugin
|
||||
Version: 2.3
|
||||
Release: 5%{?dist}
|
||||
Version: 2.4
|
||||
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}
|
||||
Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip
|
||||
BuildArch: noarch
|
||||
|
||||
# Fix MSHADE-168 (ManifestResourceTransformer manifestEntries map
|
||||
# declares wrong generic type).
|
||||
Patch0: %{name}-MSHADE-168.patch
|
||||
|
||||
BuildRequires: maven-local
|
||||
BuildRequires: java-devel
|
||||
BuildRequires: mvn(asm:asm)
|
||||
@ -45,7 +41,6 @@ Summary: API documentation for %{name}
|
||||
%setup -q
|
||||
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
|
||||
%patch0 -p2
|
||||
|
||||
%build
|
||||
# A class from aopalliance is not found. Simply adding BR does not solve it
|
||||
@ -62,6 +57,9 @@ ln -s $(build-classpath plexus/utils) src/test/jars/plexus-utils-1.4.1.jar
|
||||
%doc LICENSE NOTICE
|
||||
|
||||
%changelog
|
||||
* Fri Jun 12 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.4-1
|
||||
- Update to upstream version 2.4
|
||||
|
||||
* Tue Oct 14 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.3-5
|
||||
- Remove legacy Obsoletes/Provides for maven2 plugin
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user