Remove unneeded patch

This commit is contained in:
Mikolaj Izdebski 2016-01-07 11:37:38 +01:00
parent ff7fe294c2
commit 21cc7a5a19
2 changed files with 4 additions and 30 deletions

View File

@ -1,27 +0,0 @@
--- sisu-plexus/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusAnnotatedMetadata.java
+++ sisu-plexus/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusAnnotatedMetadata.java
@@ -88,7 +88,7 @@ public final class PlexusAnnotatedMetadata
return text;
}
// use same interpolation method as XML for sake of consistency
- final Reader r = new InterpolationFilterReader( new StringReader( text ), variables );
+ final Reader r = new InterpolationFilterReader( new StringReader( text ), (Map) variables );
try
{
return IOUtil.toString( r );
diff --git a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusXmlScanner.java b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusXmlScanner.java
index e04fb07..d715460 100644
--- sisu-plexus/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusXmlScanner.java
+++ sisu-plexus/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusXmlScanner.java
@@ -113,7 +113,7 @@ final class PlexusXmlScanner
final Reader reader = ReaderFactory.newXmlReader( in );
if ( null != variables )
{
- return new InterpolationFilterReader( reader, variables );
+ return new InterpolationFilterReader( reader, (Map) variables );
}
return reader;
}
--
1.9.3

View File

@ -5,7 +5,7 @@
Name: sisu
Epoch: 1
Version: 0.3.2
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Eclipse dependency injection framework
License: EPL
URL: http://eclipse.org/sisu
@ -15,7 +15,6 @@ Source1: http://git.eclipse.org/c/%{name}/org.eclipse.%{name}.plexus.git/
Patch0: %{name}-OSGi-import-guava.patch
Patch2: %{name}-ignored-tests.patch
Patch3: %{name}-plexus-utils-3.0.18.patch
BuildArch: noarch
@ -125,7 +124,6 @@ tar xf %{SOURCE1} && mv %{reltype}s/* sisu-plexus && rmdir %{reltype}s
%patch0
%patch2
%patch3
# Unbundle ASM
rm -rf sisu-inject/org.eclipse.sisu.inject/src/org/eclipse/sisu/space/asm/
@ -213,6 +211,9 @@ EOF
%changelog
* Thu Jan 7 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.3.2-2
- Remove unneeded patch
* Wed Sep 16 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.3.2-1
- Update to upstream version 0.3.2