[sisu-ioc] 01/03: Fixed a build failure related to the bundle plugin

[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 0c2dc7078a90851a87ab9e6b8324f025325d292d
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Dec 10 13:32:42 2015 +0100

    Fixed a build failure related to the bundle plugin
---
 debian/changelog                       |  1 +
 debian/patches/bnd-compatibility.patch | 32 ++++++++++++++++++++++++++++++++
 debian/patches/series                  |  1 +
 3 files changed, 34 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index fcc48f0..3472d02 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ sisu-ioc (2.3.0-7) UNRELEASED; urgency=medium
 
   * Team upload.
   * Fixed the source compatibility with plexus-utils 3.0.22
+  * Fixed a build failure related to the bundle plugin (caused by bnd 2?)
 
  -- Emmanuel Bourg <ebourg at apache.org>  Fri, 27 Nov 2015 10:33:21 +0100
 
diff --git a/debian/patches/bnd-compatibility.patch b/debian/patches/bnd-compatibility.patch
new file mode 100644
index 0000000..aa002bc
--- /dev/null
+++ b/debian/patches/bnd-compatibility.patch
@@ -0,0 +1,32 @@
+Description: Fix a build failure caused by bnd 2.0
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/sisu-inject/containers/guice-plexus/sisu-inject-plexus/pom.xml
++++ b/sisu-inject/containers/guice-plexus/sisu-inject-plexus/pom.xml
+@@ -94,11 +94,24 @@
+             <Import-Package>
+               <!-- Plexus APIs -->
+               org.codehaus.*,
+-              <!-- available via Require-Bundle -->
+-              !com.google.*,!org.sonatype.*,
+               <!-- optional generated imports -->
+               *;resolution:=optional
+             </Import-Package>
++            <Ignore-Package>
++              com.google.inject,
++              com.google.inject.binder,
++              com.google.inject.matcher,
++              com.google.inject.name,
++              com.google.inject.spi,
++              com.google.inject.util,
++              org.sonatype.guice.bean.binders,
++              org.sonatype.guice.bean.inject,
++              org.sonatype.guice.bean.locators,
++              org.sonatype.guice.bean.reflect,
++              org.sonatype.guice.bean.scanners,
++              org.sonatype.guice.bean.scanners.asm,
++              org.sonatype.inject
++            </Ignore-Package>
+             <Private-Package>
+               META-INF.plexus
+             </Private-Package>
diff --git a/debian/patches/series b/debian/patches/series
index f433f23..3d653bf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ version_plexus.diff
 guice_classifier.diff
 javac_apt_scanner.diff
 plexus-utils-compatibility.patch
+bnd-compatibility.patch

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