Author: markt
Date: Wed Jul 3 16:55:05 2024
New Revision: 1918888
URL: http://svn.apache.org/viewvc?rev=1918888&view=rev
Log:
Update site build tools to remove 8.5.x
Removed:
tomcat/site/trunk/tools/email-template-8.5.txt
tomcat/site/trunk/tools/news-template-8.5.xml
Modified:
tomcat/site/trunk/README.txt
tomcat/site/trunk/build.properties.default
tomcat/site/trunk/build.xml
tomcat/site/trunk/tools/email-template-11.0.txt
tomcat/site/trunk/tools/update-version.sh
Modified: tomcat/site/trunk/README.txt
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/README.txt?rev=1918888&r1=1918887&r2=1918888&view=diff
==============================================================================
--- tomcat/site/trunk/README.txt (original)
+++ tomcat/site/trunk/README.txt Wed Jul 3 16:55:05 2024
@@ -73,8 +73,8 @@ reflected on the live tomcat.apache.org
immediately, so go to http://tomcat.apache.org/ and have fun.
-To update the documentation for Tomcat 8.5.x, 9.0.x, 10.1.x or 11.0.x:
-======================================================================
+To update the documentation for Tomcat 9.0.x, 10.1.x or 11.0.x:
+===============================================================
1. If you are using the "sparse" checkout feature, make sure that
subdirectories in the docs/ directory for the relevant Tomcat versions
@@ -83,7 +83,6 @@ To update the documentation for Tomcat 8
The commands are:
cd tomcat-site
- svn up --set-depth infinity docs/tomcat-8.5-doc
svn up --set-depth infinity docs/tomcat-9.0-doc
svn up --set-depth infinity docs/tomcat-10.1-doc
svn up --set-depth infinity docs/tomcat-11.0-doc
@@ -105,7 +104,6 @@ To update the documentation for Tomcat 8
The commands are:
cd tomcat-site
- ant release-8.5
ant release-9.0
ant release-10.1
ant release-11.0
Modified: tomcat/site/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/build.properties.default?rev=1918888&r1=1918887&r2=1918888&view=diff
==============================================================================
--- tomcat/site/trunk/build.properties.default (original)
+++ tomcat/site/trunk/build.properties.default Wed Jul 3 16:55:05 2024
@@ -36,7 +36,6 @@ tomcat.loc=https://downloads.apache.org/
# ----- Tomcat versions -----
-tomcat8.5=8.5.100
tomcat9.0=9.0.90
tomcat10.1=10.1.25
tomcat11.0=11.0.0-M21
@@ -45,9 +44,6 @@ tomcat11.0=11.0.0-M21
tomcat-site-docs.home=${base.path}/tomcat-site-docs/
# ----- Tomcat Docs locations -----
-tomcat8.5.loc=${tomcat.loc}/tomcat-8/v${tomcat8.5}/bin/apache-tomcat-${tomcat8.5}-fulldocs.tar.gz
-tomcat8.5.home=${tomcat-site-docs.home}/${tomcat8.5}
-
tomcat9.0.loc=${tomcat.loc}/tomcat-9/v${tomcat9.0}/bin/apache-tomcat-${tomcat9.0}-fulldocs.tar.gz
tomcat9.0.home=${tomcat-site-docs.home}/${tomcat9.0}
Modified: tomcat/site/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/build.xml?rev=1918888&r1=1918887&r2=1918888&view=diff
==============================================================================
--- tomcat/site/trunk/build.xml (original)
+++ tomcat/site/trunk/build.xml Wed Jul 3 16:55:05 2024
@@ -91,28 +91,6 @@
</target>
- <target name="release-8.5"
- depends="docs"
- description="Used after a release to update the docs for Tomcat 8.5">
-
- <!-- Download the latest version -->
- <antcall target="downloadgz">
- <param name="sourcefile" value="${tomcat8.5.loc}"/>
- <param name="destfile"
value="${tomcat8.5.home}/tomcat-8.5-doc/index.html"/>
- <param name="destdir" value="${tomcat8.5.home}"/>
- </antcall>
-
- <!-- Delete the old version -->
- <delete dir="${docs.dest}/tomcat-8.5-doc"/>
-
- <!-- Copy the latest version -->
- <copy todir="${docs.dest}/tomcat-8.5-doc" >
- <fileset dir="${tomcat8.5.home}/tomcat-8.5-doc" >
- <exclude name="/WEB-INF/**" />
- </fileset>
- </copy>
- </target>
-
<target name="release-9.0"
depends="docs"
description="Used after a release to update the docs for Tomcat 9.0">
Modified: tomcat/site/trunk/tools/email-template-11.0.txt
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/tools/email-template-11.0.txt?rev=1918888&r1=1918887&r2=1918888&view=diff
==============================================================================
--- tomcat/site/trunk/tools/email-template-11.0.txt (original)
+++ tomcat/site/trunk/tools/email-template-11.0.txt Wed Jul 3 16:55:05 2024
@@ -21,7 +21,7 @@ http://tomcat.apache.org/tomcat-11.0-doc
Downloads:
http://tomcat.apache.org/download-11.cgi
-Migration guides from Apache Tomcat 8.5.x, 9.0.x and 10.1.x:
+Migration guides from Apache Tomcat 9.0.x and 10.1.x:
http://tomcat.apache.org/migration.html
Enjoy!
Modified: tomcat/site/trunk/tools/update-version.sh
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/tools/update-version.sh?rev=1918888&r1=1918887&r2=1918888&view=diff
==============================================================================
--- tomcat/site/trunk/tools/update-version.sh (original)
+++ tomcat/site/trunk/tools/update-version.sh Wed Jul 3 16:55:05 2024
@@ -24,7 +24,7 @@ fail_migration_patch() {
if [ \( "$1" = '-h' \) -o \( "$1" = "--help" \) ] ; then
echo "Usage: $0 oldrelease newrelease [release date] [release manager]
[email]"
echo
- echo e.g. $0 8.5.86 8.5.87 2023-03-03 asfuser
+ echo e.g. $0 10.1.14 10.1.15 2023-03-03 asfuser
echo
echo The release date will default to "today" in your current time zone.
echo "The release-manager will default to your current username (${USER})"
@@ -41,7 +41,7 @@ if [ \( "" = "$NEW_RELEASE" \) -o \( ""
>&2 echo
>&2 echo "Usage: $0 oldrelease newrelease [release date] [release manager]
[email]"
>&2 echo
- >&2 echo e.g. $0 8.5.85 8.5.86 2023-03-03 asfuser
+ >&2 echo e.g. $0 10.1.14 10.1.15 2023-03-03 asfuser
>&2 echo
>&2 echo "If you add the \"email\" parameter at the end of the command,"
>&2 echo "this script will build a release-announcement email message for
you,"
@@ -61,17 +61,13 @@ if [ "$DEBUG" = "1" ] ; then
echo RELEASE_DATE=$RELEASE_DATE
fi
-if [ "8" = "${MAJOR_RELEASE}" ] ; then
- DOWNLOAD_FILENAME=xdocs/download-80.xml
-elif [ "9" = "${MAJOR_RELEASE}" ] ; then
+if [ "9" = "${MAJOR_RELEASE}" ] ; then
DOWNLOAD_FILENAME=xdocs/download-90.xml
else
DOWNLOAD_FILENAME=xdocs/download-${MAJOR_RELEASE}.xml
fi
-if [ "8.5" = "${MINOR_RELEASE}" ] ; then
- MIGRATION_FILENAME=xdocs/migration-85.xml
-elif [ "9.0" = "${MINOR_RELEASE}" ] ; then
+if [ "9.0" = "${MINOR_RELEASE}" ] ; then
MIGRATION_FILENAME=xdocs/migration-90.xml
else
MIGRATION_FILENAME=xdocs/migration-${MINOR_RELEASE}.xml
@@ -151,7 +147,7 @@ fi
# Download file
# set the version number to the latest
-# e.g. [define v]8.5.87[end]
+# e.g. [define v]10.1.15[end]
echo "Patching ${DOWNLOAD_FILENAME}..."
if [ "$OS" = "Linux" ] ; then
sed --in-place -e "s/\[define v]${MINOR_RELEASE}.*\[end\]/[define
v]${NEW_RELEASE}[end]/" "${DOWNLOAD_FILENAME}"
@@ -174,7 +170,7 @@ fi
# The changelog needs to be merged AFTER the javadocs have been built.
#
# Set the release date.
-# e.g. <span id="Tomcat_8.5.87_(schultz)_rtext" style="float:
right;">2023-03-03</span>
+# e.g. <span id="Tomcat_10.1.15_(schultz)_rtext" style="float:
right;">2023-03-03</span>
CHANGELOG_FILENAME=docs/tomcat-${MINOR_RELEASE}-doc/changelog.html
svn update "${CHANGELOG_FILENAME}"
echo "Patching ${CHANGELOG_FILENAME}..."
@@ -230,9 +226,9 @@ fi
# Set the release date and revision number e.g.
# <release>
# <Version>
-# <name>Latest Stable 8.5.x Release</name>
+# <name>Latest Stable 10.1.x Release</name>
# <created>2023-03-03</created>
-# <revision>8.5.88</revision>
+# <revision>10.1.15</revision>
# </Version>
# </release>
#
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
