[sisu-guice] 04/05: Fixed a build failure caused by maven-bundle-plugin/2.3.7 (Closes: #761522)

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Fri Oct 3 12:59:48 UTC 2014


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

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

commit 4ab604dd38da9d37b44a7db27f1e34c3ead3c6ce
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Oct 3 14:51:10 2014 +0200

    Fixed a build failure caused by maven-bundle-plugin/2.3.7 (Closes: #761522)
---
 debian/changelog        | 1 +
 debian/control          | 2 +-
 debian/maven.properties | 4 +++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5417611..e8a256b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ sisu-guice (3.2.4-1) UNRELEASED; urgency=medium
 
   * Team upload.
   * New upstream release
+  * Fixed a build failure caused by maven-bundle-plugin/2.3.7 (Closes: #761522)
   * Install the no_aop artifact linked to the main jar in /usr/share/maven-repo
   * Build depend on libservlet3.1-java instead of libservlet2.5-java
   * Build depend on libcglib3-java instead of libcglib-java
diff --git a/debian/control b/debian/control
index 9ab7abe..0ea5800 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends-Indep: glassfish-javaee,
                      libcglib3-java,
                      libguava-java,
                      libjarjar-maven-plugin-java,
-                     libmaven-bundle-plugin-java,
+                     libmaven-bundle-plugin-java (>= 2.3.7-2~),
                      libmaven-javadoc-plugin-java,
                      libmunge-maven-plugin-java,
                      libservlet3.1-java,
diff --git a/debian/maven.properties b/debian/maven.properties
index a20e9ea..530129f 100644
--- a/debian/maven.properties
+++ b/debian/maven.properties
@@ -8,4 +8,6 @@ maven.compiler.source=1.5
 maven.compiler.target=1.5
 
 guice.with.no_aop=false
-# guice.with.jarjar=false
\ No newline at end of file
+# guice.with.jarjar=false
+
+debian.maven-bundle-plugin.compatibility=true

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



More information about the pkg-java-commits mailing list