rpms
/
sisu
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Port to plexus-utils 3.0.18

This commit is contained in:
Mikolaj Izdebski 2014-09-30 06:46:37 +02:00
parent cf7e87bcbd
commit a9aa9dce71
2 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
sisu-plexus-utils-3.0.18.patch Normal file
View File

@ -0,0 +1,27 @@
--- 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

7
sisu.spec
View File

@ -1,7 +1,7 @@
Name: sisu
Epoch: 1
Version: 0.2.1
Release: 9%{?dist}
Release: 10%{?dist}
Summary: Eclipse dependency injection framework
# bundled asm is under BSD
# See also: https://fedorahosted.org/fpc/ticket/346
@ -16,6 +16,7 @@ Source1: http://git.eclipse.org/c/%{name}/org.eclipse.%{name}.plexus.git/
Patch0: %{name}-OSGi-import-guava.patch
Patch1: %{name}-java8.patch
Patch2: %{name}-ignored-tests.patch
Patch3: %{name}-plexus-utils-3.0.18.patch
BuildArch: noarch
@ -120,6 +121,7 @@ tar xf %{SOURCE1} && mv releases/* sisu-plexus && rmdir releases
%patch0
%patch1
%patch2
%patch3
%mvn_file ":{*}" @1
# Install JARs and POMs only
@ -199,6 +201,9 @@ EOF
%changelog
* Tue Sep 30 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.2.1-10
- Port to plexus-utils 3.0.18
* Thu Sep 18 2014 Michal Srb <msrb@redhat.com> - 1:0.2.1-9
- Rebuild to fix metadata
- Remove explicit Requires