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 1550c057a9787b9b28374413e9d30c31388cd16c Author: Emmanuel Bourg <[email protected]> Date: Thu Dec 17 12:20:46 2015 +0100 Adjusted the bundle plugin configuration to still embed the dependencies in sisu-inject-bean --- debian/changelog | 2 ++ debian/patches/bnd-compatibility.patch | 36 +++++++++------------------------- debian/patches/series | 2 +- 3 files changed, 12 insertions(+), 28 deletions(-) diff --git a/debian/changelog b/debian/changelog index fc4c25b..9d79647 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ sisu-ioc (2.3.0-8) UNRELEASED; urgency=medium * Replaced guice_classifier.diff with a Maven rule * Ignore the project-info-reports plugin to remove a warning with Maven 3 * Fixed the compilation errors with the tests + * Adjusted the bundle plugin configuration to still embed the dependencies + in sisu-inject-bean -- Emmanuel Bourg <[email protected]> Thu, 17 Dec 2015 12:12:38 +0100 diff --git a/debian/patches/bnd-compatibility.patch b/debian/patches/bnd-compatibility.patch index aa002bc..d99f5ec 100644 --- a/debian/patches/bnd-compatibility.patch +++ b/debian/patches/bnd-compatibility.patch @@ -1,32 +1,14 @@ -Description: Fix a build failure caused by bnd 2.0 +Description: Adjust the maven-bundle-plugin configuration to still embed the dependencies in sisu-inject-bean Author: Emmanuel Bourg <[email protected]> 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.*, +--- a/sisu-inject/containers/guice-bean/sisu-inject-bean/pom.xml ++++ b/sisu-inject/containers/guice-bean/sisu-inject-bean/pom.xml +@@ -127,6 +127,8 @@ <!-- 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> ++ <Embed-Dependency>*;scope=compile|runtime;inline=javax/inject/**|javax/enterprise/inject/*|org/sonatype/**|org/aopalliance/**</Embed-Dependency> ++ <Embed-Transitive>true</Embed-Transitive> + </instructions> + </configuration> + </plugin> diff --git a/debian/patches/series b/debian/patches/series index 7881fe6..3b4de2b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,5 +3,5 @@ fix_osgi43.diff version_plexus.diff javac_apt_scanner.diff plexus-utils-compatibility.patch -bnd-compatibility.patch felix-compatibility.patch +bnd-compatibility.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sisu-ioc.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
