You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2020/01/13 11:55:53 UTC
[tomcat] 01/18: First pass at version updates for Tomcat 10.0.0.x
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit fabe5e7aedb8c5b90ae0e924a060384d138e3976
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Jan 13 11:00:04 2020 +0000
First pass at version updates for Tomcat 10.0.0.x
---
build.properties.default | 4 +--
build.xml | 90 +++++++++++++++++++++++++-----------------------
2 files changed, 49 insertions(+), 45 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index ffe38de..8986247 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -23,9 +23,9 @@
# -----------------------------------------------------------------------------
# ----- Version Control Flags -----
-version.major=9
+version.major=10
version.minor=0
-version.build=31
+version.build=0
version.patch=0
version.suffix=-dev
diff --git a/build.xml b/build.xml
index fbe0311..4141d0a 100644
--- a/build.xml
+++ b/build.xml
@@ -44,22 +44,26 @@
<property name="project" value="apache-tomcat" />
<!-- Version numbers -->
- <property name="version" value="${version.major}.${version.minor}.${version.build}${version.suffix}" />
+ <property name="version" value="${version.major}.${version.minor}.${version.build}.${version.patch}${version.suffix}" />
<property name="version.number" value="${version.major}.${version.minor}.${version.build}.${version.patch}" />
<property name="version.major.minor" value="${version.major}.${version.minor}" />
<!-- constant to declare a file binary for md5sum -->
<property name="md5sum.binary-prefix" value=" *" />
- <!-- Exact spec versions (for the manifests) -->
- <property name="servlet.revision" value="FR" />
- <property name="jsp.revision" value="FR" />
- <property name="el.revision" value="FR" />
- <property name="websocket.revision" value="FR" />
- <!-- MR B but this was first 1.1 release so use FR -->
- <property name="jaspic.revision" value="FR" />
- <!-- MR 3 but this was first 1.3 release so use FR -->
- <property name="annotation.revision" value="FR" />
+ <!-- Exact spec versions (for the manifests etc.) -->
+ <property name="servlet.spec.version" value="5.0" />
+ <property name="servlet.revision" value="M1" />
+ <property name="jsp.spec.version" value="3.0" />
+ <property name="jsp.revision" value="M1" />
+ <property name="el.spec.version" value="4.0" />
+ <property name="el.revision" value="M1" />
+ <property name="websocket.spec.version" value="2.0" />
+ <property name="websocket.revision" value="M1" />
+ <property name="jaspic.spec.version" value="2.0" />
+ <property name="jaspic.revision" value="M1" />
+ <property name="annotation.spec.version" value="2.0" />
+ <property name="annotation.revision" value="M1" />
<!-- Release artifact base names -->
<property name="final.name" value="${project}-${version}" />
@@ -90,7 +94,7 @@
<!-- build output directory for jdbc-pool -->
<property name="tomcat.pool" value="${tomcat.output}/jdbc-pool"/>
- <!-- Servlet 4.0 spec requires Java 8+ -->
+ <!-- Jakarta EE 9 specs requires Java 8+ -->
<property name="compile.source" value="8"/>
<property name="compile.target" value="8"/>
<property name="compile.release" value="8"/>
@@ -766,14 +770,14 @@
</target>
<target name="package" depends="compile,build-manifests,build-bnd" >
- <!-- Common Annotations 1.3 JAR File -->
+ <!-- Common Annotations JAR File -->
<jarIt jarfile="${annotations-api.jar}"
filesDir="${tomcat.classes}"
filesId="files.annotations-api"
manifest="${tomcat.manifests}/annotations-api.jar.manifest"
addOSGi="true" />
- <!-- Servlet 4.0 Implementation JAR File -->
+ <!-- Servlet Implementation JAR File -->
<jarIt jarfile="${servlet-api.jar}"
filesDir="${tomcat.classes}"
filesId="files.servlet-api"
@@ -782,35 +786,35 @@
license="${tomcat.manifests}/servlet-api.jar.license"
addOSGi="true" />
- <!-- JSP 2.3 Implementation JAR File -->
+ <!-- JSP Implementation JAR File -->
<jarIt jarfile="${jsp-api.jar}"
filesDir="${tomcat.classes}"
filesId="files.jsp-api"
manifest="${tomcat.manifests}/jsp-api.jar.manifest"
addOSGi="true" />
- <!-- EL 3.0 Implementation JAR File -->
+ <!-- EL Implementation JAR File -->
<jarIt jarfile="${el-api.jar}"
filesDir="${tomcat.classes}"
filesId="files.el-api"
manifest="${tomcat.manifests}/el-api.jar.manifest"
addOSGi="true" />
- <!-- WebSocket 1.1 API JAR File -->
+ <!-- WebSocket API JAR File -->
<jarIt jarfile="${websocket-api.jar}"
filesDir="${tomcat.classes}"
filesId="files.websocket-api"
manifest="${tomcat.manifests}/websocket-api.jar.manifest"
addOSGi="true" />
- <!-- JASPIC 1.1 API JAR File -->
+ <!-- JASPIC API JAR File -->
<jarIt jarfile="${jaspic-api.jar}"
filesDir="${tomcat.classes}"
filesId="files.jaspic-api"
manifest="${tomcat.manifests}/jaspic-api.jar.manifest"
addOSGi="true" />
- <!-- WebSocket 1.1 implementation JAR File -->
+ <!-- WebSocket implementation JAR File -->
<jarIt jarfile="${tomcat-websocket.jar}"
filesDir="${tomcat.classes}"
filesId="files.tomcat-websocket"
@@ -1879,9 +1883,9 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
sourcepath="${tomcat.dist}/src/java"
destdir="${tomcat.dist}/webapps/docs/annotationapi"
version="true"
- windowtitle="Common Annotations 1.3 API Documentation - Apache Tomcat ${version}"
- doctitle="Common Annotations 1.3 API - Apache Tomcat ${version}"
- header="<b>Common Annotations 1.3 - Apache Tomcat ${version}</b>"
+ windowtitle="Common Annotations ${annotation.spec.version} API Documentation - Apache Tomcat ${version}"
+ doctitle="Common Annotations ${annotation.spec.version} API - Apache Tomcat ${version}"
+ header="<b>Common Annotations ${annotation.spec.version} - Apache Tomcat ${version}</b>"
bottom="Copyright &#169; 2000-${year} Apache Software Foundation. All Rights Reserved."
encoding="UTF-8"
docencoding="UTF-8"
@@ -1901,9 +1905,9 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
sourcepath="${tomcat.dist}/src/java"
destdir="${tomcat.dist}/webapps/docs/servletapi"
version="true"
- windowtitle="Servlet 4.0 API Documentation - Apache Tomcat ${version}"
- doctitle="Servlet 4.0 API - Apache Tomcat ${version}"
- header="<b>Servlet 4.0 - Apache Tomcat ${version}</b>"
+ windowtitle="Servlet {servlet.spec.version} API Documentation - Apache Tomcat ${version}"
+ doctitle="Servlet {servlet.spec.version} API - Apache Tomcat ${version}"
+ header="<b>Servlet {servlet.spec.version} - Apache Tomcat ${version}</b>"
bottom="Copyright &#169; 2000-${year} Apache Software Foundation. All Rights Reserved."
encoding="UTF-8"
docencoding="UTF-8"
@@ -1922,9 +1926,9 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
sourcepath="${tomcat.dist}/src/java"
destdir="${tomcat.dist}/webapps/docs/jspapi"
version="true"
- windowtitle="JSP 2.3 API Documentation - Apache Tomcat ${version}"
- doctitle="JSP 2.3 API - Apache Tomcat ${version}"
- header="<b>JSP 2.3 - Apache Tomcat ${version}</b>"
+ windowtitle="JSP ${jsp.spec.version} API Documentation - Apache Tomcat ${version}"
+ doctitle="JSP ${jsp.spec.version} API - Apache Tomcat ${version}"
+ header="<b>JSP ${jsp.spec.version} - Apache Tomcat ${version}</b>"
bottom="Copyright &#169; 2000-${year} Apache Software Foundation. All Rights Reserved."
encoding="UTF-8"
docencoding="UTF-8"
@@ -1943,9 +1947,9 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
sourcepath="${tomcat.dist}/src/java"
destdir="${tomcat.dist}/webapps/docs/elapi"
version="true"
- windowtitle="EL 3.0 API Documentation - Apache Tomcat ${version}"
- doctitle="EL 3.0 API - Apache Tomcat ${version}"
- header="<b>EL 3.0 - Apache Tomcat ${version}</b>"
+ windowtitle="EL ${el.spec.version} API Documentation - Apache Tomcat ${version}"
+ doctitle="EL ${el.spec.version} API - Apache Tomcat ${version}"
+ header="<b>EL ${el.spec.version} - Apache Tomcat ${version}</b>"
bottom="Copyright &#169; 2000-${year} Apache Software Foundation. All Rights Reserved."
encoding="UTF-8"
docencoding="UTF-8"
@@ -1964,9 +1968,9 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
sourcepath="${tomcat.dist}/src/java"
destdir="${tomcat.dist}/webapps/docs/websocketapi"
version="true"
- windowtitle="WebSocket 1.1 API Documentation - Apache Tomcat ${version}"
- doctitle="WebSocket 1.1 API - Apache Tomcat ${version}"
- header="<b>WebSocket 1.1 - Apache Tomcat ${version}</b>"
+ windowtitle="WebSocket ${websocket.spec.version} API Documentation - Apache Tomcat ${version}"
+ doctitle="WebSocket ${websocket.spec.version} API - Apache Tomcat ${version}"
+ header="<b>WebSocket ${websocket.spec.version} - Apache Tomcat ${version}</b>"
bottom="Copyright &#169; 2000-${year} Apache Software Foundation. All Rights Reserved."
encoding="UTF-8"
docencoding="UTF-8"
@@ -1985,9 +1989,9 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
sourcepath="${tomcat.dist}/src/java"
destdir="${tomcat.dist}/webapps/docs/jaspicapi"
version="true"
- windowtitle="JASPIC 1.1 API Documentation - Apache Tomcat ${version}"
- doctitle="JASPIC 1.1 API - Apache Tomcat ${version}"
- header="<b>JASPIC 1.1 - Apache Tomcat ${version}</b>"
+ windowtitle="JASPIC ${jaspic.spec.version} API Documentation - Apache Tomcat ${version}"
+ doctitle="JASPIC ${jaspic.spec.version} API - Apache Tomcat ${version}"
+ header="<b>JASPIC ${jaspic.spec.version} - Apache Tomcat ${version}</b>"
bottom="Copyright &#169; 2000-${year} Apache Software Foundation. All Rights Reserved."
encoding="UTF-8"
docencoding="UTF-8"
@@ -2589,13 +2593,13 @@ skip.installer property in build.properties" />
<mkdir dir="${tomcat.src.jars}" />
- <!-- Common Annotations 1.3 JAR File -->
+ <!-- Common Annotations JAR File -->
<jarIt jarfile="${annotations-api-src.jar}"
filesDir="java"
filesId="files.annotations-api"
manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
- <!-- Servlet 4.0 Implementation JAR File -->
+ <!-- Servlet Implementation JAR File -->
<jarIt jarfile="${servlet-api-src.jar}"
filesDir="java"
filesId="files.servlet-api"
@@ -2603,7 +2607,7 @@ skip.installer property in build.properties" />
notice="${tomcat.manifests}/servlet-api.jar.notice"
license="${tomcat.manifests}/servlet-api.jar.license" />
- <!-- JSP 2.3 Implementation JAR File -->
+ <!-- JSP Implementation JAR File -->
<jarIt jarfile="${jsp-api-src.jar}"
filesDir="java"
filesId="files.jsp-api"
@@ -2611,24 +2615,24 @@ skip.installer property in build.properties" />
notice="${tomcat.manifests}/jsp-api.jar.notice"
license="${tomcat.manifests}/jsp-api.jar.license" />
- <!-- JSP EL 3.0 Implementation JAR File -->
+ <!-- JSP EL Implementation JAR File -->
<jarIt jarfile="${el-api-src.jar}"
filesDir="java"
filesId="files.el-api"
manifest="${tomcat.manifests}/el-api.jar.manifest" />
- <!-- WebSocket 1.1 API JAR File -->
+ <!-- WebSocket API JAR File -->
<jarIt jarfile="${websocket-api-src.jar}"
filesDir="java"
filesId="files.websocket-api"
manifest="${tomcat.manifests}/websocket-api.jar.manifest" />
- <!-- WebSocket 1.1 implementation JAR File -->
+ <!-- WebSocket implementation JAR File -->
<jarIt jarfile="${tomcat-websocket-src.jar}"
filesDir="java"
filesId="files.tomcat-websocket" />
- <!-- JASPIC 1.1 API JAR File -->
+ <!-- JASPIC API JAR File -->
<jarIt jarfile="${jaspic-api-src.jar}"
filesDir="java"
filesId="files.jaspic-api"
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org