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 3757678986 More version updates. Mostly 10->11
3757678986 is described below
commit 3757678986edf6d19278b4aebd97616a6b98aba0
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Oct 11 20:20:19 2022 +0100
More version updates. Mostly 10->11
---
CONTRIBUTING.md | 4 ++--
README.md | 4 ++--
java/org/apache/jasper/servlet/JspCServletContext.java | 2 +-
modules/stuffed/pom.xml | 3 +--
webapps/docs/architecture/project.xml | 4 ++--
webapps/docs/changelog.xml | 2 +-
webapps/docs/config/project.xml | 4 ++--
webapps/docs/introduction.xml | 4 ++--
webapps/docs/project.xml | 2 +-
webapps/docs/tomcat-docs.xsl | 4 ++--
10 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 0ffe20f4fe..076ff10664 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -81,7 +81,7 @@ manually generate the patch file by using diff. If this is
what you want, you
can download the sources from the "Source Code Distributions" section of the
Download Page. There is one such page for every major Tomcat version:
-- [Tomcat 10](https://tomcat.apache.org/download-10.cgi)
+- [Tomcat 11](https://tomcat.apache.org/download-11.cgi)
- [Tomcat 9](https://tomcat.apache.org/download-90.cgi)
- [Tomcat 8](https://tomcat.apache.org/download-80.cgi)
- [Tomcat 7](https://tomcat.apache.org/download-70.cgi)
@@ -153,7 +153,7 @@ Apache Tomcat has very loosely defined coding conventions,
but the following
guidelines will be useful:
* Use spaces for indenting, not tabs
-* 100 char line width for Java source, 80 char line width for documentation
+* 120 char line width for Java source, 80 char line width for documentation
source (.txt, .xml)
* Java source: { at end of line, 4 space indents
* XML source: 2 space indents
diff --git a/README.md b/README.md
index e1abc71e7b..d3b55f8c5a 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@ project logo are trademarks of the Apache Software Foundation.
For every major Tomcat version there is one download page containing
links to the latest binary and source code downloads, but also
links for browsing the download directories and archives:
-- [Tomcat 10](https://tomcat.apache.org/download-10.cgi)
+- [Tomcat 11](https://tomcat.apache.org/download-11.cgi)
- [Tomcat 9](https://tomcat.apache.org/download-90.cgi)
- [Tomcat 8](https://tomcat.apache.org/download-80.cgi)
- [Tomcat 7](https://tomcat.apache.org/download-70.cgi)
@@ -44,7 +44,7 @@ included in the docs webapp which ships with tomcat. You can
access that webapp
by starting tomcat and visiting <http://localhost:8080/docs/> in your browser.
The most up-to-date documentation for each version can be found at:
- [Tomcat 11.0](https://tomcat.apache.org/tomcat-11.0-doc/)
-- [Tomcat 10.0](https://tomcat.apache.org/tomcat-10.0-doc/)
+- [Tomcat 11.0](https://tomcat.apache.org/tomcat-11.0-doc/)
- [Tomcat 9](https://tomcat.apache.org/tomcat-9.0-doc/)
- [Tomcat 8](https://tomcat.apache.org/tomcat-8.5-doc/)
diff --git a/java/org/apache/jasper/servlet/JspCServletContext.java
b/java/org/apache/jasper/servlet/JspCServletContext.java
index 70bb6edd96..3cb4e1de5c 100644
--- a/java/org/apache/jasper/servlet/JspCServletContext.java
+++ b/java/org/apache/jasper/servlet/JspCServletContext.java
@@ -496,7 +496,7 @@ public class JspCServletContext implements ServletContext {
*/
@Override
public String getServerInfo() {
- return "JspC/ApacheTomcat10";
+ return "JspC/ApacheTomcat11";
}
diff --git a/modules/stuffed/pom.xml b/modules/stuffed/pom.xml
index 0dd8fb8f10..6f4b44c370 100644
--- a/modules/stuffed/pom.xml
+++ b/modules/stuffed/pom.xml
@@ -29,8 +29,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<mainClass>org.apache.catalina.startup.Tomcat</mainClass>
- <tomcat.version>10.0.18</tomcat.version>
- <!-- <tomcat.version>9.0.60</tomcat.version> -->
+ <tomcat.version>11.0.0-SNAPSHOT</tomcat.version>
</properties>
<dependencies>
diff --git a/webapps/docs/architecture/project.xml
b/webapps/docs/architecture/project.xml
index 6b77dc9d87..e254fd0c14 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 10 Architecture"
+<project name="Apache Tomcat 11 Architecture"
href="https://tomcat.apache.org/";>
- <title>Apache Tomcat 10 Architecture</title>
+ <title>Apache Tomcat 11 Architecture</title>
<logo href="/images/tomcat.gif">
The Apache Tomcat Servlet/JSP Container
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 63de62acd5..3fa3fe7901 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -109,7 +109,7 @@
<changelog>
<scode>
This release contains all of the changes up to and including those in
- Apache Tomcat 10.0.6 plus the additional changes listed below. (markt)
+ Apache Tomcat 10.1.1 plus the additional changes listed below. (markt)
</scode>
</changelog>
</subsection>
diff --git a/webapps/docs/config/project.xml b/webapps/docs/config/project.xml
index e9a2ba5ad0..2ad249bb2d 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 10 Configuration Reference"
+<project name="Apache Tomcat 11 Configuration Reference"
href="https://tomcat.apache.org/";>
- <title>Apache Tomcat 10 Configuration Reference</title>
+ <title>Apache Tomcat 11 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 5b06ffcf79..6e80c4d573 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-9.0.10</code>
- or <code>C:\Program Files\apache-tomcat-9.0.10</code>.
+ installation, for example
<code>/home/tomcat/apache-tomcat-11.0.0</code>
+ or <code>C:\Program Files\apache-tomcat-11.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 00aa8135ca..42ea6a24df 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 10</title>
+ <title>Apache Tomcat 11</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 0af22d75b4..ec905cbe8e 100644
--- a/webapps/docs/tomcat-docs.xsl
+++ b/webapps/docs/tomcat-docs.xsl
@@ -49,8 +49,8 @@
<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-10.html'"/>
- <xsl:param name="dllink"
select="'https://tomcat.apache.org/download-10.cgi'"/>
+ <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="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
