[derby] 39/53: 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 derby.

commit 6d5f93eb9b66bffb9ecf16355e696b8a5a6e21a3
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Jun 3 17:08:26 2016 +0000

    Transition to the Servlet API 3.1
---
 debian/ant.properties                | 2 +-
 debian/changelog                     | 6 ++++++
 debian/control                       | 3 +--
 debian/wrappers/NetworkServerControl | 2 +-
 debian/wrappers/PlanExporter         | 2 +-
 debian/wrappers/SignatureChecker     | 2 +-
 debian/wrappers/dblook               | 2 +-
 debian/wrappers/ij                   | 2 +-
 8 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/debian/ant.properties b/debian/ant.properties
index daa3ac7..7f70bef 100644
--- a/debian/ant.properties
+++ b/debian/ant.properties
@@ -2,4 +2,4 @@
 sane=false
 deprecation=off
 junit=/usr/share/java/junit.jar
-servlet24=/usr/share/java/servlet-api-3.0.jar
+servlet24=/usr/share/java/servlet-api-3.1.jar
diff --git a/debian/changelog b/debian/changelog
index d0c3bc2..3441838 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+derby (10.10.2.0-2) UNRELEASED; urgency=medium
+
+  * Transition to the Servlet API 3.1
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Fri, 03 Jun 2016 18:52:32 +0200
+
 derby (10.10.2.0-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/debian/control b/debian/control
index 69e9209..766a07c 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends: ant (>= 1.7),
                javacc (>= 5.0-5),
                junit,
                liboro-java,
-               libservlet3.0-java,
+               libservlet3.1-java,
                maven-repo-helper
 Standards-Version: 3.9.5
 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/derby
@@ -33,7 +33,6 @@ Description: Apache Derby Client JDBC Driver
 Package: libderby-java
 Architecture: all
 Depends: ${misc:Depends}
-Recommends: libservlet3.0-java
 Suggests: derby-doc
 Description: Apache Derby Database Engine and Embedded JDBC Driver
  Apache Derby is an open source relational database implemented entirely
diff --git a/debian/wrappers/NetworkServerControl b/debian/wrappers/NetworkServerControl
index a7a5147..6957e95 100644
--- a/debian/wrappers/NetworkServerControl
+++ b/debian/wrappers/NetworkServerControl
@@ -5,6 +5,6 @@
 
 find_java_runtime
 
-JAVA_CLASSPATH=/usr/share/java/derbyclient.jar:/usr/share/java/derbytools.jar:/usr/share/java/derbynet.jar:/usr/share/java/servlet-api-3.0.jar
+JAVA_CLASSPATH=/usr/share/java/derbyclient.jar:/usr/share/java/derbytools.jar:/usr/share/java/derbynet.jar:/usr/share/java/servlet-api-3.1.jar
 
 run_java org.apache.derby.drda.NetworkServerControl -noSecurityManager "$@"
diff --git a/debian/wrappers/PlanExporter b/debian/wrappers/PlanExporter
index 68d745b..aa25f1a 100644
--- a/debian/wrappers/PlanExporter
+++ b/debian/wrappers/PlanExporter
@@ -5,6 +5,6 @@
 
 find_java_runtime
 
-JAVA_CLASSPATH=/usr/share/java/derbyclient.jar:/usr/share/java/derbytools.jar:/usr/share/java/derbynet.jar:/usr/share/java/servlet-api-3.0.jar
+JAVA_CLASSPATH=/usr/share/java/derbyclient.jar:/usr/share/java/derbytools.jar:/usr/share/java/derbynet.jar:/usr/share/java/servlet-api-3.1.jar
 
 run_java org.apache.derby.tools.PlanExporter "$@"
diff --git a/debian/wrappers/SignatureChecker b/debian/wrappers/SignatureChecker
index d54850f..08e1756 100644
--- a/debian/wrappers/SignatureChecker
+++ b/debian/wrappers/SignatureChecker
@@ -5,6 +5,6 @@
 
 find_java_runtime
 
-JAVA_CLASSPATH=/usr/share/java/derbyclient.jar:/usr/share/java/derbytools.jar:/usr/share/java/derbynet.jar:/usr/share/java/servlet-api-3.0.jar
+JAVA_CLASSPATH=/usr/share/java/derbyclient.jar:/usr/share/java/derbytools.jar:/usr/share/java/derbynet.jar:/usr/share/java/servlet-api-3.1.jar
 
 run_java org.apache.derby.tools.SignatureChecker "$@"
diff --git a/debian/wrappers/dblook b/debian/wrappers/dblook
index 4c6fc73..5c24fa9 100644
--- a/debian/wrappers/dblook
+++ b/debian/wrappers/dblook
@@ -5,6 +5,6 @@
 
 find_java_runtime
 
-JAVA_CLASSPATH=/usr/share/java/derbyclient.jar:/usr/share/java/derbytools.jar:/usr/share/java/derbynet.jar:/usr/share/java/servlet-api-3.0.jar
+JAVA_CLASSPATH=/usr/share/java/derbyclient.jar:/usr/share/java/derbytools.jar:/usr/share/java/derbynet.jar:/usr/share/java/servlet-api-3.1.jar
 
 run_java org.apache.derby.tools.dblook "$@"
diff --git a/debian/wrappers/ij b/debian/wrappers/ij
index 25b598d..4055d99 100644
--- a/debian/wrappers/ij
+++ b/debian/wrappers/ij
@@ -5,6 +5,6 @@
 
 find_java_runtime
 
-JAVA_CLASSPATH=/usr/share/java/derbyclient.jar:/usr/share/java/derbytools.jar:/usr/share/java/derbynet.jar:/usr/share/java/servlet-api-3.0.jar
+JAVA_CLASSPATH=/usr/share/java/derbyclient.jar:/usr/share/java/derbytools.jar:/usr/share/java/derbynet.jar:/usr/share/java/servlet-api-3.1.jar
 
 run_java org.apache.derby.tools.ij "$@"

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