[pkg-java] r19082 - in trunk/derby/debian: . wrappers

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2016-06-03 17:08:26 +0000 (Fri, 03 Jun 2016)
New Revision: 19082

Modified:
   trunk/derby/debian/ant.properties
   trunk/derby/debian/changelog
   trunk/derby/debian/control
   trunk/derby/debian/wrappers/NetworkServerControl
   trunk/derby/debian/wrappers/PlanExporter
   trunk/derby/debian/wrappers/SignatureChecker
   trunk/derby/debian/wrappers/dblook
   trunk/derby/debian/wrappers/ij
Log:
Transition to the Servlet API 3.1



Modified: trunk/derby/debian/ant.properties
===================================================================
--- trunk/derby/debian/ant.properties	2016-06-03 15:33:12 UTC (rev 19081)
+++ trunk/derby/debian/ant.properties	2016-06-03 17:08:26 UTC (rev 19082)
@@ -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

Modified: trunk/derby/debian/changelog
===================================================================
--- trunk/derby/debian/changelog	2016-06-03 15:33:12 UTC (rev 19081)
+++ trunk/derby/debian/changelog	2016-06-03 17:08:26 UTC (rev 19082)
@@ -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

Modified: trunk/derby/debian/control
===================================================================
--- trunk/derby/debian/control	2016-06-03 15:33:12 UTC (rev 19081)
+++ trunk/derby/debian/control	2016-06-03 17:08:26 UTC (rev 19082)
@@ -9,7 +9,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 @@
 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

Modified: trunk/derby/debian/wrappers/NetworkServerControl
===================================================================
--- trunk/derby/debian/wrappers/NetworkServerControl	2016-06-03 15:33:12 UTC (rev 19081)
+++ trunk/derby/debian/wrappers/NetworkServerControl	2016-06-03 17:08:26 UTC (rev 19082)
@@ -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 "$@"

Modified: trunk/derby/debian/wrappers/PlanExporter
===================================================================
--- trunk/derby/debian/wrappers/PlanExporter	2016-06-03 15:33:12 UTC (rev 19081)
+++ trunk/derby/debian/wrappers/PlanExporter	2016-06-03 17:08:26 UTC (rev 19082)
@@ -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 "$@"

Modified: trunk/derby/debian/wrappers/SignatureChecker
===================================================================
--- trunk/derby/debian/wrappers/SignatureChecker	2016-06-03 15:33:12 UTC (rev 19081)
+++ trunk/derby/debian/wrappers/SignatureChecker	2016-06-03 17:08:26 UTC (rev 19082)
@@ -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 "$@"

Modified: trunk/derby/debian/wrappers/dblook
===================================================================
--- trunk/derby/debian/wrappers/dblook	2016-06-03 15:33:12 UTC (rev 19081)
+++ trunk/derby/debian/wrappers/dblook	2016-06-03 17:08:26 UTC (rev 19082)
@@ -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 "$@"

Modified: trunk/derby/debian/wrappers/ij
===================================================================
--- trunk/derby/debian/wrappers/ij	2016-06-03 15:33:12 UTC (rev 19081)
+++ trunk/derby/debian/wrappers/ij	2016-06-03 17:08:26 UTC (rev 19082)
@@ -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 "$@"