[sisu-inject] 05/08: Reverted the scope of the guice dependency from 'provided' to 'compile'

[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-inject.

commit 16361bc986152b45ad9ca07978e8bb0365d8fc90
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Jul 6 13:50:09 2015 +0200

    Reverted the scope of the guice dependency from 'provided' to 'compile'
---
 debian/changelog                         |  2 ++
 debian/patches/05-guice-dependency.patch | 13 +++++++++++++
 debian/patches/series                    |  1 +
 3 files changed, 16 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 21350a5..b8dada2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ sisu-inject (0.3.1-1) UNRELEASED; urgency=medium
   * New upstream release
     - Removed 04-fix-compatibility.patch (fixed upstream)
     - Refreshed the patches
+    - Reverted the scope of the guice dependency from 'provided' to 'compile'
+      to remain compatible with sisu-inject 0.0.0.M5 and build Maven 3.1.
   * Removed the unused build dependency on libfelix-framework-java
   * debian/copyright: Fixed the Source URL
 
diff --git a/debian/patches/05-guice-dependency.patch b/debian/patches/05-guice-dependency.patch
new file mode 100644
index 0000000..785b621
--- /dev/null
+++ b/debian/patches/05-guice-dependency.patch
@@ -0,0 +1,13 @@
+Description: Change the scope of the guice dependency (provided->compile as in sisu-inject 0.0.0.M5) to be able to compile Maven 3.1.x
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/org.eclipse.sisu.inject/pom.xml
++++ b/org.eclipse.sisu.inject/pom.xml
+@@ -34,7 +34,6 @@
+       <groupId>com.google.inject</groupId>
+       <artifactId>guice</artifactId>
+       <version>3.0</version>
+-      <scope>provided</scope>
+     </dependency>
+     <dependency>
+       <groupId>com.google.inject.extensions</groupId>
diff --git a/debian/patches/series b/debian/patches/series
index 404feb6..f72ecd7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 01-drop-maven3-prereq.patch
 02-change-packaging-type.patch
 03-add-missing-dependencies.patch
+05-guice-dependency.patch

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