[Git][java-team/tomcat8][master] 2 commits: Split libservlet3.1-java into separate JavaEE API packages
Emmanuel Bourg
gitlab at salsa.debian.org
Wed Dec 12 16:07:25 GMT 2018
Emmanuel Bourg pushed to branch master at Debian Java Maintainers / tomcat8
Commits:
b6445edc by Emmanuel Bourg at 2018-12-12T15:31:41Z
Split libservlet3.1-java into separate JavaEE API packages
- - - - -
1271dbd5 by Emmanuel Bourg at 2018-12-12T15:48:06Z
Upload to unstable
- - - - -
9 changed files:
- debian/changelog
- debian/control
- + debian/libel-api-java.manifest
- + debian/libjsp-api-java.manifest
- debian/libservlet3.1-java.manifest
- − debian/libservlet3.1-java.poms
- debian/libtomcat8-java.poms
- + debian/libwebsocket-api-java.manifest
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,10 +1,12 @@
-tomcat8 (8.5.35-3) UNRELEASED; urgency=medium
+tomcat8 (8.5.35-3) unstable; urgency=medium
* Team upload.
+ * Split libservlet3.1-java into separate JavaEE API packages
+ (libjsp-api-java, libel-api-java and libwebsocket-api-java)
* Updated the version required for libtcnative-1 (>= 1.2.18)
* Install the Russian translation added in Tomcat 8.5.33
- -- Emmanuel Bourg <ebourg at apache.org> Tue, 20 Nov 2018 14:38:01 +0100
+ -- Emmanuel Bourg <ebourg at apache.org> Wed, 12 Dec 2018 16:48:01 +0100
tomcat8 (8.5.35-2) unstable; urgency=medium
=====================================
debian/control
=====================================
@@ -117,13 +117,13 @@ Description: Apache Tomcat 8 - Servlet and JSP engine -- embed libraries
Package: libservlet3.1-java
Architecture: all
-Depends: ${misc:Depends}
-Description: Servlet 3.1, JSP 2.3, EL 3.0 and WebSocket 1.0 Java API classes
+Depends: ${misc:Depends}, libjsp-api-java, libel-api-java, libwebsocket-api-java
+Description: Servlet 3.1 API
Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
specifications from Oracle, and provides a "pure Java" HTTP web
server environment for Java code to run.
.
- This package contains the Java Servlet and JSP library.
+ This package contains the Java Servlet API.
Package: libservlet3.1-java-doc
Section: doc
@@ -137,6 +137,44 @@ Description: Servlet 3.1, JSP 2.3, EL 3.0 and WebSocket 1.0 Java API documentati
.
This package contains the documentation for the Java Servlet and JSP library.
+Package: libjsp-api-java
+Architecture: all
+Depends: ${misc:Depends}
+Breaks: libservlet3.1-java (<< 8.5.35-3~)
+Replaces: libservlet3.1-java (<< 8.5.35-3~)
+Description: JavaServer Pages API
+ JavaServer Pages (JSP) is the Java Platform, Enterprise Edition (Java EE)
+ technology for building applications for generating dynamic web content,
+ such as HTML, XHTML and XML. JSP technology enables the easy authoring
+ of web pages that create dynamic content with maximum power and flexibility.
+
+Package: libel-api-java
+Architecture: all
+Depends: ${misc:Depends}
+Breaks: libservlet3.1-java (<< 8.5.35-3~)
+Replaces: libservlet3.1-java (<< 8.5.35-3~)
+Description: Expression Language API
+ EL is a simple language designed to meet the needs of the presentation
+ layer in Java web applications.
+ .
+ It features:
+ * A simple syntax restricted to the evaluation of expressions
+ * Variables and nested properties
+ * Relational, logical, arithmetic, conditional, and empty operators
+ * Functions implemented as static methods on Java classes
+ * Lenient semantics where appropriate default values and type conversions
+ are provided to minimize exposing errors to end users
+
+Package: libwebsocket-api-java
+Architecture: all
+Depends: ${misc:Depends}
+Breaks: libservlet3.1-java (<< 8.5.35-3~)
+Replaces: libservlet3.1-java (<< 8.5.35-3~)
+Description: Java WebSocket API
+ Java API for WebSocket (JSR-356) defines a standard API for the development
+ of websocket applications, both on the server side as well as on the Java
+ client side.
+
Package: tomcat8-admin
Architecture: all
Depends: tomcat8-common (>= ${source:Version}), ${misc:Depends}
=====================================
debian/libel-api-java.manifest
=====================================
@@ -0,0 +1,10 @@
+usr/share/java/el-api-3.0.jar:
+ Bundle-ManifestVersion: 2
+ Bundle-Vendor: The Apache Software Foundation
+ 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="3.0.0"
+ Import-Package: javax.servlet;version="2.6.0",javax.servlet.http;version="3.1.0"
=====================================
debian/libjsp-api-java.manifest
=====================================
@@ -0,0 +1,10 @@
+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.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
+ Bundle-SymbolicName: javax.servlet.jsp
+ Bundle-Name: Java Server Pages API Bundle
+ Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,JavaSE-1.7
+ Bundle-Localization: plugin
+ Bundle-Vendor: The Apache Software Foundation
=====================================
debian/libservlet3.1-java.manifest
=====================================
@@ -1,25 +1,3 @@
-usr/share/java/el-api-3.0.jar:
- Bundle-ManifestVersion: 2
- Bundle-Vendor: The Apache Software Foundation
- 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="3.0.0"
- Import-Package: javax.servlet;version="2.6.0",javax.servlet.http;version="3.1.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.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
- Bundle-SymbolicName: javax.servlet.jsp
- Bundle-Name: Java Server Pages API Bundle
- Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,JavaSE-1.7
- Bundle-Localization: plugin
- Bundle-Vendor: The Apache Software Foundation
-
usr/share/java/servlet-api-3.1.jar:
Bundle-ManifestVersion: 2
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"
@@ -29,12 +7,3 @@ usr/share/java/servlet-api-3.1.jar:
Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,JavaSE-1.7
Bundle-Localization: plugin
Bundle-Vendor: The Apache Software Foundation
-
-usr/share/java/websocket-api-1.0.jar:
- Bundle-ManifestVersion: 2
- Export-Package: javax.websocket;version="1.0.0",javax.websocket.server;version="1.0.0"
- Bundle-Version: 1.0.0
- Bundle-SymbolicName: javax.websocket
- Bundle-Name: WebSocket API Bundle
- Bundle-RequiredExecutionEnvironment: JavaSE-1.7
- Bundle-Localization: plugin
=====================================
debian/libservlet3.1-java.poms deleted
=====================================
@@ -1,4 +0,0 @@
-debian/javaxpoms/servlet-api.pom --java-lib -s --usj-name=servlet-api --artifact=output/build/lib/servlet-api.jar
-debian/javaxpoms/jsp-api.pom --java-lib -s --usj-name=jsp-api --artifact=output/build/lib/jsp-api.jar
-debian/javaxpoms/el-api.pom --java-lib -s --usj-name=el-api --artifact=output/build/lib/el-api.jar
-debian/javaxpoms/websocket-api.pom --java-lib -s --usj-name=websocket-api --artifact=output/build/lib/websocket-api.jar
=====================================
debian/libtomcat8-java.poms
=====================================
@@ -25,3 +25,9 @@ debian/poms/tomcat-util-scan.pom --java-lib --usj-name=tomcat8-util-scan
debian/poms/tomcat-websocket.pom --java-lib --usj-name=tomcat8-websocket --artifact=output/build/lib/tomcat-websocket.jar
debian/poms/tomcat-websocket-api.pom --java-lib --usj-name=tomcat8-websocket-api --artifact=output/build/lib/websocket-api.jar
debian/poms/tomcat-catalina-jmx-remote.pom --java-lib --usj-name=tomcat8-catalina-jmx-remote --artifact=output/extras/catalina-jmx-remote.jar
+
+# JavaEE APIs
+debian/javaxpoms/servlet-api.pom --java-lib -s --usj-name=servlet-api --artifact=output/build/lib/servlet-api.jar --package=libservlet3.1-java
+debian/javaxpoms/jsp-api.pom --java-lib -s --usj-name=jsp-api --artifact=output/build/lib/jsp-api.jar --package=libjsp-api-java
+debian/javaxpoms/el-api.pom --java-lib -s --usj-name=el-api --artifact=output/build/lib/el-api.jar --package=libel-api-java
+debian/javaxpoms/websocket-api.pom --java-lib -s --usj-name=websocket-api --artifact=output/build/lib/websocket-api.jar --package=libwebsocket-api-java
=====================================
debian/libwebsocket-api-java.manifest
=====================================
@@ -0,0 +1,8 @@
+usr/share/java/websocket-api-1.0.jar:
+ Bundle-ManifestVersion: 2
+ Export-Package: javax.websocket;version="1.0.0",javax.websocket.server;version="1.0.0"
+ Bundle-Version: 1.0.0
+ Bundle-SymbolicName: javax.websocket
+ Bundle-Name: WebSocket API Bundle
+ Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+ Bundle-Localization: plugin
=====================================
debian/rules
=====================================
@@ -48,6 +48,14 @@ override_dh_install-indep:
&& rwmd5sum=`cat debian/default_root/index.html debian/default_root/META-INF/context.xml | md5sum - 2>/dev/null | cut -d " " -f1` \
&& sed "s/\@ROOT_WEBAPP_MD5SUM\@/$$rwmd5sum/" debian/tomcat8.postrm.in > debian/tomcat8.postrm
+override_dh_gencontrol:
+ dh_gencontrol
+
+ # Change the version of the JavaEE API packages
+ dh_gencontrol -plibjsp-api-java -- -v2.3~tomcat$(DEB_VERSION)
+ dh_gencontrol -plibel-api-java -- -v3.0~tomcat$(DEB_VERSION)
+ dh_gencontrol -plibwebsocket-api-java -- -v1.0~tomcat$(DEB_VERSION)
+
override_dh_auto_clean:
dh_auto_clean
-$(ANT) clean
View it on GitLab: https://salsa.debian.org/java-team/tomcat8/compare/231b17e0be53204fed6c70acc3a539881b94913c...1271dbd54b8d9f9f9835f03c773f1349ce3bf13c
--
View it on GitLab: https://salsa.debian.org/java-team/tomcat8/compare/231b17e0be53204fed6c70acc3a539881b94913c...1271dbd54b8d9f9f9835f03c773f1349ce3bf13c
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20181212/400487c7/attachment.html>
More information about the pkg-java-commits
mailing list