This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository tomcat8.
commit 29e7b4ce7e572aa29a5e8224cac655ddbdd37113 Author: Emmanuel Bourg <[email protected]> Date: Thu Sep 12 15:51:49 2013 +0200 Updated the version of the Servlet, JSP and EL APIs --- debian/control | 12 ++++----- debian/libservlet3.0-java-doc.doc-base | 10 -------- debian/libservlet3.0-java-doc.install | 1 - debian/libservlet3.0-java-doc.links | 1 - debian/libservlet3.0-java.links | 3 --- debian/libservlet3.1-java-doc.doc-base | 10 ++++++++ debian/libservlet3.1-java-doc.install | 1 + debian/libservlet3.1-java-doc.links | 1 + debian/libservlet3.1-java.links | 3 +++ ...0-java.manifest => libservlet3.1-java.manifest} | 22 ++++++++--------- ...ervlet3.0-java.poms => libservlet3.1-java.poms} | 0 debian/maven.rules | 12 ++++----- debian/rules | 26 ++++++++++---------- 13 files changed, 51 insertions(+), 51 deletions(-) diff --git a/debian/control b/debian/control index aeef38f..c0633b6 100644 --- a/debian/control +++ b/debian/control @@ -69,7 +69,7 @@ Architecture: all Depends: libecj-java, libcommons-pool-java, libcommons-dbcp-java, - libservlet3.0-java (>= ${source:Version}), ${misc:Depends} + libservlet3.1-java (>= ${source:Version}), ${misc:Depends} Conflicts: libtomcat6-java Suggests: tomcat8 (>= ${source:Version}) Description: Servlet and JSP engine -- core libraries @@ -80,22 +80,22 @@ Description: Servlet and JSP engine -- core libraries This package contains the Tomcat core classes which can be used by other Java applications to embed Tomcat. -Package: libservlet3.0-java +Package: libservlet3.1-java Architecture: all Depends: ${misc:Depends} -Description: Servlet 3.0 and JSP 2.2 Java API classes +Description: Servlet 3.1 and JSP 2.3 Java API classes Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP) specifications from Sun Microsystems, and provides a "pure Java" HTTP web server environment for Java code to run. . This package contains the Java Servlet and JSP library. -Package: libservlet3.0-java-doc +Package: libservlet3.1-java-doc Section: doc Architecture: all Depends: ${misc:Depends} -Suggests: libservlet3.0-java (>= ${source:Version}) -Description: Servlet 3.0 and JSP 2.2 Java API documentation +Suggests: libservlet3.1-java (>= ${source:Version}) +Description: Servlet 3.1 and JSP 2.3 Java API documentation Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP) specifications from Sun Microsystems, and provides a "pure Java" HTTP web server environment for Java code to run. diff --git a/debian/libservlet3.0-java-doc.doc-base b/debian/libservlet3.0-java-doc.doc-base deleted file mode 100644 index 86178b5..0000000 --- a/debian/libservlet3.0-java-doc.doc-base +++ /dev/null @@ -1,10 +0,0 @@ -Document: servlet30-api -Title: Java Servlet 3.0 API Documentation -Author: Apache Software Foundation -Abstract: Javadoc documentation for Java Servlet 3.0 API. -Section: Programming - -Format: HTML -Index: /usr/share/doc/libservlet3.0-java/api/index.html -Files: /usr/share/doc/libservlet3.0-java/api/* - diff --git a/debian/libservlet3.0-java-doc.install b/debian/libservlet3.0-java-doc.install deleted file mode 100644 index 58190cd..0000000 --- a/debian/libservlet3.0-java-doc.install +++ /dev/null @@ -1 +0,0 @@ -output/api /usr/share/doc/libservlet3.0-java/ diff --git a/debian/libservlet3.0-java-doc.links b/debian/libservlet3.0-java-doc.links deleted file mode 100644 index 204d4e9..0000000 --- a/debian/libservlet3.0-java-doc.links +++ /dev/null @@ -1 +0,0 @@ -/usr/share/doc/libservlet3.0-java/api /usr/share/doc/libservlet3.0-java-doc/api diff --git a/debian/libservlet3.0-java.links b/debian/libservlet3.0-java.links deleted file mode 100644 index 794f24d..0000000 --- a/debian/libservlet3.0-java.links +++ /dev/null @@ -1,3 +0,0 @@ -/usr/share/java/servlet-api-3.0.jar /usr/share/java/tomcat-servlet-api-3.0.jar -/usr/share/java/jsp-api-2.2.jar /usr/share/java/tomcat-jsp-api-2.2.jar -/usr/share/java/el-api-2.2.jar /usr/share/java/tomcat-el-api-2.2.jar diff --git a/debian/libservlet3.1-java-doc.doc-base b/debian/libservlet3.1-java-doc.doc-base new file mode 100644 index 0000000..57808e3 --- /dev/null +++ b/debian/libservlet3.1-java-doc.doc-base @@ -0,0 +1,10 @@ +Document: servlet30-api +Title: Java Servlet 3.1 API Documentation +Author: Apache Software Foundation +Abstract: Javadoc documentation for Java Servlet 3.1 API. +Section: Programming + +Format: HTML +Index: /usr/share/doc/libservlet3.1-java/api/index.html +Files: /usr/share/doc/libservlet3.1-java/api/* + diff --git a/debian/libservlet3.1-java-doc.install b/debian/libservlet3.1-java-doc.install new file mode 100644 index 0000000..28d65b2 --- /dev/null +++ b/debian/libservlet3.1-java-doc.install @@ -0,0 +1 @@ +output/api /usr/share/doc/libservlet3.1-java/ diff --git a/debian/libservlet3.1-java-doc.links b/debian/libservlet3.1-java-doc.links new file mode 100644 index 0000000..fe2240c --- /dev/null +++ b/debian/libservlet3.1-java-doc.links @@ -0,0 +1 @@ +/usr/share/doc/libservlet3.1-java/api /usr/share/doc/libservlet3.1-java-doc/api diff --git a/debian/libservlet3.1-java.links b/debian/libservlet3.1-java.links new file mode 100644 index 0000000..a692163 --- /dev/null +++ b/debian/libservlet3.1-java.links @@ -0,0 +1,3 @@ +/usr/share/java/servlet-api-3.1.jar /usr/share/java/tomcat-servlet-api-3.1.jar +/usr/share/java/jsp-api-2.3.jar /usr/share/java/tomcat-jsp-api-2.3.jar +/usr/share/java/el-api-3.0.jar /usr/share/java/tomcat-el-api-3.0.jar diff --git a/debian/libservlet3.0-java.manifest b/debian/libservlet3.1-java.manifest similarity index 50% rename from debian/libservlet3.0-java.manifest rename to debian/libservlet3.1-java.manifest index ebb0764..b1bc6bb 100644 --- a/debian/libservlet3.0-java.manifest +++ b/debian/libservlet3.1-java.manifest @@ -1,29 +1,29 @@ -usr/share/java/el-api-2.2.jar: +usr/share/java/el-api-3.0.jar: Bundle-ManifestVersion: 2 Bundle-Vendor: Apache Software Foundation - Bundle-Version: 2.2.0 + Bundle-Version: 3.0.0 Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Name: Javax Expression Language Bundle Bundle-SymbolicName: javax.el - Export-Package: javax.el;version="2.2.0" - Import-Package: javax.servlet;version="2.6.0",javax.servlet.http;version="2.6.0" + Export-Package: javax.el;version="3.0.0" + Import-Package: javax.servlet;version="2.6.0",javax.servlet.http;version="3.1.0" -usr/share/java/jsp-api-2.2.jar: - Import-Package: javax.servlet;version="2.6.0",javax.servlet.http;version="2.6.0",javax.servlet.resources;version="2.6.0",javax.el;version="2.2.0" +usr/share/java/jsp-api-2.3.jar: + Import-Package: javax.servlet;version="3.1.0",javax.servlet.http;version="3.1.0",javax.servlet.resources;version="3.1.0",javax.el;version="3.0.0" Bundle-ManifestVersion: 2 - Export-Package: javax.servlet.jsp; version=2.2,javax.servlet.jsp.el; version=2.2,javax.servlet.jsp.resources; version=2.2,javax.servlet.jsp.tagext; version=2.2 - Bundle-Version: 2.2.0.v201103241327 + Export-Package: javax.servlet.jsp; version=2.3,javax.servlet.jsp.el; version=2.3,javax.servlet.jsp.resources; version=2.3,javax.servlet.jsp.tagext; version=2.3 + Bundle-Version: 2.3.0.v201103241327 Bundle-SymbolicName: javax.servlet.jsp Bundle-Name: Java Server Pages API Bundle Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,JavaSE-1.6 Bundle-Localization: plugin Bundle-Vendor: Apache Software Foundation -usr/share/java/servlet-api-3.0.jar: +usr/share/java/servlet-api-3.1.jar: Bundle-ManifestVersion: 2 - Export-Package: javax.servlet;version="2.6.0",javax.servlet.annotation;version="2.6.0",javax.servlet.descriptor;version="2.6.0",javax.servlet.http;version="2.6.0",javax.servlet.resources;version="2.6.0" - Bundle-Version: 3.0.0.v201103241327 + Export-Package: javax.servlet;version="3.1.0",javax.servlet.annotation;version="3.1.0",javax.servlet.descriptor;version="3.1.0",javax.servlet.http;version="3.1.0",javax.servlet.resources;version="3.1.0" + Bundle-Version: 3.1.0.v201103241327 Bundle-SymbolicName: javax.servlet Bundle-Name: Servlet API Bundle Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,JavaSE-1.6 diff --git a/debian/libservlet3.0-java.poms b/debian/libservlet3.1-java.poms similarity index 100% rename from debian/libservlet3.0-java.poms rename to debian/libservlet3.1-java.poms diff --git a/debian/maven.rules b/debian/maven.rules index 0d2e7d1..593184b 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -1,8 +1,8 @@ # Force the version of the javax apis -javax.servlet servlet-api jar s/.*/3.0/ -javax.servlet.jsp jsp-api jar s/.*/2.2/ -javax.el el-api jar s/.*/2.2/ +javax.servlet servlet-api jar s/.*/3.1/ +javax.servlet.jsp jsp-api jar s/.*/2.3/ +javax.el el-api jar s/.*/3.0/ # Convert tomcat version of the standard apis to the javax apis -#s/org.apache.tomcat/javax.servlet/ s/tomcat-servlet-api/servlet-api/ jar s/.*/3.0/ -#s/org.apache.tomcat/javax.servlet.jsp/ s/tomcat-jsp-api/jsp-api/ jar s/.*/2.2/ -#s/org.apache.tomcat/javax.el/ s/tomcat-el-api/el-api/ jar s/.*/2.2/ +#s/org.apache.tomcat/javax.servlet/ s/tomcat-servlet-api/servlet-api/ jar s/.*/3.1/ +#s/org.apache.tomcat/javax.servlet.jsp/ s/tomcat-jsp-api/jsp-api/ jar s/.*/2.3/ +#s/org.apache.tomcat/javax.el/ s/tomcat-el-api/el-api/ jar s/.*/3.0/ diff --git a/debian/rules b/debian/rules index 0516f91..9dae9e2 100755 --- a/debian/rules +++ b/debian/rules @@ -99,17 +99,17 @@ binary-indep: build install dh_installcron mkdir -p debian/poms cp res/maven/*.pom debian/poms - perl -p -i -e 's/\@MAVEN.DEPLOY.VERSION\@/3.0/' \ + perl -p -i -e 's/\@MAVEN.DEPLOY.VERSION\@/3.1/' \ debian/poms/tomcat-servlet-api.pom - perl -p -i -e 's/\@MAVEN.DEPLOY.VERSION\@/3.0/' \ + perl -p -i -e 's/\@MAVEN.DEPLOY.VERSION\@/3.1/' \ debian/javaxpoms/servlet-api.pom - perl -p -i -e 's/\@MAVEN.DEPLOY.VERSION\@/2.2/' \ + perl -p -i -e 's/\@MAVEN.DEPLOY.VERSION\@/3.0/' \ debian/poms/tomcat-el-api.pom - perl -p -i -e 's/\@MAVEN.DEPLOY.VERSION\@/2.2/' \ + perl -p -i -e 's/\@MAVEN.DEPLOY.VERSION\@/3.0/' \ debian/javaxpoms/el-api.pom - perl -p -i -e 's/\@MAVEN.DEPLOY.VERSION\@/2.2/' \ + perl -p -i -e 's/\@MAVEN.DEPLOY.VERSION\@/2.3/' \ debian/poms/tomcat-jsp-api.pom - perl -p -i -e 's/\@MAVEN.DEPLOY.VERSION\@/2.2/' \ + perl -p -i -e 's/\@MAVEN.DEPLOY.VERSION\@/2.3/' \ debian/javaxpoms/jsp-api.pom perl -p -i -e 's/\@MAVEN.DEPLOY.VERSION\@/$(T_VER)/' \ debian/poms/*.pom @@ -154,23 +154,23 @@ binary-indep: build install usr/share/tomcat8/lib/$$i.jar; done dh_install --exclude=.bat --exclude=Thumbs.db dh_link - mh_installpoms -plibservlet3.0-java - mh_installjar -plibservlet3.0-java -l -s \ + mh_installpoms -plibservlet3.1-java + mh_installjar -plibservlet3.1-java -l -s \ debian/poms/tomcat-servlet-api.pom \ output/build/lib/servlet-api.jar - mh_installjar -plibservlet3.0-java -l -s \ + mh_installjar -plibservlet3.1-java -l -s \ debian/javaxpoms/servlet-api.pom \ output/build/lib/servlet-api.jar - mh_installjar -plibservlet3.0-java -l -s \ + mh_installjar -plibservlet3.1-java -l -s \ debian/poms/tomcat-jsp-api.pom \ output/build/lib/jsp-api.jar - mh_installjar -plibservlet3.0-java -l -s \ + mh_installjar -plibservlet3.1-java -l -s \ debian/javaxpoms/jsp-api.pom \ output/build/lib/jsp-api.jar - mh_installjar -plibservlet3.0-java -l -s \ + mh_installjar -plibservlet3.1-java -l -s \ debian/poms/tomcat-el-api.pom \ output/build/lib/el-api.jar - mh_installjar -plibservlet3.0-java -l -s \ + mh_installjar -plibservlet3.1-java -l -s \ debian/javaxpoms/el-api.pom \ output/build/lib/el-api.jar rm -r debian/poms -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat8.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
