This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 84be584 Increment version number for next release after 8.5.68 tag
84be584 is described below
commit 84be584fd3b6103fe16a96cfb5c1cf9ea78db830
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Jun 15 10:39:53 2021 +0100
Increment version number for next release after 8.5.68 tag
Ensure change log entries are in correct section
Note 8.5.67 was not released
---
build.properties.default | 2 +-
res/maven/mvn.properties.default | 2 +-
webapps/docs/changelog.xml | 6 ++++--
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 0c6c477..0db31f0 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -25,7 +25,7 @@
# ----- Version Control Flags -----
version.major=8
version.minor=5
-version.build=68
+version.build=69
version.patch=0
version.suffix=-dev
diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index 7bab544..1b6069c 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=8.5.68
+maven.asf.release.deploy.version=8.5.69
#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 203612f..f969f75 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 8.5.68 (schultz)" rtext="in development">
+<section name="Tomcat 8.5.69 (schultz)" rtext="in development">
<subsection name="Coyote">
<changelog>
<fix>
@@ -129,6 +129,8 @@
</add>
</changelog>
</subsection>
+</section>
+<section name="Tomcat 8.5.68 (schultz)" rtext="release in progress">
<subsection name="Other">
<changelog>
<update>
@@ -138,7 +140,7 @@
</changelog>
</subsection>
</section>
-<section name="Tomcat 8.5.67 (schultz)" rtext="release in progress">
+<section name="Tomcat 8.5.67 (schultz)" rtext="not released">
<subsection name="Catalina">
<changelog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
