[sisu-inject] 04/08: Refreshed the patches

[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 e7e7c7dd94ed68b77cd89239e9862e1ee708c628
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Jul 6 13:44:27 2015 +0200

    Refreshed the patches
---
 debian/changelog                                 |  1 +
 debian/control                                   |  2 ++
 debian/maven.rules                               |  2 ++
 debian/patches/01-drop-maven3-prereq.patch       |  2 +-
 debian/patches/03-add-missing-dependencies.patch | 22 ++++++++++++++++++++--
 5 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e372ed5..21350a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ sisu-inject (0.3.1-1) UNRELEASED; urgency=medium
 
   * New upstream release
     - Removed 04-fix-compatibility.patch (fixed upstream)
+    - Refreshed the patches
   * Removed the unused build dependency on libfelix-framework-java
   * debian/copyright: Fixed the Source URL
 
diff --git a/debian/control b/debian/control
index 8b19a36..dfcd961 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,9 @@ Build-Depends: cdbs,
                libguice-java,
                liblogback-java,
                libosgi-core-java,
+               libservlet3.1-java,
                libslf4j-java,
+               libtomcat8-java,
                maven-debian-helper (>= 1.5),
                testng
 Standards-Version: 3.9.6
diff --git a/debian/maven.rules b/debian/maven.rules
index c291623..69b3c21 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -5,5 +5,7 @@ org.eclipse.sisu org.eclipse.sisu.inject.extender eclipse-plugin s/.*/debian/ *
 org.eclipse.sisu org.eclipse.sisu.inject.tests jar s/.*/debian/ * *
 org.eclipse.sisu sisu-inject pom s/.*/debian/ * *
 org.testng testng jar s/6\..*/6.x/ * *
+s/javax.annotation/org.apache.tomcat/ s/javax.annotation-api/tomcat-annotations-api/ * s/.*/8.x/ * *
 s/org.apache.felix/org.osgi/ org.osgi.core * * * *
+org.apache.tomcat tomcat-annotations-api * s/.*/8.x/ * *
 org.testng testng * s/.*/6.x/ * *
diff --git a/debian/patches/01-drop-maven3-prereq.patch b/debian/patches/01-drop-maven3-prereq.patch
index 3230861..b098ad8 100644
--- a/debian/patches/01-drop-maven3-prereq.patch
+++ b/debian/patches/01-drop-maven3-prereq.patch
@@ -8,7 +8,7 @@ Forwarded: not-needed
    </mailingLists>
  
 -  <prerequisites>
--    <maven>3.0</maven>
+-    <maven>3.0.4</maven>
 -  </prerequisites>
 -
    <modules>
diff --git a/debian/patches/03-add-missing-dependencies.patch b/debian/patches/03-add-missing-dependencies.patch
index 411d632..2c721ae 100644
--- a/debian/patches/03-add-missing-dependencies.patch
+++ b/debian/patches/03-add-missing-dependencies.patch
@@ -3,17 +3,35 @@ Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: not-needed
 --- a/org.eclipse.sisu.inject/pom.xml
 +++ b/org.eclipse.sisu.inject/pom.xml
-@@ -32,6 +32,35 @@
-       <artifactId>guice</artifactId>
+@@ -36,6 +36,53 @@
        <version>3.0</version>
+       <scope>provided</scope>
      </dependency>
 +    <dependency>
++      <groupId>com.google.inject.extensions</groupId>
++      <artifactId>guice-servlet</artifactId>
++      <version>3.0</version>
++      <scope>provided</scope>
++    </dependency>
++    <dependency>
 +      <groupId>javax.enterprise</groupId>
 +      <artifactId>cdi-api</artifactId>
 +      <version>1.0</version>
 +      <scope>provided</scope>
 +    </dependency>
 +    <dependency>
++      <groupId>javax.annotation</groupId>
++      <artifactId>javax.annotation-api</artifactId>
++      <version>1.2</version>
++      <scope>provided</scope>
++    </dependency>
++    <dependency>
++      <groupId>javax.servlet</groupId>
++      <artifactId>servlet-api</artifactId>
++      <version>3.1</version>
++      <scope>provided</scope>
++    </dependency>
++    <dependency>
 +      <groupId>org.osgi</groupId>
 +      <artifactId>org.osgi.core</artifactId>
 +      <version>4.2.0</version>

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