[pkg-java] r19096 - trunk/fop/debian

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2016-06-23 13:51:58 +0000 (Thu, 23 Jun 2016)
New Revision: 19096

Added:
   trunk/fop/debian/maven.rules
Modified:
   trunk/fop/debian/changelog
   trunk/fop/debian/control
   trunk/fop/debian/rules
Log:
Transition to the Servlet API 3.1



Modified: trunk/fop/debian/changelog
===================================================================
--- trunk/fop/debian/changelog	2016-06-22 07:52:10 UTC (rev 19095)
+++ trunk/fop/debian/changelog	2016-06-23 13:51:58 UTC (rev 19096)
@@ -1,3 +1,10 @@
+fop (1:2.1-4) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Transition to the Servlet API 3.1
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Thu, 23 Jun 2016 15:51:07 +0200
+
 fop (1:2.1-3) unstable; urgency=medium
 
   [ Alexis Bienvenüe ]

Modified: trunk/fop/debian/control
===================================================================
--- trunk/fop/debian/control	2016-06-22 07:52:10 UTC (rev 19095)
+++ trunk/fop/debian/control	2016-06-23 13:51:58 UTC (rev 19096)
@@ -16,7 +16,7 @@
                      libfontbox-java,
                      libmockito-java,
                      libqdox-java (>= 1.12),
-                     libservlet3.0-java,
+                     libservlet3.1-java,
                      libxalan2-java,
                      libxerces2-java,
                      libxml-commons-external-java,

Added: trunk/fop/debian/maven.rules
===================================================================
--- trunk/fop/debian/maven.rules	                        (rev 0)
+++ trunk/fop/debian/maven.rules	2016-06-23 13:51:58 UTC (rev 19096)
@@ -0,0 +1 @@
+javax.servlet s/servlet-api/javax.servlet-api/ * s/.*/3.1/ * *

Modified: trunk/fop/debian/rules
===================================================================
--- trunk/fop/debian/rules	2016-06-22 07:52:10 UTC (rev 19095)
+++ trunk/fop/debian/rules	2016-06-23 13:51:58 UTC (rev 19096)
@@ -5,7 +5,7 @@
 include /usr/share/cdbs/1/class/ant.mk
 
 JAVA_HOME            := /usr/lib/jvm/default-java
-DEB_JARS             := batik-all xml-apis-ext batik-libs xml-apis avalon-framework xercesImpl xmlParserAPIs xalan2 junit commons-io commons-logging xmlgraphics-commons servlet-api-3.0 fontbox # ant-junit junit xmlunit mockito-core
+DEB_JARS             := batik-all xml-apis-ext batik-libs xml-apis avalon-framework xercesImpl xmlParserAPIs xalan2 junit commons-io commons-logging xmlgraphics-commons servlet-api-3.1 fontbox # ant-junit junit xmlunit mockito-core
 DEB_ANT_BUILD_TARGET := package javadocs #junit #docs
 DEB_ANT_CLEAN_TARGET := distclean
 DEB_ANT_ARGS := -verbose