debian/changelog

+tomcat8 (8.5.37-2) unstable; urgency=medium
+
+  * Team upload.
+  * No longer build the JavaEE API packages
+  * Standards-Version updated to 4.3.0
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Tue, 15 Jan 2019 01:01:24 +0100
+
 tomcat8 (8.5.37-1) unstable; urgency=medium
 
   * Team upload.

debian/control

@@ -24,7 +24,7 @@ Build-Depends:
  lsb-release,
  maven-repo-helper,
  po-debconf
-Standards-Version: 4.2.1
+Standards-Version: 4.3.0
 Vcs-Git: https://salsa.debian.org/java-team/tomcat8.git
 Vcs-Browser: https://salsa.debian.org/java-team/tomcat8
 Homepage: http://tomcat.apache.org
@@ -115,66 +115,6 @@ Description: Apache Tomcat 8 - Servlet and JSP engine -- embed libraries
  This package contains the libraries required to embed Tomcat into Java
  applications.
 
-Package: libservlet3.1-java
-Architecture: all
-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 API.
-
-Package: libservlet3.1-java-doc
-Section: doc
-Architecture: all
-Depends: ${misc:Depends}
-Suggests: libservlet3.1-java (>= ${source:Version})
-Description: Servlet 3.1, JSP 2.3, EL 3.0 and WebSocket 1.0 Java API documentation
- 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 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/javaxpoms/el-api.pom

-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>javax.el</groupId>
-  <artifactId>javax.el-api</artifactId>
-  <version>3.0</version>
-  <description>Expression language package</description>
-  <url>http://tomcat.apache.org/</url>
-  <licenses>
-    <license>
-      <name>Apache License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-</project>

debian/javaxpoms/jsp-api.pom

-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>javax.servlet.jsp</groupId>
-  <artifactId>javax.servlet.jsp-api</artifactId>
-  <version>2.3</version>
-  <description>JSP package</description>
-  <url>http://tomcat.apache.org/</url>
-  <licenses>
-    <license>
-      <name>Apache License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <dependencies>
-    <dependency>
-      <groupId>javax.el</groupId>
-      <artifactId>javax.el-api</artifactId>
-      <version>3.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
-      <version>3.1</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>

debian/javaxpoms/servlet-api.pom

-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>javax.servlet</groupId>
-  <artifactId>javax.servlet-api</artifactId>
-  <version>3.1</version>
-  <description>javax.servlet package</description>
-  <url>http://tomcat.apache.org/</url>
-  <licenses>
-    <license>
-      <name>
-        Apache License, Version 2.0 and
-        Common Development And Distribution License (CDDL) Version 1.0
-      </name>
-      <url>
-        http://www.apache.org/licenses/LICENSE-2.0.txt and
-        http://www.opensource.org/licenses/cddl1.txt
-      </url>
-      <distribution>repo</distribution>
-      <comments>
-        The Apache License, version 2.0 applies to all files apart from
-        javaee_5.xsd,
-        javaee_6.xsd,
-        javaee_7.xsd,
-        javaee_web_services_1_2.xsd,
-        javaee_web_services_client_1_2.xsd,
-        javaee_web_services_1_3.xsd,
-        javaee_web_services_client_1_3.xsd,
-        javaee_web_services_1_4.xsd,
-        javaee_web_services_client_1_4.xsd,
-        jsp_2_2.xsd,
-        jsp_2_3.xsd,
-        web-app_3_0.xsd,
-        web-common_3_0.xsd,
-        web-fragment_3_0.xsd,
-        web-app_3_1.xsd,
-        web-common_3_1.xsd and
-        web-fragment_3_1.xsd
-        to which the CDDL version 1.0 applies.
-      </comments>
-    </license>
-  </licenses>
-</project>

debian/javaxpoms/websocket-api.pom

-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>javax.websocket</groupId>
-  <artifactId>javax.websocket-api</artifactId>
-  <version>1.0</version>
-  <description>WebSocket (JSR356) API</description>
-  <url>http://tomcat.apache.org/</url>
-  <licenses>
-    <license>
-      <name>Apache License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-</project>

debian/libel-api-java.manifest

-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

-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-doc.doc-base

-Document: servlet31-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/*

debian/libservlet3.1-java-doc.install

-output/api /usr/share/doc/libservlet3.1-java/

debian/libservlet3.1-java-doc.links

-/usr/share/doc/libservlet3.1-java/api /usr/share/doc/libservlet3.1-java-doc/api

debian/libservlet3.1-java.manifest

-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"
- Bundle-Version: 3.1.0
- Bundle-SymbolicName: javax.servlet
- Bundle-Name: Servlet API Bundle
- Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,JavaSE-1.7
- Bundle-Localization: plugin
- Bundle-Vendor: The Apache Software Foundation

debian/libtomcat8-java.poms

@@ -25,9 +25,3 @@ 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

-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/maven.publishedRules

-# 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/ 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.websocket/ s/tomcat-websocket-api/websocket-api/ jar s/.*/1.0/

debian/rules

@@ -17,12 +17,6 @@ ANT       := ant -propertyfile debian/ant.properties \
 override_dh_auto_build:
 	$(ANT) extras-jmx-remote deploy embed-jars
 
-	# Build the Javadoc for the Servlet, JSP, EL and WebSocket APIs
-	$(JAVA_HOME)/bin/javadoc -locale en_US -subpackages "javax.servlet:javax.el:javax.websocket" -d "output/api" \
-		-sourcepath "java" -author -version -breakiterator -notimestamp \
-		-windowtitle "Tomcat API Documentation" -doctitle "Tomcat API" \
-		-bottom "Copyright © 2000-2016 The Apache Software Foundation. All Rights Reserved."
-
 	# Prepare the Maven artifacts
 	mkdir -p debian/poms
 	cp res/maven/*.pom debian/poms
@@ -48,14 +42,6 @@ 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