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 445b0f7140 More version updates
445b0f7140 is described below
commit 445b0f714083987b9572f7b4510c5db6c86a53a0
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Aug 15 13:12:02 2024 +0100
More version updates
---
build.xml | 8 ++++----
java/org/apache/catalina/ant/jmx/package.html | 4 ++--
java/org/apache/catalina/ant/package.html | 4 ++--
java/org/apache/catalina/core/ContextNamingInfoListener.java | 2 +-
java/org/apache/catalina/util/ServerInfo.java | 4 ++--
java/org/apache/jasper/servlet/JspCServletContext.java | 2 +-
java/org/apache/tomcat/util/compat/JreCompat.java | 2 +-
modules/jdbc-pool/pom.xml | 4 ++--
res/ide-support/eclipse/eclipse.project | 2 +-
res/ide-support/eclipse/start-tomcat.launch | 6 +++---
res/ide-support/eclipse/stop-tomcat.launch | 6 +++---
res/maven/mvn-pub.xml | 2 +-
res/maven/mvn.properties.default | 2 +-
res/rat/rat-excludes.txt | 2 +-
.../tomcat/util/net/openssl/ciphers/TesterOpenSSL.java | 2 +-
test/webapp/bug66609/_listing.xslt | 2 +-
webapps/docs/architecture/project.xml | 4 ++--
webapps/docs/architecture/startup.xml | 4 ++--
webapps/docs/config/project.xml | 4 ++--
webapps/docs/introduction.xml | 4 ++--
webapps/docs/project.xml | 2 +-
webapps/docs/tomcat-docs.xsl | 12 ++++++------
22 files changed, 42 insertions(+), 42 deletions(-)
diff --git a/build.xml b/build.xml
index c8008c5eaa..04433a52d0 100644
--- a/build.xml
+++ b/build.xml
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project name="Tomcat 11.0" default="deploy" basedir="."
+<project name="Tomcat 12.0" default="deploy" basedir="."
xmlns:if="ant:if"
xmlns:unless="ant:unless"
xmlns:jacoco="antlib:org.jacoco.ant"
@@ -2124,7 +2124,7 @@
<executiondata>
<file file="${coverage.datafile}"/>
</executiondata>
- <structure name="Tomcat 11.0.x Code Coverage">
+ <structure name="Tomcat 12.0.x Code Coverage">
<classfiles>
<fileset dir="${tomcat.classes}"/>
</classfiles>
@@ -4145,7 +4145,7 @@ Read the Building page on the Apache Tomcat documentation
site for details on ho
<or>
<available file="${tomcat.release.verify}/@{basefile}.sha512" />
<and>
- <contains string="${version}" substring="11.0." /><!-- Super hack
-->
+ <contains string="${version}" substring="12.0." /><!-- Super hack
-->
<contains string="@{basefile}" substring="x86" />
</and>
</or>
@@ -4240,7 +4240,7 @@ reproducible-10=${reproducible-10}
<isset property="reproducible-4" />
<or>
<isset property="reproducible-5" />
- <contains string="${version}" substring="11.0." /><!-- Super hack,
Tomcat 11 does not produce x86 binaries. -->
+ <contains string="${version}" substring="12.0." /><!-- Super hack,
Tomcat 12 does not produce x86 binaries. -->
</or>
<isset property="reproducible-6" />
<isset property="reproducible-7" />
diff --git a/java/org/apache/catalina/ant/jmx/package.html
b/java/org/apache/catalina/ant/jmx/package.html
index f7867a2759..a99c7b7529 100644
--- a/java/org/apache/catalina/ant/jmx/package.html
+++ b/java/org/apache/catalina/ant/jmx/package.html
@@ -20,8 +20,8 @@
<em>Ant (version 1.6 or later)</em> that can be used to interact with the
Remote JMX JSR 160 RMI Adaptor to get/set attributes, invoke MBean operations
and query for Mbeans inside a running instance of Tomcat. For more
information, see
-<a href="https://tomcat.apache.org/tomcat-11.0-doc/monitoring.html";>
-https://tomcat.apache.org/tomcat-11.0-doc/monitoring.html</a>.</p>
+<a href="https://tomcat.apache.org/tomcat-12.0-doc/monitoring.html";>
+https://tomcat.apache.org/tomcat-12.0-doc/monitoring.html</a>.</p>
<p>Each task element can open a new jmx connection or reference an
existing one. The following attribute are exists in every tasks:</p>
diff --git a/java/org/apache/catalina/ant/package.html
b/java/org/apache/catalina/ant/package.html
index e4067ad25a..09c6d88078 100644
--- a/java/org/apache/catalina/ant/package.html
+++ b/java/org/apache/catalina/ant/package.html
@@ -20,8 +20,8 @@
<em>Ant (version 1.6.x or later)</em> that can be used to interact with the
Manager application to deploy, undeploy, list, reload, start and stop web
applications
from a running instance of Tomcat. For more information, see
-<a href="https://tomcat.apache.org/tomcat-11.0-doc/manager-howto.html";>
-https://tomcat.apache.org/tomcat-11.0-doc/manager-howto.html</a>.</p>
+<a href="https://tomcat.apache.org/tomcat-12.0-doc/manager-howto.html";>
+https://tomcat.apache.org/tomcat-12.0-doc/manager-howto.html</a>.</p>
<p>The attributes of each task element correspond
exactly to the request parameters that are included with an HTTP request
diff --git a/java/org/apache/catalina/core/ContextNamingInfoListener.java
b/java/org/apache/catalina/core/ContextNamingInfoListener.java
index bacdfe404a..6f8196def0 100644
--- a/java/org/apache/catalina/core/ContextNamingInfoListener.java
+++ b/java/org/apache/catalina/core/ContextNamingInfoListener.java
@@ -40,7 +40,7 @@ import org.apache.tomcat.util.res.StringManager;
* <li>Display Name: {@code context/displayName} from {@link
Context#getDisplayName()}</li>
* </ul>
* <p>
- * See the <a
href="https://tomcat.apache.org/tomcat-11.0-doc/config/context.html#Naming";>Tomcat
documentation</a> for
+ * See the <a
href="https://tomcat.apache.org/tomcat-12.0-doc/config/context.html#Naming";>Tomcat
documentation</a> for
* more details on the values.
*/
public class ContextNamingInfoListener implements LifecycleListener {
diff --git a/java/org/apache/catalina/util/ServerInfo.java
b/java/org/apache/catalina/util/ServerInfo.java
index 67d1efaa90..57044630e4 100644
--- a/java/org/apache/catalina/util/ServerInfo.java
+++ b/java/org/apache/catalina/util/ServerInfo.java
@@ -72,7 +72,7 @@ public class ServerInfo {
ExceptionUtils.handleThrowable(t);
}
if (info == null || info.equals("Apache Tomcat/@VERSION@")) {
- info = "Apache Tomcat/11.0.x-dev";
+ info = "Apache Tomcat/12.0.x-dev";
}
if (built == null || built.equals("@VERSION_BUILT@")) {
built = "unknown";
@@ -81,7 +81,7 @@ public class ServerInfo {
builtIso = "unknown";
}
if (number == null || number.equals("@VERSION_NUMBER@")) {
- number = "11.0.x";
+ number = "12.0.x";
}
serverInfo = info;
diff --git a/java/org/apache/jasper/servlet/JspCServletContext.java
b/java/org/apache/jasper/servlet/JspCServletContext.java
index 33b2ca9427..61e80d855d 100644
--- a/java/org/apache/jasper/servlet/JspCServletContext.java
+++ b/java/org/apache/jasper/servlet/JspCServletContext.java
@@ -434,7 +434,7 @@ public class JspCServletContext implements ServletContext {
@Override
public String getServerInfo() {
- return "JspC/ApacheTomcat11";
+ return "JspC/ApacheTomcat12";
}
diff --git a/java/org/apache/tomcat/util/compat/JreCompat.java
b/java/org/apache/tomcat/util/compat/JreCompat.java
index 001ce82546..8f05646535 100644
--- a/java/org/apache/tomcat/util/compat/JreCompat.java
+++ b/java/org/apache/tomcat/util/compat/JreCompat.java
@@ -50,7 +50,7 @@ public class JreCompat {
}
graalAvailable = result ||
System.getProperty("org.graalvm.nativeimage.imagecode") != null;
- // This is Tomcat 11.0.x with a minimum Java version of Java 17.
+ // This is Tomcat 12.0.x with a minimum Java version of Java 17.
// Look for the highest supported JVM first
if (Jre22Compat.isSupported()) {
instance = new Jre22Compat();
diff --git a/modules/jdbc-pool/pom.xml b/modules/jdbc-pool/pom.xml
index dfe5639cbf..6bffeea2e0 100644
--- a/modules/jdbc-pool/pom.xml
+++ b/modules/jdbc-pool/pom.xml
@@ -65,7 +65,7 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-juli</artifactId>
- <version>11.0.0-SNAPSHOT</version>
+ <version>12.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -76,7 +76,7 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-dbcp</artifactId>
- <version>11.0.0-SNAPSHOT</version>
+ <version>12.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/res/ide-support/eclipse/eclipse.project
b/res/ide-support/eclipse/eclipse.project
index 10027f6de0..7a12438119 100644
--- a/res/ide-support/eclipse/eclipse.project
+++ b/res/ide-support/eclipse/eclipse.project
@@ -16,7 +16,7 @@
limitations under the License.
-->
<projectDescription>
- <name>tomcat-11.0.x</name>
+ <name>tomcat-12.0.x</name>
<comment></comment>
<projects>
</projects>
diff --git a/res/ide-support/eclipse/start-tomcat.launch
b/res/ide-support/eclipse/start-tomcat.launch
index 0dc362f659..d4225c26da 100644
--- a/res/ide-support/eclipse/start-tomcat.launch
+++ b/res/ide-support/eclipse/start-tomcat.launch
@@ -17,13 +17,13 @@
-->
<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry
value="/tomcat-11.0.x/java/org/apache/catalina/startup/Bootstrap.java"/>
+<listEntry
value="/tomcat-12.0.x/java/org/apache/catalina/startup/Bootstrap.java"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="1"/>
</listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE"
value="org.apache.catalina.startup.Bootstrap"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS"
value="start"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR"
value="tomcat-11.0.x"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS"
value="-Dcatalina.home=${project_loc:/tomcat-11.0.x/java/org/apache/catalina/startup/Bootstrap.java}/output/build"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR"
value="tomcat-12.0.x"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS"
value="-Dcatalina.home=${project_loc:/tomcat-12.0.x/java/org/apache/catalina/startup/Bootstrap.java}/output/build"/>
</launchConfiguration>
diff --git a/res/ide-support/eclipse/stop-tomcat.launch
b/res/ide-support/eclipse/stop-tomcat.launch
index 91db8adf6f..ea0f729a2a 100644
--- a/res/ide-support/eclipse/stop-tomcat.launch
+++ b/res/ide-support/eclipse/stop-tomcat.launch
@@ -17,13 +17,13 @@
-->
<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry
value="/tomcat-11.0.x/java/org/apache/catalina/startup/Bootstrap.java"/>
+<listEntry
value="/tomcat-12.0.x/java/org/apache/catalina/startup/Bootstrap.java"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="1"/>
</listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE"
value="org.apache.catalina.startup.Bootstrap"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS"
value="stop"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR"
value="tomcat-11.0.x"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS"
value="-Dcatalina.home=${project_loc:/tomcat-11.0.x/java/org/apache/catalina/startup/Bootstrap.java}/output/build"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR"
value="tomcat-12.0.x"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS"
value="-Dcatalina.home=${project_loc:/tomcat-12.0.x/java/org/apache/catalina/startup/Bootstrap.java}/output/build"/>
</launchConfiguration>
diff --git a/res/maven/mvn-pub.xml b/res/maven/mvn-pub.xml
index d3120f9f7e..331a53b164 100644
--- a/res/maven/mvn-pub.xml
+++ b/res/maven/mvn-pub.xml
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project name="Tomcat 11.0 Maven Deployment" default="" basedir="."
+<project name="Tomcat 12.0 Maven Deployment" default="" basedir="."
xmlns:resolver="antlib:org.apache.maven.resolver.ant"
xmlns:if="ant:if"
xmlns:unless="ant:unless">
diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index 9475180e45..f756f5aac4 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=11.0.0-M25
+maven.asf.release.deploy.version=12.0.0-M1
#Where do we load the libraries from
tomcat.lib.path=../../output/build/lib
diff --git a/res/rat/rat-excludes.txt b/res/rat/rat-excludes.txt
index c185941722..16cac64276 100644
--- a/res/rat/rat-excludes.txt
+++ b/res/rat/rat-excludes.txt
@@ -258,4 +258,4 @@ output/dist/temp/safeToDelete.tmp
output/res/checkstyle/*
-tomcat-11.0.x/**
+tomcat-12.0.x/**
diff --git a/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java
b/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java
index 28a2582d70..8b4f93313f 100644
--- a/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java
+++ b/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java
@@ -50,7 +50,7 @@ public class TesterOpenSSL {
versionString = "";
}
if (versionString.startsWith("OpenSSL 3.4.")) {
- // Note: Gump currently tests 11.x with OpenSSL HEAD which is
current 3.4.x
+ // Note: Gump currently tests 12.x with OpenSSL HEAD which is
current 3.4.x
VERSION = 30400;
} else if (versionString.startsWith("OpenSSL 3.3.")) {
VERSION = 30300;
diff --git a/test/webapp/bug66609/_listing.xslt
b/test/webapp/bug66609/_listing.xslt
index ee132052b1..e8445ad8de 100644
--- a/test/webapp/bug66609/_listing.xslt
+++ b/test/webapp/bug66609/_listing.xslt
@@ -55,7 +55,7 @@
</table>
<xsl:apply-templates select="readme"/>
<hr style="height: 1px;" />
- <h3>Apache Tomcat/11.0</h3>
+ <h3>Apache Tomcat/12.0</h3>
</body>
</html>
</xsl:template>
diff --git a/webapps/docs/architecture/project.xml
b/webapps/docs/architecture/project.xml
index e254fd0c14..eaa6df302e 100644
--- a/webapps/docs/architecture/project.xml
+++ b/webapps/docs/architecture/project.xml
@@ -15,10 +15,10 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project name="Apache Tomcat 11 Architecture"
+<project name="Apache Tomcat 12 Architecture"
href="https://tomcat.apache.org/";>
- <title>Apache Tomcat 11 Architecture</title>
+ <title>Apache Tomcat 12 Architecture</title>
<logo href="/images/tomcat.gif">
The Apache Tomcat Servlet/JSP Container
diff --git a/webapps/docs/architecture/startup.xml
b/webapps/docs/architecture/startup.xml
index 5fbcfc57e5..f25d48c529 100644
--- a/webapps/docs/architecture/startup.xml
+++ b/webapps/docs/architecture/startup.xml
@@ -46,7 +46,7 @@ different ways to start tomcat, including:
<p>
A <a href="startup/serverStartup.txt">text description</a> of the startup
procedure created for Tomcat 5. The updated version of this description for
-Tomcat 11 will be included in the updated diagrams and diagram descriptions in
+Tomcat 12 will be included in the updated diagrams and diagram descriptions in
the following section. This text file will be removed when that update is
complete.
</p>
@@ -56,7 +56,7 @@ complete.
<p>
The <a href="startup/serverStartup.pdf">UML sequence diagram</a> of the startup
procedure created for Tomcat 5 is gradually being replaced with updated
diagrams
-based on Tomcat 11. The scope of these diagrams may be adjusted as they are
+based on Tomcat 12. The scope of these diagrams may be adjusted as they are
produced.
</p>
<p>
diff --git a/webapps/docs/config/project.xml b/webapps/docs/config/project.xml
index 2ad249bb2d..354bf3642f 100644
--- a/webapps/docs/config/project.xml
+++ b/webapps/docs/config/project.xml
@@ -15,10 +15,10 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project name="Apache Tomcat 11 Configuration Reference"
+<project name="Apache Tomcat 12 Configuration Reference"
href="https://tomcat.apache.org/";>
- <title>Apache Tomcat 11 Configuration Reference</title>
+ <title>Apache Tomcat 12 Configuration Reference</title>
<logo href="/images/tomcat.gif">
The Apache Tomcat Servlet/JSP Container
diff --git a/webapps/docs/introduction.xml b/webapps/docs/introduction.xml
index 6e80c4d573..6a38cc8d91 100644
--- a/webapps/docs/introduction.xml
+++ b/webapps/docs/introduction.xml
@@ -86,8 +86,8 @@ do let us know.</p>
<ul>
<li>
<strong>CATALINA_HOME</strong>: Represents the root of your Tomcat
- installation, for example
<code>/home/tomcat/apache-tomcat-11.0.0</code>
- or <code>C:\Program Files\apache-tomcat-11.0.0</code>.
+ installation, for example
<code>/home/tomcat/apache-tomcat-12.0.0</code>
+ or <code>C:\Program Files\apache-tomcat-12.0.0</code>.
</li>
<li>
<strong>CATALINA_BASE</strong>: Represents the root of a runtime
diff --git a/webapps/docs/project.xml b/webapps/docs/project.xml
index ab04321545..508c4dbf43 100644
--- a/webapps/docs/project.xml
+++ b/webapps/docs/project.xml
@@ -18,7 +18,7 @@
<project name="Apache Tomcat Documentation"
href="https://tomcat.apache.org/";>
- <title>Apache Tomcat 11</title>
+ <title>Apache Tomcat 12</title>
<logo href="/images/tomcat.gif">
The Apache Tomcat Servlet/JSP Container
diff --git a/webapps/docs/tomcat-docs.xsl b/webapps/docs/tomcat-docs.xsl
index 69e27742db..66aa1c1c77 100644
--- a/webapps/docs/tomcat-docs.xsl
+++ b/webapps/docs/tomcat-docs.xsl
@@ -34,9 +34,9 @@
<xsl:param name="subdir" select="''"/>
<xsl:param name="relative-path" select="'.'"/>
<!-- Keep versions in sync with build.xml -->
- <xsl:param name="version" select="'11.0.x'"/>
- <xsl:param name="majorversion" select="'11'"/>
- <xsl:param name="majorminorversion" select="'11.0'"/>
+ <xsl:param name="version" select="'12.0.x'"/>
+ <xsl:param name="majorversion" select="'12'"/>
+ <xsl:param name="majorminorversion" select="'12.0'"/>
<xsl:param name="minjavaversion" select="'17'"/>
<xsl:param name="buildjavaversion" select="'22'"/>
<xsl:param name="antversionrequired" select="'1.10.2'"/>
@@ -46,9 +46,9 @@
<xsl:param name="buglink"
select="'https://bz.apache.org/bugzilla/show_bug.cgi?id='"/>
<xsl:param name="prlink"
select="'https://github.com/apache/tomcat/pull/'"/>
<xsl:param name="revlink"
select="'https://svn.apache.org/viewvc?view=rev&rev='"/>
- <xsl:param name="doclink"
select="'https://tomcat.apache.org/tomcat-11.0-doc'"/>
- <xsl:param name="sylink"
select="'https://tomcat.apache.org/security-11.html'"/>
- <xsl:param name="dllink"
select="'https://tomcat.apache.org/download-11.cgi'"/>
+ <xsl:param name="doclink"
select="'https://tomcat.apache.org/tomcat-12.0-doc'"/>
+ <xsl:param name="sylink"
select="'https://tomcat.apache.org/security-12.html'"/>
+ <xsl:param name="dllink"
select="'https://tomcat.apache.org/download-12.cgi'"/>
<xsl:param name="sitedir" select="''"/>
<xsl:param name="filename" select="'-'"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
