[tomcat] branch main updated: Remove milestone marker from version

[ma...@apache.org]

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.git


The following commit(s) were added to refs/heads/main by this push:
     new 32e126572d Remove milestone marker from version
32e126572d is described below

commit 32e126572d1bd447a084371d34859c95c2d000dc
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Sep 23 09:09:26 2022 +0100

    Remove milestone marker from version
---
 build.properties.default         | 2 +-
 res/maven/mvn.properties.default | 2 +-
 webapps/docs/changelog.xml       | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 8464178a91..3cfc51b716 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -33,7 +33,7 @@ version.major=10
 version.minor=1
 version.build=0
 version.patch=0
-version.suffix=-M21
+version.suffix=
 version.dev=-dev
 
 # ----- Build tools -----
diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index b3ab26d6e2..36c0b412bb 100644
--- a/res/maven/mvn.properties.default
+++ b/res/maven/mvn.properties.default
@@ -39,7 +39,7 @@ maven.asf.release.repo.url=https://repository.apache.org/service/local/staging/d
 maven.asf.release.repo.repositoryId=apache.releases.https
 
 # Release version info
-maven.asf.release.deploy.version=10.1.0-M21
+maven.asf.release.deploy.version=10.1.0
 
 #Where do we load the libraries from
 tomcat.lib.path=../../output/build/lib
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index dcdd316f1d..62109f5a24 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -104,7 +104,7 @@
   They eventually become mixed with the numbered issues (i.e., numbered
   issues do not "pop up" wrt. others).
 -->
-<section name="Tomcat 10.1.0-M21 (markt)" rtext="in development">
+<section name="Tomcat 10.1.0 (markt)" rtext="in development">
   <subsection name="Coyote">
     <changelog>
       <update>
@@ -133,7 +133,7 @@
     </changelog>
   </subsection>
 </section>
-<section name="Tomcat 10.1.0-M20 (markt)" rtext="release in progress">
+<section name="Tomcat 10.1.0-M20 (markt)" rtext="not released">
   <subsection name="Coyote">
     <changelog>
       <fix>


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