[pkg-java] r19077 - in trunk/libcommons-el-java/debian: . patches

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Fri Jun 3 14:40:11 UTC 2016


Author: ebourg-guest
Date: 2016-06-03 14:40:11 +0000 (Fri, 03 Jun 2016)
New Revision: 19077

Modified:
   trunk/libcommons-el-java/debian/ant.properties
   trunk/libcommons-el-java/debian/changelog
   trunk/libcommons-el-java/debian/control
   trunk/libcommons-el-java/debian/patches/0004-add-OSGi-metadata.patch
   trunk/libcommons-el-java/debian/rules
Log:
Transition to the Servlet API 3.1



Modified: trunk/libcommons-el-java/debian/ant.properties
===================================================================
--- trunk/libcommons-el-java/debian/ant.properties	2016-06-03 13:12:07 UTC (rev 19076)
+++ trunk/libcommons-el-java/debian/ant.properties	2016-06-03 14:40:11 UTC (rev 19077)
@@ -1,3 +1,3 @@
-jsp-api.jar=/usr/share/java/servlet-3.0.jar
+jsp-api.jar=/usr/share/java/servlet-3.1.jar
 junit.jar=/usr/share/java/junit.jar
 build.sysclasspath=only

Modified: trunk/libcommons-el-java/debian/changelog
===================================================================
--- trunk/libcommons-el-java/debian/changelog	2016-06-03 13:12:07 UTC (rev 19076)
+++ trunk/libcommons-el-java/debian/changelog	2016-06-03 14:40:11 UTC (rev 19077)
@@ -1,3 +1,9 @@
+libcommons-el-java (1.0-9) UNRELEASED; urgency=medium
+
+  * Transition to the Servlet API 3.1
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Fri, 03 Jun 2016 16:37:38 +0200
+
 libcommons-el-java (1.0-8) unstable; urgency=low
 
   * debian/control:

Modified: trunk/libcommons-el-java/debian/control
===================================================================
--- trunk/libcommons-el-java/debian/control	2016-06-03 13:12:07 UTC (rev 19076)
+++ trunk/libcommons-el-java/debian/control	2016-06-03 14:40:11 UTC (rev 19077)
@@ -4,7 +4,7 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Niels Thykier <niels at thykier.net>, Emmanuel Bourg <ebourg at apache.org>
 Build-Depends: debhelper (>= 7), cdbs, default-jdk, ant
-Build-Depends-Indep: junit (>= 3.8.1), libservlet3.0-java
+Build-Depends-Indep: junit (>= 3.8.1), libservlet3.1-java
 Standards-Version: 3.9.4
 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/libcommons-el-java
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/libcommons-el-java
@@ -12,7 +12,7 @@
 
 Package: libcommons-el-java
 Architecture: all
-Depends: libservlet3.0-java, ${misc:Depends}
+Depends: libservlet3.1-java, ${misc:Depends}
 Description: Implementation of the JSP 2.0 Expression Language interpreter
  The JSP 2.0 specification provides a portable API for evaluating "EL
  Expressions": The classes and interfaces in the javax.servlet.jsp.el

Modified: trunk/libcommons-el-java/debian/patches/0004-add-OSGi-metadata.patch
===================================================================
--- trunk/libcommons-el-java/debian/patches/0004-add-OSGi-metadata.patch	2016-06-03 13:12:07 UTC (rev 19076)
+++ trunk/libcommons-el-java/debian/patches/0004-add-OSGi-metadata.patch	2016-06-03 14:40:11 UTC (rev 19077)
@@ -12,10 +12,10 @@
  Implementation-Title: org.apache.commons.el
  Implementation-Vendor: Apache Software Foundation
  Implementation-Version: 1.0
-+Import-Package: javax.servlet;version="3.0",javax.servlet.http;version
-+ ="3.0",javax.servlet.jsp;version="2.2",javax.servlet.jsp.el;version="
-+ 2.2",javax.servlet.jsp.resources;version="2.2",javax.servlet.jsp.tage
-+ xt;version="2.2",javax.servlet.resources;version="3.0"
++Import-Package: javax.servlet;version="3.1",javax.servlet.http;version
++ ="3.1",javax.servlet.jsp;version="2.3",javax.servlet.jsp.el;version="
++ 2.3",javax.servlet.jsp.resources;version="2.3",javax.servlet.jsp.tage
++ xt;version="2.3",javax.servlet.resources;version="3.1"
 +Bundle-ManifestVersion: 2
 +Export-Package: org.apache.commons.el;version="1.0.0",org.apache.commo
 + ns.el.parser;version="1.0.0"

Modified: trunk/libcommons-el-java/debian/rules
===================================================================
--- trunk/libcommons-el-java/debian/rules	2016-06-03 13:12:07 UTC (rev 19076)
+++ trunk/libcommons-el-java/debian/rules	2016-06-03 14:40:11 UTC (rev 19077)
@@ -13,7 +13,7 @@
 
 JAVA_HOME := /usr/lib/jvm/default-java
 ANT_HOME := /usr/share/ant
-DEB_JARS := servlet-api-3.0 jsp-api-2.2 junit
+DEB_JARS := servlet-api-3.1 jsp-api-2.3 junit
 DEB_ANT_BUILD_TARGET := jar-only javadoc
 
 # Additional options to pass to the Java virtual machine




More information about the pkg-java-commits mailing list