[libcommons-jxpath-java] 02/05: Transition to the Servlet API 3.1

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository libcommons-jxpath-java.

commit 0a3f8fcebffa4bd274ef6adbfd947bca99f03e67
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Jun 3 17:38:06 2016 +0200

    Transition to the Servlet API 3.1
---
 debian/ant.properties | 2 +-
 debian/changelog      | 1 +
 debian/control        | 2 +-
 debian/maven.rules    | 4 ++--
 debian/rules          | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian/ant.properties b/debian/ant.properties
index e6b0f5a..bbdf602 100644
--- a/debian/ant.properties
+++ b/debian/ant.properties
@@ -3,7 +3,7 @@ final.name=commons-jxpath-1.3
 junit.jar = /usr/share/java/junit.jar
 jaxp.jaxp.jar = /usr/share/java/jaxp.jaxp.jar
 jaxp.xslt.jar = /usr/share/java/jaxp.xslt.jar
-servlet.jar = /usr/share/java/servlet-3.0.jar
+servlet.jar = /usr/share/java/servlet-3.1.jar
 commons-beanutils.jar = /usr/share/java/commons-beanutils.jar
 commons-collections.jar = /usr/share/java/commons-collections.jar
 commons-logging.jar = /usr/share/java/commons-logging.jar
diff --git a/debian/changelog b/debian/changelog
index bbb95f5..c819c5a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 libcommons-jxpath-java (1.3-9) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Transition to the Servlet API 3.1
   * Standards-Version updated to 3.9.8 (no changes)
 
  -- Emmanuel Bourg <ebourg at apache.org>  Fri, 03 Jun 2016 18:23:17 +0200
diff --git a/debian/control b/debian/control
index 28f7571..964b589 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends: ant,
                libcommons-collections3-java,
                libcommons-logging-java,
                libjdom1-java,
-               libservlet3.0-java,
+               libservlet3.1-java,
                maven-repo-helper,
                bnd (>= 2.1.0)
 Standards-Version: 3.9.8
diff --git a/debian/maven.rules b/debian/maven.rules
index a373bef..b553637 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,5 +1,5 @@
 
 commons-jxpath commons-jxpath jar s/.*/debian/ * *
 commons-logging s/commons-logging-api/commons-logging/ * s/.*/debian/ * *
-javax.servlet jsp-api jar s/.*/2.2/ * *
-javax.servlet servlet-api jar s/.*/3.0/ * *
+s/javax.servlet/javax.servlet.jsp/ s/jsp-api/javax.servlet.jsp-api/ jar s/.*/2.3/ * *
+javax.servlet s/servlet-api/javax.servlet-api/ jar s/.*/3.1/ * *
diff --git a/debian/rules b/debian/rules
index a658beb..8155200 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@ include /usr/share/cdbs/1/class/ant.mk
 
 JAVA_HOME	     := /usr/lib/jvm/default-java
 ANT_HOME             := /usr/share/ant
-DEB_JARS             := junit jdom1 servlet-api-3.0 jsp-api-2.2 commons-beanutils common-collections3 commons-logging
+DEB_JARS             := junit jdom1 servlet-api-3.1 jsp-api-2.3 commons-beanutils common-collections3 commons-logging
 DEB_ANT_BUILD_TARGET := jar javadoc
 DEB_ANT_CLEAN_TARGET := clean
 

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