[openid4java] 01/06: Transition to the Servlet API 3.1 (Closes: #801035)

[Emmanuel Bourg]

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

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

commit cc599e604010d73d6fd64aeb654bc989fa80366b
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Jun 20 18:12:03 2016 +0200

    Transition to the Servlet API 3.1 (Closes: #801035)
---
 debian/changelog                    | 5 +++++
 debian/control                      | 2 +-
 debian/libopenid4java-java.manifest | 2 +-
 debian/maven.rules                  | 1 +
 debian/patches/buildxml.patch       | 2 +-
 debian/pom.xml                      | 4 ++--
 6 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ed91128..546de06 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,11 @@
 openid4java (0.9.6.662-4) UNRELEASED; urgency=medium
 
   * Team upload.
+
+  [ Emmanuel Bourg ]
+  * Transition to the Servlet API 3.1 (Closes: #801035)
+
+  [ tony mancill ]
   * Remove Xavier Oswald from Uploaders.  Thank you for your contributions!
     (Closes: #824327)
 
diff --git a/debian/control b/debian/control
index 1f74a7c..774ca41 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 9), javahelper (>= 0.32), ant, maven-repo-helper
 Build-Depends-Indep: default-jdk, libcommons-codec-java,
  libcommons-logging-java, libcommons-httpclient-java, libehcache-java,
  libspring-transaction-java, libspring-jdbc-java, libnekohtml-java,
- libhttpcore-java, libhttpclient-java, libguice-java, libservlet2.5-java
+ libhttpcore-java, libhttpclient-java, libguice-java, libservlet3.1-java
 Standards-Version: 3.9.7
 Homepage: https://github.com/jbufu/openid4java
 Vcs-Git: git://anonscm.debian.org/pkg-java/openid4java.git
diff --git a/debian/libopenid4java-java.manifest b/debian/libopenid4java-java.manifest
index 2fcbf9d..449ef0f 100644
--- a/debian/libopenid4java-java.manifest
+++ b/debian/libopenid4java-java.manifest
@@ -1,3 +1,3 @@
 usr/share/java/openid4java.jar:
-         Class-Path: /usr/share/java/commons-codec.jar /usr/share/java/commons-logging.jar /usr/share/java/httpclient.jar /usr/share/java/httpcore.jar /usr/share/java/guice.jar /usr/share/java/ehcache.jar /usr/share/java/spring3-transaction.jar /usr/share/java/spring3-jdbc.jar /usr/share/java/spring3-core.jar /usr/share/java/spring3-beans.jar /usr/share/java/xercesImpl.jar /usr/share/java/nekohtml.jar /usr/share/java/servlet-api-2.5.jar
+         Class-Path: /usr/share/java/commons-codec.jar /usr/share/java/commons-logging.jar /usr/share/java/httpclient.jar /usr/share/java/httpcore.jar /usr/share/java/guice.jar /usr/share/java/ehcache.jar /usr/share/java/spring3-transaction.jar /usr/share/java/spring3-jdbc.jar /usr/share/java/spring3-core.jar /usr/share/java/spring3-beans.jar /usr/share/java/xercesImpl.jar /usr/share/java/nekohtml.jar
 
diff --git a/debian/maven.rules b/debian/maven.rules
index a468698..dc2801e 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1 +1,2 @@
 org.springframework * jar s/.*/3.x/ * *
+javax.servlet javax.servlet-api * * * *
diff --git a/debian/patches/buildxml.patch b/debian/patches/buildxml.patch
index 1732fa4..cb569ea 100644
--- a/debian/patches/buildxml.patch
+++ b/debian/patches/buildxml.patch
@@ -22,7 +22,7 @@ Index: openid4java-0.9.5.593/build.xml
 +                <include name="httpclient.jar"/>
 +                <include name="httpcore.jar"/>
 +                <include name="ehcache.jar"/>
-+                <include name="servlet-api-2.5.jar"/>
++                <include name="servlet-api-3.1.jar"/>
 +                <include name="spring3-transaction.jar"/>
 +                <include name="spring3-jdbc.jar"/>
 +                <include name="spring3-core.jar"/>
diff --git a/debian/pom.xml b/debian/pom.xml
index 72e9870..6976375 100644
--- a/debian/pom.xml
+++ b/debian/pom.xml
@@ -51,8 +51,8 @@
     <!-- Sample Consumer -->
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>debian</version>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.1</version>
     </dependency>
 
   </dependencies>

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