You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2019/09/16 14:05:41 UTC
[tomcat] branch master updated (1840b7e -> b4bd03b)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from 1840b7e Align with 7.0.x
new 2c5426c Increment version for next dev cycle
new b4bd03b Update changelog
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
build.properties.default | 2 +-
res/maven/mvn.properties.default | 2 +-
webapps/docs/changelog.xml | 12 +++++++++++-
3 files changed, 13 insertions(+), 3 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/02: Increment version for next dev cycle
Posted by 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
commit 2c5426c0c5b88df22a105b2221df568aae855f45
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Sep 16 14:56:23 2019 +0100
Increment version 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 a47e0e5..1e02c83 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -25,7 +25,7 @@
# ----- Version Control Flags -----
version.major=9
version.minor=0
-version.build=25
+version.build=26
version.patch=0
version.suffix=-dev
diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index 7c063fd..9c354b4 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=9.0.25
+maven.asf.release.deploy.version=9.0.26
#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 c223a4c..accad49 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 9.0.25 (markt)" rtext="in development">
+<section name="Tomcat 9.0.26 (markt)" rtext="in development">
+</section>
+<section name="Tomcat 9.0.25 (markt)" rtext="not released">
<subsection name="Catalina">
<changelog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/02: Update changelog
Posted by 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
commit b4bd03b07e5e304cc93a8a47c15bda34a99a9e5f
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Sep 16 15:05:06 2019 +0100
Update changelog
---
webapps/docs/changelog.xml | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index accad49..66eb514 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -45,6 +45,14 @@
issues do not "pop up" wrt. others).
-->
<section name="Tomcat 9.0.26 (markt)" rtext="in development">
+ <subsection name="Oher">
+ <changelog>
+ <fix>
+ Re-tagged to ensure that the source file for the changelog did not
+ contain an XML byte order mark. (markt)
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 9.0.25 (markt)" rtext="not released">
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org