[sisu-ioc] 01/01: Fixed the source compatibility with plexus-utils 3.0.22

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository sisu-ioc.

commit 85af0dc18f567aca521956ac6970c278af4d3e49
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Nov 27 10:33:59 2015 +0100

    Fixed the source compatibility with plexus-utils 3.0.22
---
 debian/changelog                                |  7 +++++++
 debian/patches/plexus-utils-compatibility.patch | 14 ++++++++++++++
 debian/patches/series                           |  1 +
 3 files changed, 22 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 32c539a..fcc48f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+sisu-ioc (2.3.0-7) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Fixed the source compatibility with plexus-utils 3.0.22
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Fri, 27 Nov 2015 10:33:21 +0100
+
 sisu-ioc (2.3.0-6) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/plexus-utils-compatibility.patch b/debian/patches/plexus-utils-compatibility.patch
new file mode 100644
index 0000000..d9db6ec
--- /dev/null
+++ b/debian/patches/plexus-utils-compatibility.patch
@@ -0,0 +1,14 @@
+Description: Fix the source compatibility with plexus-utils 3.0.22
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/sisu-inject/containers/guice-plexus/guice-plexus-scanners/src/main/java/org/sonatype/guice/plexus/scanners/PlexusXmlScanner.java
++++ b/sisu-inject/containers/guice-plexus/guice-plexus-scanners/src/main/java/org/sonatype/guice/plexus/scanners/PlexusXmlScanner.java
+@@ -114,7 +114,7 @@
+         final Reader reader = ReaderFactory.newXmlReader( in );
+         if ( null != variables )
+         {
+-            return new InterpolationFilterReader( reader, variables );
++            return new InterpolationFilterReader( reader, (Map) variables );
+         }
+         return reader;
+     }
diff --git a/debian/patches/series b/debian/patches/series
index 5867ad7..f433f23 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ fix_osgi43.diff
 version_plexus.diff
 guice_classifier.diff
 javac_apt_scanner.diff
+plexus-utils-compatibility.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sisu-ioc.git