Add patch for MSHADE-168
- Resolves: rhbz#1096583
This commit is contained in:
parent
d169afa8bd
commit
971385be1b
22
maven-shade-plugin-MSHADE-168.patch
Normal file
22
maven-shade-plugin-MSHADE-168.patch
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
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,12 +1,16 @@
|
|||||||
Name: maven-shade-plugin
|
Name: maven-shade-plugin
|
||||||
Version: 2.3
|
Version: 2.3
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
Summary: This plugin provides the capability to package the artifact in an uber-jar
|
Summary: This plugin provides the capability to package the artifact in an uber-jar
|
||||||
License: ASL 2.0
|
License: ASL 2.0
|
||||||
URL: http://maven.apache.org/plugins/%{name}
|
URL: http://maven.apache.org/plugins/%{name}
|
||||||
Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip
|
Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
|
# Fix MSHADE-168 (ManifestResourceTransformer manifestEntries map
|
||||||
|
# declares wrong generic type).
|
||||||
|
Patch0: %{name}-MSHADE-168.patch
|
||||||
|
|
||||||
BuildRequires: maven-local
|
BuildRequires: maven-local
|
||||||
BuildRequires: java-devel
|
BuildRequires: java-devel
|
||||||
BuildRequires: mvn(asm:asm)
|
BuildRequires: mvn(asm:asm)
|
||||||
@ -44,6 +48,7 @@ Summary: API documentation for %{name}
|
|||||||
%setup -q
|
%setup -q
|
||||||
rm src/test/jars/plexus-utils-1.4.1.jar
|
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
|
ln -s $(build-classpath plexus/utils) src/test/jars/plexus-utils-1.4.1.jar
|
||||||
|
%patch0 -p2
|
||||||
|
|
||||||
%build
|
%build
|
||||||
# A class from aopalliance is not found. Simply adding BR does not solve it
|
# A class from aopalliance is not found. Simply adding BR does not solve it
|
||||||
@ -60,6 +65,10 @@ ln -s $(build-classpath plexus/utils) src/test/jars/plexus-utils-1.4.1.jar
|
|||||||
%doc LICENSE NOTICE
|
%doc LICENSE NOTICE
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon May 12 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.3-2
|
||||||
|
- Add patch for MSHADE-168
|
||||||
|
- Resolves: rhbz#1096583
|
||||||
|
|
||||||
* Fri May 2 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.3-1
|
* Fri May 2 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.3-1
|
||||||
- Update to upstream version 2.3
|
- Update to upstream version 2.3
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user