This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-connectors.git


The following commit(s) were added to refs/heads/main by this push:
     new ac0fd4f78 Rename so tooling works
ac0fd4f78 is described below

commit ac0fd4f785a35b7fcaba44e70fdc68436e94ad21
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Sep 6 18:14:00 2023 +0100

    Rename so tooling works
---
 tools/jkrelease.sh                    | 6 +-----
 xdocs/ajp/project.xml                 | 2 +-
 xdocs/common_howto/project.xml        | 2 +-
 xdocs/index.xml                       | 2 +-
 xdocs/miscellaneous/project.xml       | 2 +-
 xdocs/news/{2023.xml => 20230101.xml} | 2 +-
 xdocs/news/project.xml                | 2 +-
 xdocs/project.xml                     | 2 +-
 xdocs/reference/project.xml           | 2 +-
 xdocs/webserver_howto/project.xml     | 2 +-
 10 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/tools/jkrelease.sh b/tools/jkrelease.sh
index 91666b81c..29263b665 100755
--- a/tools/jkrelease.sh
+++ b/tools/jkrelease.sh
@@ -411,11 +411,7 @@ do
     esac
     rm -f CHANGES
     echo "Creating the CHANGES file using '$TOOL' ..."
-    ${TOOL} ../docs/miscellaneous/changelog.html > CHANGES 2>/dev/null
-    # Remove page navigation data from converted file.
-    cp -p CHANGES CHANGES.tmp
-    awk '/Preface/ {o=1} o>0' CHANGES.tmp > CHANGES
-    rm CHANGES.tmp
+    ${TOOL} ../docs/miscellaneous/changelog.html | awk '/Preface/ {o=1} o>0' > 
CHANGES 2>/dev/null
     if [ -f CHANGES -a -s CHANGES ]
     then
       failed=false
diff --git a/xdocs/ajp/project.xml b/xdocs/ajp/project.xml
index eb34ef1ef..59da8eaa1 100644
--- a/xdocs/ajp/project.xml
+++ b/xdocs/ajp/project.xml
@@ -65,7 +65,7 @@
     </menu>
 
     <menu name="News">
-        <item name="2023"                       href="../news/2023.html"/>
+        <item name="2023"                       href="../news/20230101.html"/>
         <item name="2020"                       href="../news/20200201.html"/>
         <item name="2018"                       href="../news/20180301.html"/>
         <item name="2016"                       href="../news/20160901.html"/>
diff --git a/xdocs/common_howto/project.xml b/xdocs/common_howto/project.xml
index c30dda4e0..3b4651c11 100644
--- a/xdocs/common_howto/project.xml
+++ b/xdocs/common_howto/project.xml
@@ -65,7 +65,7 @@
     </menu>
 
     <menu name="News">
-        <item name="2023"                       href="../news/2023.html"/>
+        <item name="2023"                       href="../news/20230101.html"/>
         <item name="2020"                       href="../news/20200201.html"/>
         <item name="2018"                       href="../news/20180301.html"/>
         <item name="2016"                       href="../news/20160901.html"/>
diff --git a/xdocs/index.xml b/xdocs/index.xml
index 23ea05c81..7d159484a 100644
--- a/xdocs/index.xml
+++ b/xdocs/index.xml
@@ -60,7 +60,7 @@ manual is described in more detail below.</p>
 
 <section name="Headlines">
 <ul>
-<li><a href="news/2023.html"><b>JK-1.2.49 released</b></a>
+<li><a href="news/20230101.html"><b>JK-1.2.49 released</b></a>
 <p>The Apache Tomcat team is proud to announce the immediate availability
    of Tomcat Connectors 1.2.49 Stable. This release contains improvements and
    bug fixes for issues found in previous releases.</p>
diff --git a/xdocs/miscellaneous/project.xml b/xdocs/miscellaneous/project.xml
index 4cf843297..063da08ba 100644
--- a/xdocs/miscellaneous/project.xml
+++ b/xdocs/miscellaneous/project.xml
@@ -65,7 +65,7 @@
     </menu>
 
     <menu name="News">
-        <item name="2023"                       href="../news/2023.html"/>
+        <item name="2023"                       href="../news/20230101.html"/>
         <item name="2020"                       href="../news/20200201.html"/>
         <item name="2018"                       href="../news/20180301.html"/>
         <item name="2016"                       href="../news/20160901.html"/>
diff --git a/xdocs/news/2023.xml b/xdocs/news/20230101.xml
similarity index 98%
rename from xdocs/news/2023.xml
rename to xdocs/news/20230101.xml
index 6b898e7b1..976d02399 100644
--- a/xdocs/news/2023.xml
+++ b/xdocs/news/20230101.xml
@@ -18,7 +18,7 @@
 <!DOCTYPE document [
   <!ENTITY project SYSTEM "project.xml">
 ]>
-<document url="2023.html">
+<document url="20230101.html">
 
   &project;
 
diff --git a/xdocs/news/project.xml b/xdocs/news/project.xml
index 5149cd6e5..6863a13ab 100644
--- a/xdocs/news/project.xml
+++ b/xdocs/news/project.xml
@@ -65,7 +65,7 @@
     </menu>
 
     <menu name="News">
-        <item name="2023"                       href="../news/2023.html"/>
+        <item name="2023"                       href="../news/20230101.html"/>
         <item name="2020"                       href="../news/20200201.html"/>
         <item name="2018"                       href="../news/20180301.html"/>
         <item name="2016"                       href="../news/20160901.html"/>
diff --git a/xdocs/project.xml b/xdocs/project.xml
index 533cdb60d..e867d1894 100644
--- a/xdocs/project.xml
+++ b/xdocs/project.xml
@@ -65,7 +65,7 @@
     </menu>
 
     <menu name="News">
-        <item name="2023"                       href="news/2023.html"/>
+        <item name="2023"                       href="news/20230101.html"/>
         <item name="2020"                       href="news/20200201.html"/>
         <item name="2018"                       href="news/20180301.html"/>
         <item name="2016"                       href="news/20160901.html"/>
diff --git a/xdocs/reference/project.xml b/xdocs/reference/project.xml
index e63cda39e..510c30891 100644
--- a/xdocs/reference/project.xml
+++ b/xdocs/reference/project.xml
@@ -65,7 +65,7 @@
     </menu>
 
     <menu name="News">
-        <item name="2023"                       href="../news/2023.html"/>
+        <item name="2023"                       href="../news/20230101.html"/>
         <item name="2020"                       href="../news/20200201.html"/>
         <item name="2018"                       href="../news/20180301.html"/>
         <item name="2016"                       href="../news/20160901.html"/>
diff --git a/xdocs/webserver_howto/project.xml 
b/xdocs/webserver_howto/project.xml
index 5bb64ab5c..b5f42b64d 100644
--- a/xdocs/webserver_howto/project.xml
+++ b/xdocs/webserver_howto/project.xml
@@ -65,7 +65,7 @@
     </menu>
 
     <menu name="News">
-        <item name="2023"                       href="../news/2023.html"/>
+        <item name="2023"                       href="../news/20230101.html"/>
         <item name="2020"                       href="../news/20200201.html"/>
         <item name="2018"                       href="../news/20180301.html"/>
         <item name="2016"                       href="../news/20160901.html"/>


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to