[tomcat] branch master updated: Increment version number for next dev cycle

[ma...@apache.org]

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


The following commit(s) were added to refs/heads/master by this push:
     new da74009  Increment version number for next dev cycle
da74009 is described below

commit da74009599485dda58d1fadb8e0def64152a9f7f
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Jun 4 12:44:45 2020 +0100

    Increment version number for next dev cycle
---
 build.properties.default         | 2 +-
 res/maven/mvn.properties.default | 2 +-
 webapps/docs/changelog.xml       | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 12af31c..19a2f0b 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -27,7 +27,7 @@ version.major=10
 version.minor=0
 version.build=0
 version.patch=0
-version.suffix=-M6-dev
+version.suffix=-M7-dev
 
 # ----- Source control flags -----
 git.branch=master
diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index 0cc3bbf..77b33e2 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.0.0-M6
+maven.asf.release.deploy.version=10.0.0-M7
 
 #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 db22cf3..fd96675 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -44,7 +44,9 @@
   They eventually become mixed with the numbered issues (i.e., numbered
   issues do not "pop up" wrt. others).
 -->
-<section name="Tomcat 10.0.0-M6 (markt)" rtext="in development">
+<section name="Tomcat 10.0.0-M7 (markt)" rtext="in development">
+</section>
+<section name="Tomcat 10.0.0-M6 (markt)" rtext="release in progress">
   <subsection name="Catalina">
     <changelog>
       <fix>


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