You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by sc...@apache.org on 2024/06/13 21:21:18 UTC
(tomcat) branch 8.5.x created (now 8ff7e6fc86)
This is an automated email from the ASF dual-hosted git repository.
schultz pushed a change to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
at 8ff7e6fc86 Set final release date.
This branch includes the following new commits:
new 778586b36d Increment version numbers just in case we do another release in the future.
new 8716ac14bb Add missing version replacement for Ant and Java build versions
new 3ca0410760 Add missing dependency
new 8ff7e6fc86 Set final release date.
The 4 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.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
(tomcat) 02/04: Add missing version replacement for Ant and Java build versions
Posted by sc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
schultz pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 8716ac14bbefaa63df63b66ea19f881d3dd32bd2
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Mar 22 11:15:32 2024 +0000
Add missing version replacement for Ant and Java build versions
---
webapps/docs/tomcat-docs.xsl | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/webapps/docs/tomcat-docs.xsl b/webapps/docs/tomcat-docs.xsl
index 0cc02047d6..27189d877f 100644
--- a/webapps/docs/tomcat-docs.xsl
+++ b/webapps/docs/tomcat-docs.xsl
@@ -434,6 +434,12 @@
<xsl:template match="min-java-version">
<xsl:value-of select="$minjavaversion"/>
</xsl:template>
+ <xsl:template match="build-java-version">
+ <xsl:value-of select="$buildjavaversion"/>
+ </xsl:template>
+ <xsl:template match="ant-version-required">
+ <xsl:value-of select="$antversionrequired"/>
+ </xsl:template>
<!-- Process everything else by just passing it through -->
<xsl:template match="*|@*">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
(tomcat) 01/04: Increment version numbers just in case we do another release in the future.
Posted by sc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
schultz pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 778586b36d6d1f38380d2e8f647654b34afe28cf
Author: Christopher Schultz <ch...@christopherschultz.net>
AuthorDate: Tue Mar 19 10:10:34 2024 -0400
Increment version numbers just in case we do another release in the future.
---
build.properties.default | 2 +-
res/maven/mvn.properties.default | 2 +-
webapps/docs/changelog.xml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 16252374a7..0586390264 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -31,7 +31,7 @@
# ----- Version Control Flags -----
version.major=8
version.minor=5
-version.build=100
+version.build=101
version.patch=0
version.suffix=
version.dev=-dev
diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index a1bc77c6fe..d3de933542 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.100
+maven.asf.release.deploy.version=8.5.101
#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 5ce2ccc8f2..1317ec9d3c 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.100 (schultz)" rtext="in development">
+<section name="Tomcat 8.5.100 (schultz)" 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
(tomcat) 04/04: Set final release date.
Posted by sc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
schultz pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 8ff7e6fc86af3c3e82f318e7f62dc9ae41984be9
Author: Christopher Schultz <ch...@christopherschultz.net>
AuthorDate: Tue Apr 16 08:45:20 2024 -0400
Set final release date.
---
webapps/docs/changelog.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 1317ec9d3c..2093bfe034 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.100 (schultz)" rtext="release in progress">
+<section name="Tomcat 8.5.100 (schultz)" rtext="2024-03-25">
<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) 03/04: Add missing dependency
Posted by sc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
schultz pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 3ca0410760b992ffdbf684f53397190ed0e23bbe
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Mar 26 15:00:18 2024 +0000
Add missing dependency
---
res/maven/tomcat-embed-websocket.pom | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/res/maven/tomcat-embed-websocket.pom b/res/maven/tomcat-embed-websocket.pom
index 464e2f0f68..a9f60706b4 100644
--- a/res/maven/tomcat-embed-websocket.pom
+++ b/res/maven/tomcat-embed-websocket.pom
@@ -33,6 +33,12 @@
</license>
</licenses>
<dependencies>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-websocket-api</artifactId>
+ <version>@MAVEN.DEPLOY.VERSION@</version>
+ <scope>compile</scope>
+ </dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org