Buildbot success in on tomcat-11.0.x
Build status: Build succeeded! Worker used: bb2_worker2_ubuntu URL: https://ci2.apache.org/#builders/112/builds/140 Blamelist: Mark Thomas Build Text: build successful Status Detected: restored build Build Source Stamp: [branch main] 8e786a8eda188426dff97e9c997dfceb4eb469c2 Steps: worker_preparation: 0 git: 0 shell: 0 shell_1: 0 shell_2: 0 shell_3: 0 shell_4: 0 shell_5: 0 compile: 1 shell_6: 0 shell_7: 0 shell_8: 0 shell_9: 0 Rsync docs to nightlies.apache.org: 0 shell_10: 0 Rsync RAT to nightlies.apache.org: 0 compile_1: 1 shell_11: 0 Rsync Logs to nightlies.apache.org: 0 -- ASF Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Checkstyle, Javadoc and automatic formatting
On Thu, Jan 19, 2023 at 5:56 PM Mark Thomas wrote: > > Hi all, > > Ever since the first CheckStyle rules were added, I have been looking at > the options for using my IDE (Eclipse) to fix the code so it meets the > rules. The results until today have been mixed. Some stuff gets fixed > but other stuff gets broken. > > Today, however, I made progress. I think I have a Eclipse Formatter > configuration that would enable us to turn on a number of the rules that > are currently commented out (indentation, operator at end of line, etc) > and auto format the code to fix any issues without messing up too much > other stuff. > > I'd like to start testing out the formatter by reformatting files before > I work on them. However, before I do that I was wondering whether we > wanted to format the Javadoc as well - especially given the recent > Javadoc rules added to CheckStyle. > > With that in mind, what do folks think about increasing the comment > width from 80 to 120 to match the code? > > After that, my thinking is: > - blank line between description and tags (param, return, throws etc) > - blank line between different tag types (separate param, return etc) > > Those are the easy ones. There are lots of options for aligning tags. > Personally, I am looking for clarity while still using space efficiently > so I prefer that parameter and throws descriptions don't start on a new > line after a tag. > > With a longer permitted line for Javadoc I think we can: > - align descriptions grouped by type > - indent tag descriptions > > That would give Javadoc that looks a bit like this but not as condensed > as I have used a much shorter max line length: > > /** > * Method description. May be short or long. > * > * @param first The first parameter. For an optimum result, this > * should be an odd number between 0 and 100. > * @param second The second parameter. > * > * @return The result of the foo operation, usually an even number > * within 0 and 1000. > * > * @throws Exception when the foo operation cannot be performed > * for one reason or another. > */ > > With the longer line length, I suspect most tag descriptions won't need > to wrap. However, if we are worried about long exception names or > parameter names causing problems we could use: > > /** > * Method description. May be short or long. > * > * @param first The first parameter. For an optimum result, this > * should be an odd number between 0 and 100. > * @param second The second parameter. > * > * @return The result of the foo operation, usually an even number > * within 0 and 1000. > * > * @throws Exception when the foo operation cannot be performed > * for one reason or another. > */ > > I think I prefer the first but could live with either. > > Thoughts? Ok for the first. Personally: - No opinion at all on javadoc formatting. - Code formatting is important, but the rules in place were more than enough to satisfy me. So no opinion on going further. Rémy > > Mark > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Update the default HEAD response to exclude payload headers
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 8e786a8eda Update the default HEAD response to exclude payload headers
8e786a8eda is described below
commit 8e786a8eda188426dff97e9c997dfceb4eb469c2
Author: Mark Thomas
AuthorDate: Thu Jan 19 20:40:10 2023 +
Update the default HEAD response to exclude payload headers
First explicitly allowed in RFC 7231 and also in the current RFC 9110
---
java/org/apache/coyote/http11/Http11Processor.java | 10 +++-
java/org/apache/coyote/http2/StreamProcessor.java | 6 +
.../servlet/http/HttpServletDoHeadBaseTest.java| 27 +-
test/jakarta/servlet/http/TestHttpServlet.java | 20 ++--
webapps/docs/changelog.xml | 4
5 files changed, 58 insertions(+), 9 deletions(-)
diff --git a/java/org/apache/coyote/http11/Http11Processor.java
b/java/org/apache/coyote/http11/Http11Processor.java
index c27ff911f4..951d276593 100644
--- a/java/org/apache/coyote/http11/Http11Processor.java
+++ b/java/org/apache/coyote/http11/Http11Processor.java
@@ -916,7 +916,8 @@ public class Http11Processor extends AbstractProcessor {
}
MessageBytes methodMB = request.method();
-if (methodMB.equals("HEAD")) {
+boolean head = methodMB.equals("HEAD");
+if (head) {
// No entity body
outputBuffer.addActiveFilter
(outputFilters[Constants.VOID_FILTER]);
@@ -1056,6 +1057,13 @@ public class Http11Processor extends AbstractProcessor {
headers.setValue("Server").setString(server);
}
+if (head) {
+headers.removeHeader("content-length");
+headers.removeHeader("content-range");
+headers.removeHeader("trailer");
+headers.removeHeader("transfer-encoding");
+}
+
// Build the response header
try {
outputBuffer.sendStatus();
diff --git a/java/org/apache/coyote/http2/StreamProcessor.java
b/java/org/apache/coyote/http2/StreamProcessor.java
index 3afda9037b..acd9dce237 100644
--- a/java/org/apache/coyote/http2/StreamProcessor.java
+++ b/java/org/apache/coyote/http2/StreamProcessor.java
@@ -220,6 +220,12 @@ class StreamProcessor extends AbstractProcessor {
if (statusCode >= 200 && headers.getValue("date") == null) {
headers.addValue("date").setString(FastHttpDateFormat.getCurrentDate());
}
+
+// Remove payload headers for HEAD requests
+if (coyoteRequest != null &&
"HEAD".equals(coyoteRequest.method().toString())) {
+headers.removeHeader("content-length");
+headers.removeHeader("content-range");
+}
}
diff --git a/test/jakarta/servlet/http/HttpServletDoHeadBaseTest.java
b/test/jakarta/servlet/http/HttpServletDoHeadBaseTest.java
index 21a962d48d..e513be2430 100644
--- a/test/jakarta/servlet/http/HttpServletDoHeadBaseTest.java
+++ b/test/jakarta/servlet/http/HttpServletDoHeadBaseTest.java
@@ -95,7 +95,15 @@ public class HttpServletDoHeadBaseTest extends Http2TestBase
{
rc = headUrl(path, out, headHeaders);
Assert.assertEquals(HttpServletResponse.SC_OK, rc);
-// Headers should be the same (apart from Date)
+// Headers should be the same part from:
+// - Date header may be different
+// - HEAD requests don't include payload headers
+// (RFC 7231, section 4.3.2)
+getHeaders.remove("content-length");
+getHeaders.remove("content-range");
+getHeaders.remove("trailer");
+getHeaders.remove("transfer-encoding");
+
Assert.assertEquals(getHeaders.size(), headHeaders.size());
for (Map.Entry> getHeader :
getHeaders.entrySet()) {
String headerName = getHeader.getKey();
@@ -158,15 +166,22 @@ public class HttpServletDoHeadBaseTest extends
Http2TestBase {
String[] headHeaders = traceHead.split("\n");
int i = 0;
+int j = 0;
for (; i < getHeaders.length; i++) {
-// Headers should be the same, ignoring the first character
which is the steam ID
-Assert.assertEquals(getHeaders[i] + "\n" + traceGet +
traceHead, '3', getHeaders[i].charAt(0));
-Assert.assertEquals(headHeaders[i] + "\n" + traceGet +
traceHead, '5', headHeaders[i].charAt(0));
-Assert.assertEquals(traceGet + traceHead,
getHeaders[i].substring(1), headHeaders[i].substring(1));
+// Ignore payload headers
+if (getHeaders[i].contains("content-length") ||
getHeaders[i].contains("content-range") ) {
+// Skip
+} else {
+// Headers should be the same, ignoring the first
character
RE: [ANN] Apache Tomcat 8.5.84 available
Please update the subject line. :-) Dream * Excel * Explore * Inspire Jon McAlexander Senior Infrastructure Engineer Asst. Vice President He/His Middleware Product Engineering Enterprise CIO | EAS | Middleware | Infrastructure Solutions 8080 Cobblestone Rd | Urbandale, IA 50322 MAC: F4469-010 Tel 515-988-2508 | Cell 515-988-2508 jonmcalexan...@wellsfargo.com This message may contain confidential and/or privileged information. If you are not the addressee or authorized to receive this for the addressee, you must not use, copy, disclose, or take any action based on this message or any information herein. If you have received this message in error, please advise the sender immediately by reply e-mail and delete this message. Thank you for your cooperation. > -Original Message- > From: Christopher Schultz > Sent: Thursday, January 19, 2023 2:15 PM > To: Tomcat Developers List ; Tomcat Users List > ; annou...@tomcat.apache.org; > annou...@apache.org > Subject: [ANN] Apache Tomcat 8.5.84 available > Importance: High > > The Apache Tomcat team announces the immediate availability of Apache > Tomcat 8.5.85. > > Apache Tomcat 8 is an open source software implementation of the Java > Servlet, JavaServer Pages, Java Unified Expression Language, Java > WebSocket and JASPIC technologies. > > Apache Tomcat 8.5.85 is a bugfix and feature release. The notable changes > compared to 8.5.84 include: > > - The default value of AccessLogValve's file encoding is > now UTF-8. > > - Correct a regression in the refactoring that replaced the use of the > URL constructors. The regression broke lookups for resources that > contained one or more characters in their name that required escaping > when used in a URI path. > > - When an HTTP/2 stream was reset, the current active stream count was > not reduced. If enough resets occurred on a connection, the current > active stream count limit was reached and no new streams could be > created on that connection. > > - Change the default of the > org.apache.el.GET_CLASSLOADER_USE_PRIVILEGED > system property to true unless the EL library is running on Tomcat in > which case the default remains false as the EL library is already > called from within a privileged block and skipping the unnecessary > privileged block improves performance. > > Along with lots of other bug fixes and improvements. > > Please refer to the change log for the complete list of changes: > https://urldefense.com/v3/__https://tomcat.apache.org/tomcat-8.5- > doc/changelog.html__;!!F9svGWnIaVPGSwU!tDwmxw-uaKfem6BEKLq- > Id8FG97PqzTfCb08s- > SjMz8raZCoUhoYA5JCWnWkSkJdWMVfeYCzNW7zotqQHLCbEB9B$ > > Downloads: > https://urldefense.com/v3/__https://tomcat.apache.org/download- > 80.cgi__;!!F9svGWnIaVPGSwU!tDwmxw-uaKfem6BEKLq- > Id8FG97PqzTfCb08s- > SjMz8raZCoUhoYA5JCWnWkSkJdWMVfeYCzNW7zotqQHFBGWIuR$ > > Migration guides from Apache Tomcat 7.x and 8.0: > https://urldefense.com/v3/__https://tomcat.apache.org/migration.html__; > !!F9svGWnIaVPGSwU!tDwmxw-uaKfem6BEKLq-Id8FG97PqzTfCb08s- > SjMz8raZCoUhoYA5JCWnWkSkJdWMVfeYCzNW7zotqQHPlBxE8v$ > > Please note that Tomcat 8.5.x will reach End-of-life (EOL) on 31 March 2024. > For more information please > visit https://urldefense.com/v3/__https://tomcat.apache.org/tomcat-85- > eol.html__;!!F9svGWnIaVPGSwU!tDwmxw-uaKfem6BEKLq- > Id8FG97PqzTfCb08s- > SjMz8raZCoUhoYA5JCWnWkSkJdWMVfeYCzNW7zotqQHHwbRXpJ$ > > Enjoy! > > - The Apache Tomcat team > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional > commands, e-mail: dev-h...@tomcat.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[ANN] Apache Tomcat 8.5.84 available
The Apache Tomcat team announces the immediate availability of Apache Tomcat 8.5.85. Apache Tomcat 8 is an open source software implementation of the Java Servlet, JavaServer Pages, Java Unified Expression Language, Java WebSocket and JASPIC technologies. Apache Tomcat 8.5.85 is a bugfix and feature release. The notable changes compared to 8.5.84 include: - The default value of AccessLogValve's file encoding is now UTF-8. - Correct a regression in the refactoring that replaced the use of the URL constructors. The regression broke lookups for resources that contained one or more characters in their name that required escaping when used in a URI path. - When an HTTP/2 stream was reset, the current active stream count was not reduced. If enough resets occurred on a connection, the current active stream count limit was reached and no new streams could be created on that connection. - Change the default of the org.apache.el.GET_CLASSLOADER_USE_PRIVILEGED system property to true unless the EL library is running on Tomcat in which case the default remains false as the EL library is already called from within a privileged block and skipping the unnecessary privileged block improves performance. Along with lots of other bug fixes and improvements. Please refer to the change log for the complete list of changes: https://tomcat.apache.org/tomcat-8.5-doc/changelog.html Downloads: https://tomcat.apache.org/download-80.cgi Migration guides from Apache Tomcat 7.x and 8.0: https://tomcat.apache.org/migration.html Please note that Tomcat 8.5.x will reach End-of-life (EOL) on 31 March 2024. For more information please visit https://tomcat.apache.org/tomcat-85-eol.html Enjoy! - The Apache Tomcat team - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1906823 - in /tomcat/site/trunk: ./ docs/ docs/tomcat-8.5-doc/ docs/tomcat-8.5-doc/annotationapi/ docs/tomcat-8.5-doc/annotationapi/javax/annotation/ docs/tomcat-8.5-doc/annotationapi/jav
Author: schultz Date: Thu Jan 19 20:14:29 2023 New Revision: 1906823 URL: http://svn.apache.org/viewvc?rev=1906823=rev Log: Update website to announce release of Tomcat 8.5.85. [This commit notification would consist of 82 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.] - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r59451 - /release/tomcat/tomcat-8/v8.5.84/
Author: schultz Date: Thu Jan 19 20:14:33 2023 New Revision: 59451 Log: Remove previous release. Removed: release/tomcat/tomcat-8/v8.5.84/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Update changelog to indicate the release date for 8.5.85.
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 The following commit(s) were added to refs/heads/8.5.x by this push: new 4516fd434d Update changelog to indicate the release date for 8.5.85. 4516fd434d is described below commit 4516fd434d64219cc56db174014f3992aeadc7c7 Author: Christopher Schultz AuthorDate: Thu Jan 19 15:13:33 2023 -0500 Update changelog to indicate the release date for 8.5.85. --- 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 478d7f3251..26476439f8 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). --> - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Fix another test broken when I cleaned up the security manager stuff
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 47508ce139 Fix another test broken when I cleaned up the security
manager stuff
47508ce139 is described below
commit 47508ce13923f3384874277cdea2d26f453c3441
Author: Mark Thomas
AuthorDate: Thu Jan 19 20:09:50 2023 +
Fix another test broken when I cleaned up the security manager stuff
---
.../org/apache/juli/TestClassLoaderLogManager.java | 24 +-
1 file changed, 23 insertions(+), 1 deletion(-)
diff --git a/test/org/apache/juli/TestClassLoaderLogManager.java
b/test/org/apache/juli/TestClassLoaderLogManager.java
index 696af00ccb..0dda55bd03 100644
--- a/test/org/apache/juli/TestClassLoaderLogManager.java
+++ b/test/org/apache/juli/TestClassLoaderLogManager.java
@@ -20,6 +20,9 @@ import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
import java.util.Collections;
import java.util.Random;
import java.util.logging.Level;
@@ -160,7 +163,12 @@ public class TestClassLoaderLogManager {
}
}
-private static class TestClassLoader extends ClassLoader implements
WebappProperties {
+private static class TestClassLoader extends URLClassLoader implements
WebappProperties {
+
+public TestClassLoader() {
+super(new URL[0]);
+}
+
@Override
public String getWebappName() {
@@ -182,6 +190,20 @@ public class TestClassLoaderLogManager {
return true;
}
+@Override
+public URL findResource(String name) {
+if ("logging.properties".equals(name)) {
+try {
+return new URL("file:///path/does/not/exist");
+} catch (MalformedURLException e) {
+// Should never happen
+throw new IllegalArgumentException(e);
+}
+}
+return null;
+}
+
+
@Override
public InputStream getResourceAsStream(final String resource) {
if ("logging.properties".equals(resource)) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Delete tests for security manager related functionality
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 b267fa04b3 Delete tests for security manager related functionality
b267fa04b3 is described below
commit b267fa04b389a295a86731ce34263105e09695bd
Author: Mark Thomas
AuthorDate: Thu Jan 19 19:55:01 2023 +
Delete tests for security manager related functionality
---
.../catalina/webresources/TestFileResource.java| 45 --
1 file changed, 45 deletions(-)
diff --git a/test/org/apache/catalina/webresources/TestFileResource.java
b/test/org/apache/catalina/webresources/TestFileResource.java
deleted file mode 100644
index 53916e9468..00
--- a/test/org/apache/catalina/webresources/TestFileResource.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.catalina.webresources;
-
-import java.io.File;
-
-import jakarta.servlet.http.HttpServletResponse;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-import org.apache.catalina.startup.TomcatBaseTest;
-import org.apache.tomcat.util.buf.ByteChunk;
-
-public class TestFileResource extends TomcatBaseTest {
-
-@Test
-public void testGetCodePath() throws Exception {
-getTomcatInstanceTestWebapp(false, true);
-
-ByteChunk out = new ByteChunk();
-
-int rc = getUrl("http://localhost:; + getPort() +
"/test/bug5/bug58096.jsp", out, null);
-
-Assert.assertEquals(HttpServletResponse.SC_OK, rc);
-
-// Build the expected location the same way the webapp base dir is
built
-File f = new File("test/webapp/WEB-INF/classes");
-Assert.assertEquals(f.getCanonicalFile().toURI().toURL().toString(),
out.toString().trim());
-}
-}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Fix test failures resulting from removal of security manager
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 0158df68e3 Fix test failures resulting from removal of security manager
0158df68e3 is described below
commit 0158df68e38fd4ce681841950a5c579def45413f
Author: Mark Thomas
AuthorDate: Thu Jan 19 19:44:49 2023 +
Fix test failures resulting from removal of security manager
---
java/org/apache/catalina/loader/WebappClassLoaderBase.java | 13 +
1 file changed, 1 insertion(+), 12 deletions(-)
diff --git a/java/org/apache/catalina/loader/WebappClassLoaderBase.java
b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
index 48c12ca716..240a0782c2 100644
--- a/java/org/apache/catalina/loader/WebappClassLoaderBase.java
+++ b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
@@ -1323,18 +1323,7 @@ public abstract class WebappClassLoaderBase extends
URLClassLoader
*/
@Override
protected PermissionCollection getPermissions(CodeSource codeSource) {
-String codeUrl = codeSource.getLocation().toString();
-PermissionCollection pc;
-if ((pc = loaderPC.get(codeUrl)) == null) {
-pc = super.getPermissions(codeSource);
-if (pc != null) {
-for (Permission p : permissionList) {
-pc.add(p);
-}
-loaderPC.put(codeUrl,pc);
-}
-}
-return pc;
+return null;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Remove Java 11
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 b5d5ab9724 Remove Java 11
b5d5ab9724 is described below
commit b5d5ab9724965949ccfbe622cf2337f2f40739c0
Author: Mark Thomas
AuthorDate: Thu Jan 19 19:39:11 2023 +
Remove Java 11
---
.github/workflows/ci.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f94154c121..718d2c9c53 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -31,11 +31,11 @@ jobs:
strategy:
fail-fast: false
matrix:
-java: [ 11, 17, 19, 20-ea ]
+java: [ 17, 19, 20-ea ]
os: [ ubuntu-latest ]
include:
- os: windows-latest
- java: 11
+ java: 17
name: JDK${{ matrix.java }} ${{ matrix.os }}
runs-on: ${{ matrix.os }}
steps:
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Need to be on version 3 to silence the warning
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 0fd3de41b2 Need to be on version 3 to silence the warning
0fd3de41b2 is described below
commit 0fd3de41b23c42ee11810e303556231b2b761e0f
Author: Mark Thomas
AuthorDate: Thu Jan 19 19:35:56 2023 +
Need to be on version 3 to silence the warning
---
.github/workflows/ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c632f8d56f..f94154c121 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -42,7 +42,7 @@ jobs:
- name: Git Checkout
uses: actions/checkout@v3
- name: Set up Java
- uses: actions/setup-java@v2
+ uses: actions/setup-java@v3
with:
java-version: ${{ matrix.java }}
distribution: zulu
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Update GitHub actions
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 4668eb5bdc Update GitHub actions
4668eb5bdc is described below
commit 4668eb5bdcf1ea1e7bfbad1d0453d3485ff3c1c6
Author: Mark Thomas
AuthorDate: Thu Jan 19 19:33:40 2023 +
Update GitHub actions
---
.github/workflows/ci.yml | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 91150ba20f..c632f8d56f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -40,11 +40,12 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- name: Git Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
- name: Set up Java
- uses: actions/setup-java@v1
+ uses: actions/setup-java@v2
with:
java-version: ${{ matrix.java }}
+distribution: zulu
- name: Build
run: |
ant -noinput echoproperties deploy embed test-nio test-status
@@ -53,7 +54,7 @@ jobs:
continue-on-error:
true
- name: Upload logs
- uses: actions/upload-artifact@v2
+ uses: actions/upload-artifact@v3
with:
name: JDK${{ matrix.java }}-${{ matrix.os }}-logs
path: output/build/logs/TEST*.txt
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Buildbot failure in on tomcat-11.0.x
Build status: BUILD FAILED: failed compile (failure) Worker used: bb2_worker2_ubuntu URL: https://ci2.apache.org/#builders/112/builds/139 Blamelist: Mark Thomas Build Text: failed compile (failure) Status Detected: new failure Build Source Stamp: [branch main] 407869c47ea2fd4a0ceba08d5ea4233ec9c43201 Steps: worker_preparation: 0 git: 0 shell: 0 shell_1: 0 shell_2: 0 shell_3: 0 shell_4: 0 shell_5: 0 compile: 1 shell_6: 0 shell_7: 0 shell_8: 0 shell_9: 0 Rsync docs to nightlies.apache.org: 0 shell_10: 0 Rsync RAT to nightlies.apache.org: 0 compile_1: 2 shell_11: 0 Rsync Logs to nightlies.apache.org: 0 -- ASF Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Log basic information for each configured TLS cert when Tomcat starts
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 3dd275020c Log basic information for each configured TLS cert when
Tomcat starts
3dd275020c is described below
commit 3dd275020c8d559812fdff3caa92df9337458008
Author: Mark Thomas
AuthorDate: Thu Jan 19 18:08:10 2023 +
Log basic information for each configured TLS cert when Tomcat starts
---
.../apache/tomcat/util/net/AbstractEndpoint.java | 26 ++
.../tomcat/util/net/AbstractJsseEndpoint.java | 1 +
java/org/apache/tomcat/util/net/AprEndpoint.java | 1 +
.../apache/tomcat/util/net/LocalStrings.properties | 1 +
java/org/apache/tomcat/util/net/SSLUtilBase.java | 4 +++-
webapps/docs/changelog.xml | 8 +++
6 files changed, 40 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
index bded5b63a3..ac7ba21bb5 100644
--- a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
@@ -366,6 +366,32 @@ public abstract class AbstractEndpoint {
protected abstract void createSSLContext(SSLHostConfig sslHostConfig)
throws Exception;
+protected void logCertificate(SSLHostConfigCertificate certificate) {
+SSLHostConfig sslHostConfig = certificate.getSSLHostConfig();
+
+String certificateSource = certificate.getCertificateKeystoreFile();
+if (certificateSource == null) {
+certificateSource = certificate.getCertificateKeyFile();
+}
+
+String keyAlias = certificate.getCertificateKeyAlias();
+if (keyAlias == null) {
+keyAlias = SSLUtilBase.DEFAULT_KEY_ALIAS;
+}
+
+String trustStoreSource = sslHostConfig.getTruststoreFile();
+if (trustStoreSource == null) {
+trustStoreSource = sslHostConfig.getCaCertificateFile();
+}
+if (trustStoreSource == null) {
+trustStoreSource = sslHostConfig.getCaCertificatePath();
+}
+
+getLog().info(sm.getString("endpoint.tls.info", getName(),
sslHostConfig.getHostName(), certificate.getType(),
+certificateSource, keyAlias, trustStoreSource));
+}
+
+
protected void destroySsl() throws Exception {
if (isSSLEnabled()) {
for (SSLHostConfig sslHostConfig : sslHostConfigs.values()) {
diff --git a/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
b/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
index abbdba8e81..ab8767b10b 100644
--- a/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
@@ -108,6 +108,7 @@ public abstract class AbstractJsseEndpoint extends
AbstractEndpoint {
throw new IllegalArgumentException(e.getMessage(), e);
}
+logCertificate(certificate);
certificate.setSslContext(sslContext);
}
}
diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java
b/java/org/apache/tomcat/util/net/AprEndpoint.java
index c30541f950..5c5b61fd3b 100644
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -408,6 +408,7 @@ public class AprEndpoint extends
AbstractEndpoint implements SNICallB
sslContext.addCertificate(certificate);
}
+logCertificate(certificate);
certificate.setSslContext(sslContext);
}
diff --git a/java/org/apache/tomcat/util/net/LocalStrings.properties
b/java/org/apache/tomcat/util/net/LocalStrings.properties
index 18a006139b..ea7bdc04f7 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings.properties
@@ -127,6 +127,7 @@ endpoint.setAttribute=Set [{0}] to [{1}]
endpoint.setAttributeError=Unable to set attribute [{0}] to [{1}]
endpoint.socketOptionsError=Error setting socket options
endpoint.timeout.err=Error processing socket timeout
+endpoint.tls.info=Connector [{0}], TLS virtual host [{1}], certificate type
[{2}] configured from [{3}] using alias [{4}] and with trust store [{5}]
endpoint.unknownSslHostName=The SSL host name [{0}] is not recognised for this
endpoint
endpoint.warn.executorShutdown=The executor associated with thread pool [{0}]
has not fully shutdown. Some application threads may still be running.
endpoint.warn.incorrectConnectionCount=Incorrect connection count, multiple
calls to socket.close for the same socket.
diff --git a/java/org/apache/tomcat/util/net/SSLUtilBase.java
b/java/org/apache/tomcat/util/net/SSLUtilBase.java
index 71e7e020d9..2b8cdd6618 100644
--- a/java/org/apache/tomcat/util/net/SSLUtilBase.java
+++
[tomcat] branch 9.0.x updated: Log basic information for each configured TLS cert when Tomcat starts
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 7a3a1f57f8 Log basic information for each configured TLS cert when
Tomcat starts
7a3a1f57f8 is described below
commit 7a3a1f57f8ae03dfe2a3321e4405d40a9c662a2b
Author: Mark Thomas
AuthorDate: Thu Jan 19 18:08:10 2023 +
Log basic information for each configured TLS cert when Tomcat starts
---
.../apache/tomcat/util/net/AbstractEndpoint.java | 26 ++
.../tomcat/util/net/AbstractJsseEndpoint.java | 1 +
java/org/apache/tomcat/util/net/AprEndpoint.java | 1 +
.../apache/tomcat/util/net/LocalStrings.properties | 1 +
java/org/apache/tomcat/util/net/SSLUtilBase.java | 4 +++-
webapps/docs/changelog.xml | 8 +++
6 files changed, 40 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
index 9a5eda429e..96c632571b 100644
--- a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
@@ -368,6 +368,32 @@ public abstract class AbstractEndpoint {
protected abstract void createSSLContext(SSLHostConfig sslHostConfig)
throws Exception;
+protected void logCertificate(SSLHostConfigCertificate certificate) {
+SSLHostConfig sslHostConfig = certificate.getSSLHostConfig();
+
+String certificateSource = certificate.getCertificateKeystoreFile();
+if (certificateSource == null) {
+certificateSource = certificate.getCertificateKeyFile();
+}
+
+String keyAlias = certificate.getCertificateKeyAlias();
+if (keyAlias == null) {
+keyAlias = SSLUtilBase.DEFAULT_KEY_ALIAS;
+}
+
+String trustStoreSource = sslHostConfig.getTruststoreFile();
+if (trustStoreSource == null) {
+trustStoreSource = sslHostConfig.getCaCertificateFile();
+}
+if (trustStoreSource == null) {
+trustStoreSource = sslHostConfig.getCaCertificatePath();
+}
+
+getLog().info(sm.getString("endpoint.tls.info", getName(),
sslHostConfig.getHostName(), certificate.getType(),
+certificateSource, keyAlias, trustStoreSource));
+}
+
+
protected void destroySsl() throws Exception {
if (isSSLEnabled()) {
for (SSLHostConfig sslHostConfig : sslHostConfigs.values()) {
diff --git a/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
b/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
index 08518f87ac..a363bef182 100644
--- a/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
@@ -107,6 +107,7 @@ public abstract class AbstractJsseEndpoint extends
AbstractEndpoint {
throw new IllegalArgumentException(e.getMessage(), e);
}
+logCertificate(certificate);
certificate.setSslContext(sslContext);
}
}
diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java
b/java/org/apache/tomcat/util/net/AprEndpoint.java
index fa765f1ad3..150e7b3915 100644
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -474,6 +474,7 @@ public class AprEndpoint extends
AbstractEndpoint implements SNICallB
sslContext.addCertificate(certificate);
}
+logCertificate(certificate);
certificate.setSslContext(sslContext);
}
diff --git a/java/org/apache/tomcat/util/net/LocalStrings.properties
b/java/org/apache/tomcat/util/net/LocalStrings.properties
index b184b922fa..fc7150cd74 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings.properties
@@ -131,6 +131,7 @@ endpoint.setAttribute=Set [{0}] to [{1}]
endpoint.setAttributeError=Unable to set attribute [{0}] to [{1}]
endpoint.socketOptionsError=Error setting socket options
endpoint.timeout.err=Error processing socket timeout
+endpoint.tls.info=Connector [{0}], TLS virtual host [{1}], certificate type
[{2}] configured from [{3}] using alias [{4}] and with trust store [{5}]
endpoint.unknownSslHostName=The SSL host name [{0}] is not recognised for this
endpoint
endpoint.warn.executorShutdown=The executor associated with thread pool [{0}]
has not fully shutdown. Some application threads may still be running.
endpoint.warn.incorrectConnectionCount=Incorrect connection count, multiple
calls to socket.close for the same socket.
diff --git a/java/org/apache/tomcat/util/net/SSLUtilBase.java
b/java/org/apache/tomcat/util/net/SSLUtilBase.java
index 76b485654f..d6dc329278 100644
--- a/java/org/apache/tomcat/util/net/SSLUtilBase.java
+++
[tomcat] branch 10.1.x updated: Log basic information for each configured TLS cert when Tomcat starts
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new dfb802cd31 Log basic information for each configured TLS cert when
Tomcat starts
dfb802cd31 is described below
commit dfb802cd317445868b9d50237cf73becb5828fc8
Author: Mark Thomas
AuthorDate: Thu Jan 19 18:08:10 2023 +
Log basic information for each configured TLS cert when Tomcat starts
---
.../apache/tomcat/util/net/AbstractEndpoint.java | 26 ++
.../tomcat/util/net/AbstractJsseEndpoint.java | 1 +
.../apache/tomcat/util/net/LocalStrings.properties | 1 +
java/org/apache/tomcat/util/net/SSLUtilBase.java | 4 +++-
webapps/docs/changelog.xml | 8 +++
5 files changed, 39 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
index 2ce72e8acb..bdf94f28ac 100644
--- a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
@@ -357,6 +357,32 @@ public abstract class AbstractEndpoint {
protected abstract void createSSLContext(SSLHostConfig sslHostConfig)
throws Exception;
+protected void logCertificate(SSLHostConfigCertificate certificate) {
+SSLHostConfig sslHostConfig = certificate.getSSLHostConfig();
+
+String certificateSource = certificate.getCertificateKeystoreFile();
+if (certificateSource == null) {
+certificateSource = certificate.getCertificateKeyFile();
+}
+
+String keyAlias = certificate.getCertificateKeyAlias();
+if (keyAlias == null) {
+keyAlias = SSLUtilBase.DEFAULT_KEY_ALIAS;
+}
+
+String trustStoreSource = sslHostConfig.getTruststoreFile();
+if (trustStoreSource == null) {
+trustStoreSource = sslHostConfig.getCaCertificateFile();
+}
+if (trustStoreSource == null) {
+trustStoreSource = sslHostConfig.getCaCertificatePath();
+}
+
+getLog().info(sm.getString("endpoint.tls.info", getName(),
sslHostConfig.getHostName(), certificate.getType(),
+certificateSource, keyAlias, trustStoreSource));
+}
+
+
protected void destroySsl() throws Exception {
if (isSSLEnabled()) {
for (SSLHostConfig sslHostConfig : sslHostConfigs.values()) {
diff --git a/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
b/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
index 43fc71db7a..261ed118c2 100644
--- a/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
@@ -106,6 +106,7 @@ public abstract class AbstractJsseEndpoint extends
AbstractEndpoint {
throw new IllegalArgumentException(e.getMessage(), e);
}
+logCertificate(certificate);
certificate.setSslContext(sslContext);
}
}
diff --git a/java/org/apache/tomcat/util/net/LocalStrings.properties
b/java/org/apache/tomcat/util/net/LocalStrings.properties
index 847d01144a..dc7b9b9361 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings.properties
@@ -114,6 +114,7 @@ endpoint.setAttribute=Set [{0}] to [{1}]
endpoint.setAttributeError=Unable to set attribute [{0}] to [{1}]
endpoint.socketOptionsError=Error setting socket options
endpoint.timeout.err=Error processing socket timeout
+endpoint.tls.info=Connector [{0}], TLS virtual host [{1}], certificate type
[{2}] configured from [{3}] using alias [{4}] and with trust store [{5}]
endpoint.unknownSslHostName=The SSL host name [{0}] is not recognised for this
endpoint
endpoint.warn.executorShutdown=The executor associated with thread pool [{0}]
has not fully shutdown. Some application threads may still be running.
endpoint.warn.incorrectConnectionCount=Incorrect connection count, multiple
calls to socket.close for the same socket.
diff --git a/java/org/apache/tomcat/util/net/SSLUtilBase.java
b/java/org/apache/tomcat/util/net/SSLUtilBase.java
index 76b485654f..d6dc329278 100644
--- a/java/org/apache/tomcat/util/net/SSLUtilBase.java
+++ b/java/org/apache/tomcat/util/net/SSLUtilBase.java
@@ -71,6 +71,8 @@ public abstract class SSLUtilBase implements SSLUtil {
private static final Log log = LogFactory.getLog(SSLUtilBase.class);
private static final StringManager sm =
StringManager.getManager(SSLUtilBase.class);
+protected static final String DEFAULT_KEY_ALIAS = "tomcat";
+
protected final SSLHostConfig sslHostConfig;
protected final SSLHostConfigCertificate certificate;
@@ -324,7 +326,7 @@ public abstract class SSLUtilBase implements SSLUtil {
}
if (keyAlias == null) {
-
[tomcat] branch main updated: Log basic information for each configured TLS cert when Tomcat starts
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 407869c47e Log basic information for each configured TLS cert when
Tomcat starts
407869c47e is described below
commit 407869c47ea2fd4a0ceba08d5ea4233ec9c43201
Author: Mark Thomas
AuthorDate: Thu Jan 19 18:08:10 2023 +
Log basic information for each configured TLS cert when Tomcat starts
---
.../apache/tomcat/util/net/AbstractEndpoint.java | 26 ++
.../apache/tomcat/util/net/LocalStrings.properties | 1 +
java/org/apache/tomcat/util/net/SSLUtilBase.java | 4 +++-
webapps/docs/changelog.xml | 8 +++
4 files changed, 38 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
index 4e3b692ad1..86dbf9a98c 100644
--- a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
@@ -407,11 +407,37 @@ public abstract class AbstractEndpoint {
throw new IllegalArgumentException(e.getMessage(), e);
}
+logCertificate(certificate);
certificate.setSslContext(sslContext);
}
}
+protected void logCertificate(SSLHostConfigCertificate certificate) {
+SSLHostConfig sslHostConfig = certificate.getSSLHostConfig();
+
+String certificateSource = certificate.getCertificateKeystoreFile();
+if (certificateSource == null) {
+certificateSource = certificate.getCertificateKeyFile();
+}
+
+String keyAlias = certificate.getCertificateKeyAlias();
+if (keyAlias == null) {
+keyAlias = SSLUtilBase.DEFAULT_KEY_ALIAS;
+}
+
+String trustStoreSource = sslHostConfig.getTruststoreFile();
+if (trustStoreSource == null) {
+trustStoreSource = sslHostConfig.getCaCertificateFile();
+}
+if (trustStoreSource == null) {
+trustStoreSource = sslHostConfig.getCaCertificatePath();
+}
+
+getLog().info(sm.getString("endpoint.tls.info", getName(),
sslHostConfig.getHostName(), certificate.getType(),
+certificateSource, keyAlias, trustStoreSource));
+}
+
protected SSLEngine createSSLEngine(String sniHostName, List
clientRequestedCiphers,
List clientRequestedApplicationProtocols) {
SSLHostConfig sslHostConfig = getSSLHostConfig(sniHostName);
diff --git a/java/org/apache/tomcat/util/net/LocalStrings.properties
b/java/org/apache/tomcat/util/net/LocalStrings.properties
index 847d01144a..dc7b9b9361 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings.properties
@@ -114,6 +114,7 @@ endpoint.setAttribute=Set [{0}] to [{1}]
endpoint.setAttributeError=Unable to set attribute [{0}] to [{1}]
endpoint.socketOptionsError=Error setting socket options
endpoint.timeout.err=Error processing socket timeout
+endpoint.tls.info=Connector [{0}], TLS virtual host [{1}], certificate type
[{2}] configured from [{3}] using alias [{4}] and with trust store [{5}]
endpoint.unknownSslHostName=The SSL host name [{0}] is not recognised for this
endpoint
endpoint.warn.executorShutdown=The executor associated with thread pool [{0}]
has not fully shutdown. Some application threads may still be running.
endpoint.warn.incorrectConnectionCount=Incorrect connection count, multiple
calls to socket.close for the same socket.
diff --git a/java/org/apache/tomcat/util/net/SSLUtilBase.java
b/java/org/apache/tomcat/util/net/SSLUtilBase.java
index 76b485654f..d6dc329278 100644
--- a/java/org/apache/tomcat/util/net/SSLUtilBase.java
+++ b/java/org/apache/tomcat/util/net/SSLUtilBase.java
@@ -71,6 +71,8 @@ public abstract class SSLUtilBase implements SSLUtil {
private static final Log log = LogFactory.getLog(SSLUtilBase.class);
private static final StringManager sm =
StringManager.getManager(SSLUtilBase.class);
+protected static final String DEFAULT_KEY_ALIAS = "tomcat";
+
protected final SSLHostConfig sslHostConfig;
protected final SSLHostConfigCertificate certificate;
@@ -324,7 +326,7 @@ public abstract class SSLUtilBase implements SSLUtil {
}
if (keyAlias == null) {
-keyAlias = "tomcat";
+keyAlias = DEFAULT_KEY_ALIAS;
}
// Switch to in-memory key store
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index b89a5756ed..7570715faa 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -127,6 +127,14 @@
+
+
+
+Log basic information for each configured TLS certificate when Tomcat
+starts. (markt)
+
[tomcat] branch main updated: Complete (hopefully) the security manager clean-up
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 223e62b613 Complete (hopefully) the security manager clean-up
223e62b613 is described below
commit 223e62b61389020b82c7132658996e07edec791f
Author: Mark Thomas
AuthorDate: Thu Jan 19 17:51:38 2023 +
Complete (hopefully) the security manager clean-up
---
RELEASE-NOTES | 11 --
java/jakarta/el/BeanELResolver.java| 5 +--
java/org/apache/catalina/WebResource.java | 7 +++-
.../catalina/core/ApplicationFilterConfig.java | 2 --
.../apache/catalina/loader/JdbcLeakPrevention.java | 4 ---
.../catalina/loader/WebappClassLoaderBase.java | 8 ++---
.../webresources/AbstractArchiveResource.java | 25 +
.../AbstractSingleArchiveResource.java | 11 --
.../catalina/webresources/CachedResource.java | 5 ---
.../catalina/webresources/EmptyResource.java | 5 ---
.../apache/catalina/webresources/FileResource.java | 9 -
.../apache/catalina/webresources/JarResource.java | 2 +-
.../catalina/webresources/JarResourceRoot.java | 11 --
.../catalina/webresources/JarWarResource.java | 2 +-
.../apache/catalina/webresources/WarResource.java | 2 +-
webapps/docs/config/ajp.xml| 3 +-
webapps/docs/config/host.xml | 9 +
webapps/docs/config/http.xml | 3 +-
webapps/docs/security-howto.xml| 41 +++---
19 files changed, 37 insertions(+), 128 deletions(-)
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 74ce5f0742..28680c7743 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -28,7 +28,6 @@ CONTENTS:
* API Stability
* Bundled APIs
* Web application reloading and static fields in shared libraries
-* Security manager URLs
* Symlinking static resources
* Viewing the Tomcat Change Log
* Cryptographic software notice
@@ -111,16 +110,6 @@ and putting them in the shared classloader instead (JARs
should be put in the
"lib" folder, and classes should be put in the "classes" folder).
-==
-Security manager URLs:
-==
-In order to grant security permissions to JARs located inside the
-web application repository, use URLs of the following format
-in your policy file:
-
-file:${catalina.base}/webapps/examples/WEB-INF/lib/driver.jar
-
-
Symlinking static resources:
diff --git a/java/jakarta/el/BeanELResolver.java
b/java/jakarta/el/BeanELResolver.java
index 9b99ef50db..37f37d2769 100644
--- a/java/jakarta/el/BeanELResolver.java
+++ b/java/jakarta/el/BeanELResolver.java
@@ -198,10 +198,7 @@ public class BeanELResolver extends ELResolver {
this.properties.put(pd.getName(), new BeanProperty(type,
pd));
}
/*
- * Populating from any interfaces solves two distinct problems:
- * 1. When running under a security manager, classes may be
- *unaccessible but have accessible interfaces.
- * 2. It causes default methods to be included.
+ * Populating from any interfaces causes default methods to be
included.
*/
populateFromInterfaces(type);
} catch (IntrospectionException ie) {
diff --git a/java/org/apache/catalina/WebResource.java
b/java/org/apache/catalina/WebResource.java
index 2c8b05da51..f8b85a2fc4 100644
--- a/java/org/apache/catalina/WebResource.java
+++ b/java/org/apache/catalina/WebResource.java
@@ -145,8 +145,13 @@ public interface WebResource {
* @return the code base for this resource that will be used when looking
up the
* assigned permissions for the code base in the security policy file when
* running under a security manager.
+ *
+ * @deprecated Unused. Will be removed in Tomcat 12 onwards.
*/
-URL getCodeBase();
+@Deprecated
+default URL getCodeBase() {
+return null;
+}
/**
* @return a reference to the WebResourceRoot of which this WebResource is
a
diff --git a/java/org/apache/catalina/core/ApplicationFilterConfig.java
b/java/org/apache/catalina/core/ApplicationFilterConfig.java
index ac8626bb34..0fcac1fd9e 100644
--- a/java/org/apache/catalina/core/ApplicationFilterConfig.java
+++ b/java/org/apache/catalina/core/ApplicationFilterConfig.java
@@ -84,7 +84,6 @@ public final class ApplicationFilterConfig implements
FilterConfig, Serializable
* instantiating the filter object
* @exception ServletException if thrown by the filter's init() method
* @throws NamingException If a JNDI lookup fails
- * @throws SecurityException If a security manager prevents
[tomcat] branch main updated: More SecurityManager clean-up
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 ea94837028 More SecurityManager clean-up ea94837028 is described below commit ea94837028bba83137160b90f255be4aa29f7c70 Author: Mark Thomas AuthorDate: Thu Jan 19 17:27:37 2023 + More SecurityManager clean-up --- webapps/docs/config/cluster-manager.xml | 14 -- webapps/docs/config/manager.xml | 26 ++ webapps/docs/security-howto.xml | 13 + 3 files changed, 27 insertions(+), 26 deletions(-) diff --git a/webapps/docs/config/cluster-manager.xml b/webapps/docs/config/cluster-manager.xml index 7d742cbe5f..99bc181985 100644 --- a/webapps/docs/config/cluster-manager.xml +++ b/webapps/docs/config/cluster-manager.xml @@ -180,9 +180,7 @@ length or null, all attributes are eligible for replication. The pattern is anchored so the fully qualified class name must fully match the pattern. If not specified, the default value of -null will be used unless a SecurityManager is -enabled in which case the default will be -java\\.lang\\.(?:Boolean|Integer|Long|Number|String). +null will be used. When this node sends a GET_ALL_SESSIONS message to other @@ -201,8 +199,7 @@ attribute, should this be logged at WARN level? If WARN level logging is disabled then it will be logged at DEBUG. The default value of this attribute is -false unless a SecurityManager is enabled in -which case the default will be true. +false. @@ -245,9 +242,7 @@ length or null, all attributes are eligible for replication. The pattern is anchored so the fully qualified class name must fully match the pattern. If not specified, the default value of -null will be used unless a SecurityManager is -enabled in which case the default will be -java\\.lang\\.(?:Boolean|Integer|Long|Number|String). +null will be used. Set to true if you wish to terminate replication map when replication @@ -262,8 +257,7 @@ attribute, should this be logged at WARN level? If WARN level logging is disabled then it will be logged at DEBUG. The default value of this attribute is -false unless a SecurityManager is enabled in -which case the default will be true. +false. The timeout for a ping message. If a remote map does not respond within diff --git a/webapps/docs/config/manager.xml b/webapps/docs/config/manager.xml index 93489f8f9c..1b7e0b9169 100644 --- a/webapps/docs/config/manager.xml +++ b/webapps/docs/config/manager.xml @@ -154,9 +154,9 @@ Please note that the session's Principal class as well as its descendant classes are all subject to the sessionAttributeValueClassNameFilter. If such a filter -is specified or a SecurityManager is enabled, the names of -the Principal class and descendant classes must match that -filter pattern in order to be restored. +is specified the names of the Principal class and +descendant classes must match that filter pattern in order to be +restored. @@ -213,9 +213,7 @@ length or null, all attributes are eligible for distribution. The pattern is anchored so the fully qualified class name must fully match the pattern. If not specified, the default value of -null will be used unless a SecurityManager is -enabled in which case the default will be - java\\.lang\\.(?:Boolean|Integer|Long|Number|String)|org\\.apache\\.catalina\\.realm\\.GenericPrincipal\\$SerializablePrincipal|\\[Ljava.lang.String;. +null will be used. @@ -224,8 +222,7 @@ attribute, should this be logged at WARN level? If WARN level logging is disabled then it will be logged at DEBUG. The default value of this attribute is -false unless a SecurityManager is enabled in -which case the default will be true. +false. @@ -296,9 +293,9 @@ Please note that the session's Principal class as well as its descendant classes are all subject to the sessionAttributeValueClassNameFilter. If such a filter -is specified or a SecurityManager is enabled, the names of -the Principal class and descendant classes must match that -filter pattern in order to be restored. +is specified the names of the Principal class and +descendant classes must match that filter pattern in order to be +restored. @@ -351,9 +348,7 @@ length or null, all attributes are eligible
[tomcat] branch main updated: Remove/deprecate some more SecurityManager related plumbing
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 9c54ecadd6 Remove/deprecate some more SecurityManager related plumbing
9c54ecadd6 is described below
commit 9c54ecadd6f8b0fb1e1f29661f03681b65239c16
Author: Mark Thomas
AuthorDate: Thu Jan 19 17:08:22 2023 +
Remove/deprecate some more SecurityManager related plumbing
---
java/org/apache/juli/ClassLoaderLogManager.java | 6 +-
java/org/apache/juli/WebappProperties.java | 3 +++
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/java/org/apache/juli/ClassLoaderLogManager.java
b/java/org/apache/juli/ClassLoaderLogManager.java
index 5fc80f62d1..77e7a81720 100644
--- a/java/org/apache/juli/ClassLoaderLogManager.java
+++ b/java/org/apache/juli/ClassLoaderLogManager.java
@@ -401,11 +401,7 @@ public class ClassLoaderLogManager extends LogManager {
InputStream is = null;
// Special case for URL classloaders which are used in containers:
// only look in the local repositories to avoid redefining loggers 20
times
-if (classLoader instanceof WebappProperties) {
-if (((WebappProperties) classLoader).hasLoggingConfig()) {
-is = classLoader.getResourceAsStream("logging.properties");
-}
-} else if (classLoader instanceof URLClassLoader) {
+if (classLoader instanceof URLClassLoader) {
URL logConfig =
((URLClassLoader)classLoader).findResource("logging.properties");
if(null != logConfig) {
diff --git a/java/org/apache/juli/WebappProperties.java
b/java/org/apache/juli/WebappProperties.java
index b524c5a5c4..7c94b1c49d 100644
--- a/java/org/apache/juli/WebappProperties.java
+++ b/java/org/apache/juli/WebappProperties.java
@@ -60,6 +60,9 @@ public interface WebappProperties {
* @return {@code true} if the web application includes a logging
* configuration at the standard location of
* /WEB-INF/classes/logging.properties.
+ *
+ * @deprecated Unused. Will be removed in Tomcat 12 onwards.
*/
+@Deprecated
boolean hasLoggingConfig();
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Use a switch now SecurityManager constraint is not a concern
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 19bd0ef48e Use a switch now SecurityManager constraint is not a concern
19bd0ef48e is described below
commit 19bd0ef48eae6a417adc9f972f42d569851a2c08
Author: Mark Thomas
AuthorDate: Thu Jan 19 17:00:44 2023 +
Use a switch now SecurityManager constraint is not a concern
---
.../catalina/valves/AbstractAccessLogValve.java| 77 ++
1 file changed, 36 insertions(+), 41 deletions(-)
diff --git a/java/org/apache/catalina/valves/AbstractAccessLogValve.java
b/java/org/apache/catalina/valves/AbstractAccessLogValve.java
index 879da82d5d..73852569fa 100644
--- a/java/org/apache/catalina/valves/AbstractAccessLogValve.java
+++ b/java/org/apache/catalina/valves/AbstractAccessLogValve.java
@@ -1140,58 +1140,53 @@ public abstract class AbstractAccessLogValve extends
ValveBase implements Access
}
@Override
-public void addElement(CharArrayWriter buf, Date date, Request request,
-Response response, long time) {
+public void addElement(CharArrayWriter buf, Date date, Request
request, Response response, long time) {
long timestamp = date.getTime();
long frac;
if (!usesBegin) {
timestamp += TimeUnit.NANOSECONDS.toMillis(time);
}
-/* Implementation note: This is deliberately not implemented using
- * switch. If a switch is used the compiler (at least the Oracle
- * one) will use a synthetic class to implement the switch. The
- * problem is that this class needs to be pre-loaded when using a
- * SecurityManager and the name of that class will depend on any
- * anonymous inner classes and any other synthetic classes. As
such
- * the name is not constant and keeping the pre-loading up to date
- * as the name changes is error prone.
- */
-if (type == FormatType.CLF) {
-buf.append(localDateCache.get().getFormat(timestamp));
-} else if (type == FormatType.SEC) {
-buf.append(Long.toString(timestamp / 1000));
-} else if (type == FormatType.MSEC) {
-buf.append(Long.toString(timestamp));
-} else if (type == FormatType.MSEC_FRAC) {
-frac = timestamp % 1000;
-if (frac < 100) {
-if (frac < 10) {
-buf.append('0');
-buf.append('0');
-} else {
-buf.append('0');
-}
-}
-buf.append(Long.toString(frac));
-} else {
-// FormatType.SDF
-String temp = localDateCache.get().getFormat(format, locale,
timestamp);
-if (usesMsecs) {
+switch (type) {
+case CLF:
+buf.append(localDateCache.get().getFormat(timestamp));
+break;
+case SEC:
+buf.append(Long.toString(timestamp / 1000));
+break;
+case MSEC:
+buf.append(Long.toString(timestamp));
+break;
+case MSEC_FRAC:
frac = timestamp % 1000;
-StringBuilder tripleMsec = new StringBuilder(4);
if (frac < 100) {
if (frac < 10) {
-tripleMsec.append('0');
-tripleMsec.append('0');
+buf.append('0');
+buf.append('0');
} else {
-tripleMsec.append('0');
+buf.append('0');
}
}
-tripleMsec.append(frac);
-temp = temp.replace(tripleMsecPattern, tripleMsec);
-temp = temp.replace(msecPattern, Long.toString(frac));
-}
-buf.append(temp);
+buf.append(Long.toString(frac));
+break;
+case SDF:
+String temp = localDateCache.get().getFormat(format,
locale, timestamp);
+if (usesMsecs) {
+frac = timestamp % 1000;
+StringBuilder tripleMsec = new StringBuilder(4);
+if (frac < 100) {
+if (frac < 10) {
+tripleMsec.append('0');
+tripleMsec.append('0');
+} else {
+
Checkstyle, Javadoc and automatic formatting
Hi all, Ever since the first CheckStyle rules were added, I have been looking at the options for using my IDE (Eclipse) to fix the code so it meets the rules. The results until today have been mixed. Some stuff gets fixed but other stuff gets broken. Today, however, I made progress. I think I have a Eclipse Formatter configuration that would enable us to turn on a number of the rules that are currently commented out (indentation, operator at end of line, etc) and auto format the code to fix any issues without messing up too much other stuff. I'd like to start testing out the formatter by reformatting files before I work on them. However, before I do that I was wondering whether we wanted to format the Javadoc as well - especially given the recent Javadoc rules added to CheckStyle. With that in mind, what do folks think about increasing the comment width from 80 to 120 to match the code? After that, my thinking is: - blank line between description and tags (param, return, throws etc) - blank line between different tag types (separate param, return etc) Those are the easy ones. There are lots of options for aligning tags. Personally, I am looking for clarity while still using space efficiently so I prefer that parameter and throws descriptions don't start on a new line after a tag. With a longer permitted line for Javadoc I think we can: - align descriptions grouped by type - indent tag descriptions That would give Javadoc that looks a bit like this but not as condensed as I have used a much shorter max line length: /** * Method description. May be short or long. * * @param first The first parameter. For an optimum result, this * should be an odd number between 0 and 100. * @param second The second parameter. * * @return The result of the foo operation, usually an even number * within 0 and 1000. * * @throws Exception when the foo operation cannot be performed * for one reason or another. */ With the longer line length, I suspect most tag descriptions won't need to wrap. However, if we are worried about long exception names or parameter names causing problems we could use: /** * Method description. May be short or long. * * @param first The first parameter. For an optimum result, this * should be an odd number between 0 and 100. * @param second The second parameter. * * @return The result of the foo operation, usually an even number * within 0 and 1000. * * @throws Exception when the foo operation cannot be performed * for one reason or another. */ I think I prefer the first but could live with either. Thoughts? Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.1.x updated: Remove modules from trunk
This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/10.1.x by this push: new c8f121c7b5 Remove modules from trunk c8f121c7b5 is described below commit c8f121c7b59dd8b6c26ff92b739104ff4f31e3d4 Author: remm AuthorDate: Thu Jan 19 16:06:49 2023 +0100 Remove modules from trunk --- .gitignore | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitignore b/.gitignore index 58a961502f..8901fb22a2 100644 --- a/.gitignore +++ b/.gitignore @@ -45,6 +45,4 @@ bin/setenv.* java/org/apache/catalina/startup/catalina.properties modules/jdbc-pool/bin modules/jdbc-pool/includes -modules/openssl-java17/target -modules/openssl-panama-foreign/target webapps/docs/jdbc-pool.xml - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Fix wrong path
This is an automated email from the ASF dual-hosted git repository. remm 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 6e78f563af Fix wrong path 6e78f563af is described below commit 6e78f563af16534c52b5c78eed53c395147d5dfc Author: remm AuthorDate: Thu Jan 19 16:05:15 2023 +0100 Fix wrong path --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 58a961502f..e7d051c6fb 100644 --- a/.gitignore +++ b/.gitignore @@ -46,5 +46,5 @@ java/org/apache/catalina/startup/catalina.properties modules/jdbc-pool/bin modules/jdbc-pool/includes modules/openssl-java17/target -modules/openssl-panama-foreign/target +modules/openssl-foreign/target webapps/docs/jdbc-pool.xml - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Buildbot success in on tomcat-11.0.x
Build status: Build succeeded! Worker used: bb2_worker2_ubuntu URL: https://ci2.apache.org/#builders/112/builds/136 Blamelist: Mark Thomas Build Text: build successful Status Detected: restored build Build Source Stamp: [branch main] 4ce8c0a059807dc7b282ac02422894a78618e9e4 Steps: worker_preparation: 0 git: 0 shell: 0 shell_1: 0 shell_2: 0 shell_3: 0 shell_4: 0 shell_5: 0 compile: 1 shell_6: 0 shell_7: 0 shell_8: 0 shell_9: 0 Rsync docs to nightlies.apache.org: 0 shell_10: 0 Rsync RAT to nightlies.apache.org: 0 compile_1: 1 shell_11: 0 Rsync Logs to nightlies.apache.org: 0 -- ASF Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Info strings should have all been removed ages ago
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 555e77be3b Info strings should have all been removed ages ago
555e77be3b is described below
commit 555e77be3b65768a45169cd2146e0b3e87ebb786
Author: Mark Thomas
AuthorDate: Thu Jan 19 14:09:21 2023 +
Info strings should have all been removed ages ago
---
java/org/apache/catalina/valves/ExtendedAccessLogValve.java | 10 --
1 file changed, 10 deletions(-)
diff --git a/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
b/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
index a5a79482e4..26d5eee01c 100644
--- a/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
+++ b/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
@@ -128,16 +128,6 @@ public class ExtendedAccessLogValve extends AccessLogValve
{
private static final Log log =
LogFactory.getLog(ExtendedAccessLogValve.class);
-// - Instance Variables
-
-
-/**
- * The descriptive information about this implementation.
- */
-protected static final String extendedAccessLogInfo =
-"org.apache.catalina.valves.ExtendedAccessLogValve/2.1";
-
-
// Private Methods
/**
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Info strings should have all been removed ages ago
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 948783e5c1 Info strings should have all been removed ages ago
948783e5c1 is described below
commit 948783e5c110a175ed8c7a7a6dd67127ebde34d2
Author: Mark Thomas
AuthorDate: Thu Jan 19 14:09:21 2023 +
Info strings should have all been removed ages ago
---
java/org/apache/catalina/valves/ExtendedAccessLogValve.java | 10 --
1 file changed, 10 deletions(-)
diff --git a/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
b/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
index 37b3e865b9..e2eb61aa61 100644
--- a/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
+++ b/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
@@ -128,16 +128,6 @@ public class ExtendedAccessLogValve extends AccessLogValve
{
private static final Log log =
LogFactory.getLog(ExtendedAccessLogValve.class);
-// - Instance Variables
-
-
-/**
- * The descriptive information about this implementation.
- */
-protected static final String extendedAccessLogInfo =
-"org.apache.catalina.valves.ExtendedAccessLogValve/2.1";
-
-
// Private Methods
/**
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.1.x updated: Info strings should have all been removed ages ago
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new e26c519492 Info strings should have all been removed ages ago
e26c519492 is described below
commit e26c5194923eb474930b837bf09ae245866b28ad
Author: Mark Thomas
AuthorDate: Thu Jan 19 14:09:21 2023 +
Info strings should have all been removed ages ago
---
java/org/apache/catalina/valves/ExtendedAccessLogValve.java | 10 --
1 file changed, 10 deletions(-)
diff --git a/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
b/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
index f9e97dda18..74dc8b871a 100644
--- a/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
+++ b/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
@@ -128,16 +128,6 @@ public class ExtendedAccessLogValve extends AccessLogValve
{
private static final Log log =
LogFactory.getLog(ExtendedAccessLogValve.class);
-// - Instance Variables
-
-
-/**
- * The descriptive information about this implementation.
- */
-protected static final String extendedAccessLogInfo =
-"org.apache.catalina.valves.ExtendedAccessLogValve/2.1";
-
-
// Private Methods
/**
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Info strings should have all been removed ages ago
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 3b7fc2d8b4 Info strings should have all been removed ages ago
3b7fc2d8b4 is described below
commit 3b7fc2d8b4605749646f63d7b985b18e58e01847
Author: Mark Thomas
AuthorDate: Thu Jan 19 14:09:21 2023 +
Info strings should have all been removed ages ago
---
java/org/apache/catalina/valves/ExtendedAccessLogValve.java | 10 --
1 file changed, 10 deletions(-)
diff --git a/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
b/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
index f9e97dda18..74dc8b871a 100644
--- a/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
+++ b/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
@@ -128,16 +128,6 @@ public class ExtendedAccessLogValve extends AccessLogValve
{
private static final Log log =
LogFactory.getLog(ExtendedAccessLogValve.class);
-// - Instance Variables
-
-
-/**
- * The descriptive information about this implementation.
- */
-protected static final String extendedAccessLogInfo =
-"org.apache.catalina.valves.ExtendedAccessLogValve/2.1";
-
-
// Private Methods
/**
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Code clean-up. Fix indenting. No functional change.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new d30236d799 Code clean-up. Fix indenting. No functional change.
d30236d799 is described below
commit d30236d799a1199e6562a82509ecc8954c993ae0
Author: Mark Thomas
AuthorDate: Thu Jan 19 13:59:00 2023 +
Code clean-up. Fix indenting. No functional change.
---
java/javax/servlet/HttpConstraintElement.java | 3 +--
java/javax/servlet/HttpMethodConstraintElement.java | 3 +--
java/javax/servlet/ServletRequestWrapper.java | 3 +--
java/javax/servlet/ServletResponseWrapper.java | 3 +--
java/javax/servlet/ServletSecurityElement.java | 3 +--
java/javax/servlet/jsp/PageContext.java | 12
java/javax/servlet/jsp/el/ImplicitObjectELResolver.java | 4 +---
java/javax/servlet/jsp/tagext/DynamicAttributes.java| 5 +
java/javax/servlet/jsp/tagext/SimpleTagSupport.java | 4 +---
java/javax/servlet/jsp/tagext/TagLibraryValidator.java | 3 +--
java/javax/servlet/jsp/tagext/TagSupport.java | 6 ++
java/org/apache/catalina/ant/ValidatorTask.java | 3 +--
12 files changed, 16 insertions(+), 36 deletions(-)
diff --git a/java/javax/servlet/HttpConstraintElement.java
b/java/javax/servlet/HttpConstraintElement.java
index 7e422bb0db..fd55c869be 100644
--- a/java/javax/servlet/HttpConstraintElement.java
+++ b/java/javax/servlet/HttpConstraintElement.java
@@ -30,8 +30,7 @@ import
javax.servlet.annotation.ServletSecurity.TransportGuarantee;
public class HttpConstraintElement {
private static final String LSTRING_FILE = "javax.servlet.LocalStrings";
-private static final ResourceBundle lStrings =
-ResourceBundle.getBundle(LSTRING_FILE);
+private static final ResourceBundle lStrings =
ResourceBundle.getBundle(LSTRING_FILE);
private final EmptyRoleSemantic emptyRoleSemantic;// =
EmptyRoleSemantic.PERMIT;
private final TransportGuarantee transportGuarantee;// =
TransportGuarantee.NONE;
diff --git a/java/javax/servlet/HttpMethodConstraintElement.java
b/java/javax/servlet/HttpMethodConstraintElement.java
index 97bd9fc487..7645856b2f 100644
--- a/java/javax/servlet/HttpMethodConstraintElement.java
+++ b/java/javax/servlet/HttpMethodConstraintElement.java
@@ -28,8 +28,7 @@ public class HttpMethodConstraintElement extends
HttpConstraintElement {
// Can't inherit from HttpConstraintElement as API does not allow it
private static final String LSTRING_FILE = "javax.servlet.LocalStrings";
-private static final ResourceBundle lStrings =
-ResourceBundle.getBundle(LSTRING_FILE);
+private static final ResourceBundle lStrings =
ResourceBundle.getBundle(LSTRING_FILE);
private final String methodName;
diff --git a/java/javax/servlet/ServletRequestWrapper.java
b/java/javax/servlet/ServletRequestWrapper.java
index cf3b2d26a0..71d4aa91b1 100644
--- a/java/javax/servlet/ServletRequestWrapper.java
+++ b/java/javax/servlet/ServletRequestWrapper.java
@@ -35,8 +35,7 @@ import java.util.ResourceBundle;
*/
public class ServletRequestWrapper implements ServletRequest {
private static final String LSTRING_FILE = "javax.servlet.LocalStrings";
-private static final ResourceBundle lStrings =
-ResourceBundle.getBundle(LSTRING_FILE);
+private static final ResourceBundle lStrings =
ResourceBundle.getBundle(LSTRING_FILE);
private ServletRequest request;
diff --git a/java/javax/servlet/ServletResponseWrapper.java
b/java/javax/servlet/ServletResponseWrapper.java
index 4c4829862d..da9264a26d 100644
--- a/java/javax/servlet/ServletResponseWrapper.java
+++ b/java/javax/servlet/ServletResponseWrapper.java
@@ -32,8 +32,7 @@ import java.util.ResourceBundle;
*/
public class ServletResponseWrapper implements ServletResponse {
private static final String LSTRING_FILE = "javax.servlet.LocalStrings";
-private static final ResourceBundle lStrings =
-ResourceBundle.getBundle(LSTRING_FILE);
+private static final ResourceBundle lStrings =
ResourceBundle.getBundle(LSTRING_FILE);
private ServletResponse response;
diff --git a/java/javax/servlet/ServletSecurityElement.java
b/java/javax/servlet/ServletSecurityElement.java
index d0bfa5ba03..9b4821f893 100644
--- a/java/javax/servlet/ServletSecurityElement.java
+++ b/java/javax/servlet/ServletSecurityElement.java
@@ -35,8 +35,7 @@ import javax.servlet.annotation.ServletSecurity;
*/
public class ServletSecurityElement extends HttpConstraintElement {
-private final Map methodConstraints =
-new HashMap<>();
+private final Map methodConstraints =
new HashMap<>();
/**
* Use default HttpConstraint.
diff --git a/java/javax/servlet/jsp/PageContext.java
b/java/javax/servlet/jsp/PageContext.java
index
[tomcat] branch 9.0.x updated: Code clean-up. Fix indenting. No functional change.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new ba2ebd9200 Code clean-up. Fix indenting. No functional change.
ba2ebd9200 is described below
commit ba2ebd9200d717c87408624146e3ef1d27592151
Author: Mark Thomas
AuthorDate: Thu Jan 19 13:59:00 2023 +
Code clean-up. Fix indenting. No functional change.
---
java/javax/servlet/HttpConstraintElement.java | 3 +--
java/javax/servlet/HttpMethodConstraintElement.java | 3 +--
java/javax/servlet/ServletRequestWrapper.java | 3 +--
java/javax/servlet/ServletResponseWrapper.java | 3 +--
java/javax/servlet/ServletSecurityElement.java | 3 +--
java/javax/servlet/jsp/PageContext.java | 12
java/javax/servlet/jsp/el/ImplicitObjectELResolver.java | 4 +---
java/javax/servlet/jsp/tagext/DynamicAttributes.java| 5 +
java/javax/servlet/jsp/tagext/SimpleTagSupport.java | 4 +---
java/javax/servlet/jsp/tagext/TagLibraryValidator.java | 3 +--
java/javax/servlet/jsp/tagext/TagSupport.java | 6 ++
java/org/apache/catalina/ant/ValidatorTask.java | 3 +--
12 files changed, 16 insertions(+), 36 deletions(-)
diff --git a/java/javax/servlet/HttpConstraintElement.java
b/java/javax/servlet/HttpConstraintElement.java
index 7e422bb0db..fd55c869be 100644
--- a/java/javax/servlet/HttpConstraintElement.java
+++ b/java/javax/servlet/HttpConstraintElement.java
@@ -30,8 +30,7 @@ import
javax.servlet.annotation.ServletSecurity.TransportGuarantee;
public class HttpConstraintElement {
private static final String LSTRING_FILE = "javax.servlet.LocalStrings";
-private static final ResourceBundle lStrings =
-ResourceBundle.getBundle(LSTRING_FILE);
+private static final ResourceBundle lStrings =
ResourceBundle.getBundle(LSTRING_FILE);
private final EmptyRoleSemantic emptyRoleSemantic;// =
EmptyRoleSemantic.PERMIT;
private final TransportGuarantee transportGuarantee;// =
TransportGuarantee.NONE;
diff --git a/java/javax/servlet/HttpMethodConstraintElement.java
b/java/javax/servlet/HttpMethodConstraintElement.java
index 97bd9fc487..7645856b2f 100644
--- a/java/javax/servlet/HttpMethodConstraintElement.java
+++ b/java/javax/servlet/HttpMethodConstraintElement.java
@@ -28,8 +28,7 @@ public class HttpMethodConstraintElement extends
HttpConstraintElement {
// Can't inherit from HttpConstraintElement as API does not allow it
private static final String LSTRING_FILE = "javax.servlet.LocalStrings";
-private static final ResourceBundle lStrings =
-ResourceBundle.getBundle(LSTRING_FILE);
+private static final ResourceBundle lStrings =
ResourceBundle.getBundle(LSTRING_FILE);
private final String methodName;
diff --git a/java/javax/servlet/ServletRequestWrapper.java
b/java/javax/servlet/ServletRequestWrapper.java
index c30a5511d6..c0a0351646 100644
--- a/java/javax/servlet/ServletRequestWrapper.java
+++ b/java/javax/servlet/ServletRequestWrapper.java
@@ -35,8 +35,7 @@ import java.util.ResourceBundle;
*/
public class ServletRequestWrapper implements ServletRequest {
private static final String LSTRING_FILE = "javax.servlet.LocalStrings";
-private static final ResourceBundle lStrings =
-ResourceBundle.getBundle(LSTRING_FILE);
+private static final ResourceBundle lStrings =
ResourceBundle.getBundle(LSTRING_FILE);
private ServletRequest request;
diff --git a/java/javax/servlet/ServletResponseWrapper.java
b/java/javax/servlet/ServletResponseWrapper.java
index 4c4829862d..da9264a26d 100644
--- a/java/javax/servlet/ServletResponseWrapper.java
+++ b/java/javax/servlet/ServletResponseWrapper.java
@@ -32,8 +32,7 @@ import java.util.ResourceBundle;
*/
public class ServletResponseWrapper implements ServletResponse {
private static final String LSTRING_FILE = "javax.servlet.LocalStrings";
-private static final ResourceBundle lStrings =
-ResourceBundle.getBundle(LSTRING_FILE);
+private static final ResourceBundle lStrings =
ResourceBundle.getBundle(LSTRING_FILE);
private ServletResponse response;
diff --git a/java/javax/servlet/ServletSecurityElement.java
b/java/javax/servlet/ServletSecurityElement.java
index d0bfa5ba03..9b4821f893 100644
--- a/java/javax/servlet/ServletSecurityElement.java
+++ b/java/javax/servlet/ServletSecurityElement.java
@@ -35,8 +35,7 @@ import javax.servlet.annotation.ServletSecurity;
*/
public class ServletSecurityElement extends HttpConstraintElement {
-private final Map methodConstraints =
-new HashMap<>();
+private final Map methodConstraints =
new HashMap<>();
/**
* Use default HttpConstraint.
diff --git a/java/javax/servlet/jsp/PageContext.java
b/java/javax/servlet/jsp/PageContext.java
index
[tomcat] branch 10.1.x updated: Code clean-up. Fix indenting. No functional change.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new d08baf62e9 Code clean-up. Fix indenting. No functional change.
d08baf62e9 is described below
commit d08baf62e9436cf1c87ef4765e14ebdbf80e25b6
Author: Mark Thomas
AuthorDate: Thu Jan 19 13:59:00 2023 +
Code clean-up. Fix indenting. No functional change.
---
java/jakarta/servlet/HttpConstraintElement.java | 3 +--
java/jakarta/servlet/HttpMethodConstraintElement.java | 3 +--
java/jakarta/servlet/ServletRequestWrapper.java | 3 +--
java/jakarta/servlet/ServletResponseWrapper.java | 3 +--
java/jakarta/servlet/ServletSecurityElement.java | 3 +--
java/jakarta/servlet/jsp/PageContext.java | 12
java/jakarta/servlet/jsp/el/ImplicitObjectELResolver.java | 4 +---
java/jakarta/servlet/jsp/tagext/DynamicAttributes.java| 5 +
java/jakarta/servlet/jsp/tagext/SimpleTagSupport.java | 4 +---
java/jakarta/servlet/jsp/tagext/TagLibraryValidator.java | 3 +--
java/jakarta/servlet/jsp/tagext/TagSupport.java | 6 ++
java/org/apache/catalina/ant/ValidatorTask.java | 3 +--
12 files changed, 16 insertions(+), 36 deletions(-)
diff --git a/java/jakarta/servlet/HttpConstraintElement.java
b/java/jakarta/servlet/HttpConstraintElement.java
index 7fde74b53b..c6be0deebb 100644
--- a/java/jakarta/servlet/HttpConstraintElement.java
+++ b/java/jakarta/servlet/HttpConstraintElement.java
@@ -30,8 +30,7 @@ import
jakarta.servlet.annotation.ServletSecurity.TransportGuarantee;
public class HttpConstraintElement {
private static final String LSTRING_FILE = "jakarta.servlet.LocalStrings";
-private static final ResourceBundle lStrings =
-ResourceBundle.getBundle(LSTRING_FILE);
+private static final ResourceBundle lStrings =
ResourceBundle.getBundle(LSTRING_FILE);
private final EmptyRoleSemantic emptyRoleSemantic;// =
EmptyRoleSemantic.PERMIT;
private final TransportGuarantee transportGuarantee;// =
TransportGuarantee.NONE;
diff --git a/java/jakarta/servlet/HttpMethodConstraintElement.java
b/java/jakarta/servlet/HttpMethodConstraintElement.java
index 56d63850a3..270edc7205 100644
--- a/java/jakarta/servlet/HttpMethodConstraintElement.java
+++ b/java/jakarta/servlet/HttpMethodConstraintElement.java
@@ -28,8 +28,7 @@ public class HttpMethodConstraintElement extends
HttpConstraintElement {
// Can't inherit from HttpConstraintElement as API does not allow it
private static final String LSTRING_FILE = "jakarta.servlet.LocalStrings";
-private static final ResourceBundle lStrings =
-ResourceBundle.getBundle(LSTRING_FILE);
+private static final ResourceBundle lStrings =
ResourceBundle.getBundle(LSTRING_FILE);
private final String methodName;
diff --git a/java/jakarta/servlet/ServletRequestWrapper.java
b/java/jakarta/servlet/ServletRequestWrapper.java
index 094d4686ca..1ce6064407 100644
--- a/java/jakarta/servlet/ServletRequestWrapper.java
+++ b/java/jakarta/servlet/ServletRequestWrapper.java
@@ -35,8 +35,7 @@ import java.util.ResourceBundle;
*/
public class ServletRequestWrapper implements ServletRequest {
private static final String LSTRING_FILE = "jakarta.servlet.LocalStrings";
-private static final ResourceBundle lStrings =
-ResourceBundle.getBundle(LSTRING_FILE);
+private static final ResourceBundle lStrings =
ResourceBundle.getBundle(LSTRING_FILE);
private ServletRequest request;
diff --git a/java/jakarta/servlet/ServletResponseWrapper.java
b/java/jakarta/servlet/ServletResponseWrapper.java
index eb5119497c..545a185e07 100644
--- a/java/jakarta/servlet/ServletResponseWrapper.java
+++ b/java/jakarta/servlet/ServletResponseWrapper.java
@@ -32,8 +32,7 @@ import java.util.ResourceBundle;
*/
public class ServletResponseWrapper implements ServletResponse {
private static final String LSTRING_FILE = "jakarta.servlet.LocalStrings";
-private static final ResourceBundle lStrings =
-ResourceBundle.getBundle(LSTRING_FILE);
+private static final ResourceBundle lStrings =
ResourceBundle.getBundle(LSTRING_FILE);
private ServletResponse response;
diff --git a/java/jakarta/servlet/ServletSecurityElement.java
b/java/jakarta/servlet/ServletSecurityElement.java
index 63494065d3..7cee1e86a8 100644
--- a/java/jakarta/servlet/ServletSecurityElement.java
+++ b/java/jakarta/servlet/ServletSecurityElement.java
@@ -35,8 +35,7 @@ import jakarta.servlet.annotation.ServletSecurity;
*/
public class ServletSecurityElement extends HttpConstraintElement {
-private final Map methodConstraints =
-new HashMap<>();
+private final Map methodConstraints =
new HashMap<>();
/**
* Use default HttpConstraint.
diff --git
[tomcat] branch main updated: Code clean-up. Fix indenting. No functional change.
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 01afc2e115 Code clean-up. Fix indenting. No functional change.
01afc2e115 is described below
commit 01afc2e115a1be244098d00fe12af62d46d027d1
Author: Mark Thomas
AuthorDate: Thu Jan 19 13:59:00 2023 +
Code clean-up. Fix indenting. No functional change.
---
java/jakarta/servlet/HttpConstraintElement.java | 3 +--
java/jakarta/servlet/HttpMethodConstraintElement.java | 3 +--
java/jakarta/servlet/ServletRequestWrapper.java | 3 +--
java/jakarta/servlet/ServletResponse.java | 2 +-
java/jakarta/servlet/ServletResponseWrapper.java | 3 +--
java/jakarta/servlet/ServletSecurityElement.java | 3 +--
java/jakarta/servlet/jsp/PageContext.java | 12
java/jakarta/servlet/jsp/el/ImplicitObjectELResolver.java | 4 +---
java/jakarta/servlet/jsp/tagext/DynamicAttributes.java| 5 +
java/jakarta/servlet/jsp/tagext/SimpleTagSupport.java | 4 +---
java/jakarta/servlet/jsp/tagext/TagLibraryValidator.java | 3 +--
java/jakarta/servlet/jsp/tagext/TagSupport.java | 6 ++
java/org/apache/catalina/ant/ValidatorTask.java | 6 ++
13 files changed, 18 insertions(+), 39 deletions(-)
diff --git a/java/jakarta/servlet/HttpConstraintElement.java
b/java/jakarta/servlet/HttpConstraintElement.java
index 7fde74b53b..c6be0deebb 100644
--- a/java/jakarta/servlet/HttpConstraintElement.java
+++ b/java/jakarta/servlet/HttpConstraintElement.java
@@ -30,8 +30,7 @@ import
jakarta.servlet.annotation.ServletSecurity.TransportGuarantee;
public class HttpConstraintElement {
private static final String LSTRING_FILE = "jakarta.servlet.LocalStrings";
-private static final ResourceBundle lStrings =
-ResourceBundle.getBundle(LSTRING_FILE);
+private static final ResourceBundle lStrings =
ResourceBundle.getBundle(LSTRING_FILE);
private final EmptyRoleSemantic emptyRoleSemantic;// =
EmptyRoleSemantic.PERMIT;
private final TransportGuarantee transportGuarantee;// =
TransportGuarantee.NONE;
diff --git a/java/jakarta/servlet/HttpMethodConstraintElement.java
b/java/jakarta/servlet/HttpMethodConstraintElement.java
index 56d63850a3..270edc7205 100644
--- a/java/jakarta/servlet/HttpMethodConstraintElement.java
+++ b/java/jakarta/servlet/HttpMethodConstraintElement.java
@@ -28,8 +28,7 @@ public class HttpMethodConstraintElement extends
HttpConstraintElement {
// Can't inherit from HttpConstraintElement as API does not allow it
private static final String LSTRING_FILE = "jakarta.servlet.LocalStrings";
-private static final ResourceBundle lStrings =
-ResourceBundle.getBundle(LSTRING_FILE);
+private static final ResourceBundle lStrings =
ResourceBundle.getBundle(LSTRING_FILE);
private final String methodName;
diff --git a/java/jakarta/servlet/ServletRequestWrapper.java
b/java/jakarta/servlet/ServletRequestWrapper.java
index 0ffabc806a..1751ee9d96 100644
--- a/java/jakarta/servlet/ServletRequestWrapper.java
+++ b/java/jakarta/servlet/ServletRequestWrapper.java
@@ -36,8 +36,7 @@ import java.util.ResourceBundle;
*/
public class ServletRequestWrapper implements ServletRequest {
private static final String LSTRING_FILE = "jakarta.servlet.LocalStrings";
-private static final ResourceBundle lStrings =
-ResourceBundle.getBundle(LSTRING_FILE);
+private static final ResourceBundle lStrings =
ResourceBundle.getBundle(LSTRING_FILE);
private ServletRequest request;
diff --git a/java/jakarta/servlet/ServletResponse.java
b/java/jakarta/servlet/ServletResponse.java
index c71a7fffc7..8de3e7d642 100644
--- a/java/jakarta/servlet/ServletResponse.java
+++ b/java/jakarta/servlet/ServletResponse.java
@@ -215,7 +215,7 @@ public interface ServletResponse {
* @since Servlet 6.1
*/
public default void setCharacterEncoding(Charset encoding) {
- setCharacterEncoding(encoding.name());
+setCharacterEncoding(encoding.name());
}
/**
diff --git a/java/jakarta/servlet/ServletResponseWrapper.java
b/java/jakarta/servlet/ServletResponseWrapper.java
index 96fd8a4206..725f115156 100644
--- a/java/jakarta/servlet/ServletResponseWrapper.java
+++ b/java/jakarta/servlet/ServletResponseWrapper.java
@@ -33,8 +33,7 @@ import java.util.ResourceBundle;
*/
public class ServletResponseWrapper implements ServletResponse {
private static final String LSTRING_FILE = "jakarta.servlet.LocalStrings";
-private static final ResourceBundle lStrings =
-ResourceBundle.getBundle(LSTRING_FILE);
+private static final ResourceBundle lStrings =
ResourceBundle.getBundle(LSTRING_FILE);
private ServletResponse response;
diff --git
[tomcat] 01/02: More clean-up after removing support for using a SecurityManager
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
commit cec322c87dae9b8fd67d36e76d506c1722f4338b
Author: Mark Thomas
AuthorDate: Thu Jan 19 13:41:00 2023 +
More clean-up after removing support for using a SecurityManager
---
TOMCAT-NEXT.txt| 6 ++
conf/web.xml | 4
java/jakarta/servlet/ServletContext.java | 3 ---
java/org/apache/catalina/core/StandardWrapper.java | 6 --
java/org/apache/tomcat/dbcp/pool2/impl/ThrowableCallStack.java | 6 +++---
webapps/docs/cgi-howto.xml | 3 +--
webapps/docs/config/systemprops.xml| 9 -
webapps/docs/jasper-howto.xml | 4 ++--
webapps/docs/ssi-howto.xml | 4 +---
9 files changed, 9 insertions(+), 36 deletions(-)
diff --git a/TOMCAT-NEXT.txt b/TOMCAT-NEXT.txt
index 2968daa1bf..018f1f4634 100644
--- a/TOMCAT-NEXT.txt
+++ b/TOMCAT-NEXT.txt
@@ -26,9 +26,7 @@ Notes of things to consider for the next major Tomcat release
(11.x)
3. Add QUIC support using OpenSSL and Panama.
- 4. Remove SecurityManager.
+ 4. Update minimum Java version to 21.
- 5. Update minimum Java version to 21 (or maybe 17).
-
- 6. Implement an optional Loom module that provides
+ 5. Implement an optional Loom module that provides
o.a.c.http11.Http11BioLoomProtocol
diff --git a/conf/web.xml b/conf/web.xml
index df7927df58..68583546e6 100644
--- a/conf/web.xml
+++ b/conf/web.xml
@@ -180,8 +180,6 @@
-
-
@@ -239,8 +237,6 @@
-
-
diff --git a/java/jakarta/servlet/ServletContext.java
b/java/jakarta/servlet/ServletContext.java
index 96d4a1dc52..cf5696f466 100644
--- a/java/jakarta/servlet/ServletContext.java
+++ b/java/jakarta/servlet/ServletContext.java
@@ -874,9 +874,6 @@ public interface ServletContext {
*
* @return The associated web application class loader
*
- * @throws SecurityException if access to the class loader is prevented by
a
- * SecurityManager
- *
* @since Servlet 3.0
*/
public ClassLoader getClassLoader();
diff --git a/java/org/apache/catalina/core/StandardWrapper.java
b/java/org/apache/catalina/core/StandardWrapper.java
index 540bf0ce3a..af12983b7c 100644
--- a/java/org/apache/catalina/core/StandardWrapper.java
+++ b/java/org/apache/catalina/core/StandardWrapper.java
@@ -226,12 +226,6 @@ public class StandardWrapper extends ContainerBase
private boolean overridable = false;
-/**
- * Static class array used when the SecurityManager is turned on and
- * Servlet.init is invoked.
- */
-protected static Class[] classType = new Class[]{ServletConfig.class};
-
private final ReentrantReadWriteLock parametersLock =
new ReentrantReadWriteLock();
diff --git a/java/org/apache/tomcat/dbcp/pool2/impl/ThrowableCallStack.java
b/java/org/apache/tomcat/dbcp/pool2/impl/ThrowableCallStack.java
index 6f187559e5..5c9f89a71b 100644
--- a/java/org/apache/tomcat/dbcp/pool2/impl/ThrowableCallStack.java
+++ b/java/org/apache/tomcat/dbcp/pool2/impl/ThrowableCallStack.java
@@ -21,9 +21,9 @@ import java.text.DateFormat;
import java.text.SimpleDateFormat;
/**
- * CallStack strategy that uses the stack trace from a {@link Throwable}. This
strategy, while slower than the
- * SecurityManager implementation, provides call stack method names and other
metadata in addition to the call stack
- * of classes.
+ * CallStack strategy that uses the stack trace from a {@link Throwable}. This
+ * strategy provides call stack method names and other metadata in addition to
+ * the call stack of classes.
*
* @see Throwable#fillInStackTrace()
* @since 2.4.3
diff --git a/webapps/docs/cgi-howto.xml b/webapps/docs/cgi-howto.xml
index e00faf0a19..d1f3e0d0c9 100644
--- a/webapps/docs/cgi-howto.xml
+++ b/webapps/docs/cgi-howto.xml
@@ -57,8 +57,7 @@ this servlet is mapped to the URL pattern "/cgi-bin/*".
CAUTION - CGI scripts are used to execute programs
-external to the Tomcat JVM. If you are using the Java SecurityManager this
-will bypass your security policy configuration in
catalina.policy.
+external to the Tomcat JVM.
To enable CGI support:
diff --git a/webapps/docs/config/systemprops.xml
b/webapps/docs/config/systemprops.xml
index 0def5feb97..4225fd2bec 100644
--- a/webapps/docs/config/systemprops.xml
+++ b/webapps/docs/config/systemprops.xml
@@ -74,15 +74,6 @@
-
- Controls whether the EL API classes make use of a privileged block to
- obtain the thread context class loader. When using the EL API within
- Apache Tomcat this does not need to be set as all calls are already
- wrapped in a privileged block
[tomcat] branch main updated (954cb1c3f2 -> 4ce8c0a059)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git from 954cb1c3f2 Remove JreCompat support for Java 16 and associated Java < 16 code new cec322c87d More clean-up after removing support for using a SecurityManager new 4ce8c0a059 Fix test broken by Java 16 deprecation fixes 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: TOMCAT-NEXT.txt| 6 ++ conf/web.xml | 4 java/jakarta/servlet/ServletContext.java | 3 --- java/org/apache/catalina/core/StandardWrapper.java | 6 -- java/org/apache/tomcat/dbcp/pool2/impl/ThrowableCallStack.java | 6 +++--- test/org/apache/juli/TestThreadNameCache.java | 2 +- webapps/docs/cgi-howto.xml | 3 +-- webapps/docs/config/systemprops.xml| 9 - webapps/docs/jasper-howto.xml | 4 ++-- webapps/docs/ssi-howto.xml | 4 +--- 10 files changed, 10 insertions(+), 37 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: Fix test broken by Java 16 deprecation fixes
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
commit 4ce8c0a059807dc7b282ac02422894a78618e9e4
Author: Mark Thomas
AuthorDate: Thu Jan 19 13:43:06 2023 +
Fix test broken by Java 16 deprecation fixes
---
test/org/apache/juli/TestThreadNameCache.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/org/apache/juli/TestThreadNameCache.java
b/test/org/apache/juli/TestThreadNameCache.java
index d32efb8127..65c7a6e6b2 100644
--- a/test/org/apache/juli/TestThreadNameCache.java
+++ b/test/org/apache/juli/TestThreadNameCache.java
@@ -32,7 +32,7 @@ public class TestThreadNameCache {
final CountDownLatch cacheLatch = new CountDownLatch(1);
OneLineFormatter olf = new OneLineFormatter();
-Method getThreadName =
olf.getClass().getDeclaredMethod("getThreadName", int.class);
+Method getThreadName =
olf.getClass().getDeclaredMethod("getThreadName", long.class);
getThreadName.setAccessible(true);
Thread thread = new Thread() {
@Override
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r59440 - /dev/tomcat/tomcat-8/v8.5.85/ /release/tomcat/tomcat-8/v8.5.85/
Author: schultz Date: Thu Jan 19 13:24:03 2023 New Revision: 59440 Log: Promote 8.5.85 to released. Added: release/tomcat/tomcat-8/v8.5.85/ - copied from r59439, dev/tomcat/tomcat-8/v8.5.85/ Removed: dev/tomcat/tomcat-8/v8.5.85/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Verifying reproducible release builds
Emmanuel, On 1/15/23 04:41, Emmanuel Bourg wrote: Hi Christopher, Le 12/01/2023 à 23:24, Christopher Schultz a écrit : I spent some time today verifying that the release artifacts that Mark published the other day for 10.1.5 were indeed reproducible by me. Fortunately, they were, but it was a little bit of a process so I went ahead and documented it. https://cwiki.apache.org/confluence/display/TOMCAT/Verifying+a+Release+Build A couple of suggestions: - I'd use shasum rather than diff to compare the artifacts Fair enough. Neither command is available on Windows without installing anything separate, though. For the .sig files, simply viewing them (in pairs) is possible on Windows natively. I could put instructions for how to do that in the wiki. - if the artifacts are not identical, the diffoscope tool [1] can help identify the differences Good information to have, but not likely helpful for someone performing a verification. They would really only care that they were simply _not identical_, I think. -chris - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Buildbot failure in on tomcat-11.0.x
Build status: BUILD FAILED: failed compile (failure) Worker used: bb2_worker2_ubuntu URL: https://ci2.apache.org/#builders/112/builds/135 Blamelist: Mark Thomas Build Text: failed compile (failure) Status Detected: new failure Build Source Stamp: [branch main] 954cb1c3f259941152ad889b18a380be2bec6756 Steps: worker_preparation: 0 git: 0 shell: 0 shell_1: 0 shell_2: 0 shell_3: 0 shell_4: 0 shell_5: 0 compile: 1 shell_6: 0 shell_7: 0 shell_8: 0 shell_9: 0 Rsync docs to nightlies.apache.org: 0 shell_10: 0 Rsync RAT to nightlies.apache.org: 0 compile_1: 2 shell_11: 0 Rsync Logs to nightlies.apache.org: 0 -- ASF Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Remove JreCompat support for Java 16 and associated Java < 16 code
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 954cb1c3f2 Remove JreCompat support for Java 16 and associated Java <
16 code
954cb1c3f2 is described below
commit 954cb1c3f259941152ad889b18a380be2bec6756
Author: Mark Thomas
AuthorDate: Thu Jan 19 10:32:28 2023 +
Remove JreCompat support for Java 16 and associated Java < 16 code
---
.../apache/tomcat/util/buf/LocalStrings.properties | 2 -
.../tomcat/util/buf/LocalStrings_cs.properties | 16
.../tomcat/util/buf/LocalStrings_de.properties | 16
.../tomcat/util/buf/LocalStrings_es.properties | 2 -
.../tomcat/util/buf/LocalStrings_fr.properties | 2 -
.../tomcat/util/buf/LocalStrings_ja.properties | 2 -
.../tomcat/util/buf/LocalStrings_ko.properties | 2 -
.../tomcat/util/buf/LocalStrings_pt_BR.properties | 16
.../tomcat/util/buf/LocalStrings_zh_CN.properties | 2 -
java/org/apache/tomcat/util/buf/MessageBytes.java | 41 -
.../org/apache/tomcat/util/compat/Jre16Compat.java | 100 -
.../org/apache/tomcat/util/compat/Jre19Compat.java | 2 +-
java/org/apache/tomcat/util/compat/JreCompat.java | 52 +--
.../tomcat/util/compat/LocalStrings.properties | 5 --
.../tomcat/util/compat/LocalStrings_fr.properties | 5 --
.../tomcat/util/compat/LocalStrings_ja.properties | 5 --
.../tomcat/util/compat/LocalStrings_ko.properties | 19
.../util/compat/LocalStrings_zh_CN.properties | 5 --
java/org/apache/tomcat/util/net/NioEndpoint.java | 11 +--
.../apache/tomcat/util/buf/TestMessageBytes.java | 95
.../apache/tomcat/util/net/TestXxxEndpoint.java| 10 +--
21 files changed, 14 insertions(+), 396 deletions(-)
diff --git a/java/org/apache/tomcat/util/buf/LocalStrings.properties
b/java/org/apache/tomcat/util/buf/LocalStrings.properties
index b4d5a4eccb..cd883e6f57 100644
--- a/java/org/apache/tomcat/util/buf/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/buf/LocalStrings.properties
@@ -27,8 +27,6 @@ encodedSolidusHandling.invalid=The value [{0}] is not
recognised
hexUtils.fromHex.nonHex=The input must consist only of hex digits
hexUtils.fromHex.oddDigits=The input must consist of an even number of hex
digits
-messageBytes.illegalCharacter=The Unicode character [{0}] at code point [{1}]
cannot be encoded as it is outside the permitted range of 0 to 255
-
uDecoder.eof=End of file (EOF)
uDecoder.noSlash=The encoded slash character is not allowed
uDecoder.urlDecode.conversionError=Failed to decode [{0}] using character set
[{1}]
diff --git a/java/org/apache/tomcat/util/buf/LocalStrings_cs.properties
b/java/org/apache/tomcat/util/buf/LocalStrings_cs.properties
deleted file mode 100644
index 1a0a1214f0..00
--- a/java/org/apache/tomcat/util/buf/LocalStrings_cs.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-messageBytes.illegalCharacter=Unicode znak [{0}] na kódové značce [{1}] nemůže
být zakódován, protože je mimo povolený rozsah 0 až 255.
diff --git a/java/org/apache/tomcat/util/buf/LocalStrings_de.properties
b/java/org/apache/tomcat/util/buf/LocalStrings_de.properties
deleted file mode 100644
index 2220bbfc34..00
--- a/java/org/apache/tomcat/util/buf/LocalStrings_de.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the
[tomcat] branch main updated: Fix Java 16 deprecation warning
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 05162950bf Fix Java 16 deprecation warning
05162950bf is described below
commit 05162950bfffe7a1d5a5ccec998b598b9f366c05
Author: Mark Thomas
AuthorDate: Thu Jan 19 10:12:41 2023 +
Fix Java 16 deprecation warning
---
java/org/apache/tomcat/dbcp/pool2/impl/SoftReferenceObjectPool.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/java/org/apache/tomcat/dbcp/pool2/impl/SoftReferenceObjectPool.java
b/java/org/apache/tomcat/dbcp/pool2/impl/SoftReferenceObjectPool.java
index 889db63855..7f02e77fca 100644
--- a/java/org/apache/tomcat/dbcp/pool2/impl/SoftReferenceObjectPool.java
+++ b/java/org/apache/tomcat/dbcp/pool2/impl/SoftReferenceObjectPool.java
@@ -364,7 +364,7 @@ public class SoftReferenceObjectPool extends
BaseObjectPool {
PooledSoftReference ref;
while (iterator.hasNext()) {
ref = iterator.next();
-if (ref.getReference() == null || ref.getReference().isEnqueued())
{
+if (ref.getReference() == null ||
ref.getReference().refersTo(null)) {
iterator.remove();
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Fix deprecation warning after switch to Java 17+
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 81e0b20062 Fix deprecation warning after switch to Java 17+
81e0b20062 is described below
commit 81e0b200622b0e722b120839789ba5df5d867719
Author: Mark Thomas
AuthorDate: Thu Jan 19 10:01:33 2023 +
Fix deprecation warning after switch to Java 17+
This also avoids the "Using int as thread ID in LogRecord" issue
---
java/org/apache/juli/OneLineFormatter.java | 46 +++---
1 file changed, 17 insertions(+), 29 deletions(-)
diff --git a/java/org/apache/juli/OneLineFormatter.java
b/java/org/apache/juli/OneLineFormatter.java
index 6828a3ab89..5550b67778 100644
--- a/java/org/apache/juli/OneLineFormatter.java
+++ b/java/org/apache/juli/OneLineFormatter.java
@@ -39,7 +39,6 @@ import java.util.logging.LogRecord;
*/
public class OneLineFormatter extends Formatter {
-private static final String UNKNOWN_THREAD_NAME = "Unknown thread with ID
";
private static final Object threadMxBeanLock = new Object();
private static volatile ThreadMXBean threadMxBean = null;
private static final int THREAD_NAME_CACHE_SIZE = 1;
@@ -137,7 +136,7 @@ public class OneLineFormatter extends Formatter {
if (threadName != null &&
threadName.startsWith(AsyncFileHandler.THREAD_PREFIX)) {
// If using the async handler can't get the thread name from the
// current thread.
-sb.append(getThreadName(record.getThreadID()));
+sb.append(getThreadName(record.getLongThreadID()));
} else {
sb.append(threadName);
}
@@ -213,47 +212,36 @@ public class OneLineFormatter extends Formatter {
/**
* LogRecord has threadID but no thread name.
- * LogRecord uses an int for thread ID but thread IDs are longs.
- * If the real thread ID > (Integer.MAXVALUE / 2) LogRecord uses it's own
- * ID in an effort to avoid clashes due to overflow.
- *
- * Words fail me to describe what I think of the design decision to use an
- * int in LogRecord for a long value and the resulting mess that follows.
*/
-private static String getThreadName(int logRecordThreadId) {
-Map cache = threadNameCache.get();
-String result = cache.get(Integer.valueOf(logRecordThreadId));
+private static String getThreadName(long logRecordThreadId) {
+Map cache = threadNameCache.get();
+String result = cache.get(Long.valueOf(logRecordThreadId));
if (result != null) {
return result;
}
-if (logRecordThreadId > Integer.MAX_VALUE / 2) {
-result = UNKNOWN_THREAD_NAME + logRecordThreadId;
-} else {
-// Double checked locking OK as threadMxBean is volatile
-if (threadMxBean == null) {
-synchronized (threadMxBeanLock) {
-if (threadMxBean == null) {
-threadMxBean = ManagementFactory.getThreadMXBean();
-}
+// Double checked locking OK as threadMxBean is volatile
+if (threadMxBean == null) {
+synchronized (threadMxBeanLock) {
+if (threadMxBean == null) {
+threadMxBean = ManagementFactory.getThreadMXBean();
}
}
-ThreadInfo threadInfo =
-threadMxBean.getThreadInfo(logRecordThreadId);
-if (threadInfo == null) {
-return Long.toString(logRecordThreadId);
-}
-result = threadInfo.getThreadName();
}
+ThreadInfo threadInfo = threadMxBean.getThreadInfo(logRecordThreadId);
+if (threadInfo == null) {
+return Long.toString(logRecordThreadId);
+}
+result = threadInfo.getThreadName();
-cache.put(Integer.valueOf(logRecordThreadId), result);
+cache.put(Long.valueOf(logRecordThreadId), result);
return result;
}
-private static class ThreadNameCache extends LinkedHashMap
{
+private static class ThreadNameCache extends LinkedHashMap {
private static final long serialVersionUID = 1L;
@@ -264,7 +252,7 @@ public class OneLineFormatter extends Formatter {
}
@Override
-protected boolean removeEldestEntry(Entry eldest) {
+protected boolean removeEldestEntry(Entry eldest) {
return (size() > cacheSize);
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 11.0.0-M2
Ping. The VOTE has been open for 10 days. I'll leave it a few more days. Mark On 13/01/2023 13:48, Mark Thomas wrote: Ping. This vote is current one PMV vote short of being bale to release. Mark On 09/01/2023 18:20, Mark Thomas wrote: The proposed Apache Tomcat 11.0.0-M2 release is now available for voting. Apache Tomcat 11.0.0-M2 is a milestone release of the 11.0.x branch and has been made to provide users with early access to the new features in Apache Tomcat 11.0.x so that they may provide feedback. The notable changes compared to the previous milestone include: - Add ByteBuffer support to ServletInputStream and ServletOutputStream - Update Cookie parsing and handling to treat the quotes in a quoted cookie value as part of the value as required by RFC 6265 and explicitly clarified in RFC 6265bis. - When resetting an HTTP/2 stream because the final response has been generated before the request has been fully read, use the HTTP/2 error code NO_ERROR so that client does not discard the response. Based on a suggestion by Lorenzo Dalla Vecchia. For full details, see the change log: https://nightlies.apache.org/tomcat/tomcat-11.0.x/docs/changelog.html Applications that run on Tomcat 9 and earlier will not run on Tomcat 11 without changes. Java EE applications designed for Tomcat 9 and earlier may be placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat will automatically convert them to Jakarta EE and copy them to the webapps directory. Applications using deprecated APIs may require further changes. It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/tomcat-11/v11.0.0-M2/ 4b03c23ad60e678c1d1a85df815fb6cd8d14ca67 The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-1413 The tag is: https://github.com/apache/tomcat/tree/11.0.0-M2 The proposed 11.0.0-M2 release is: [ ] Broken - do not release [ ] Stable - go ahead and release as 11.0.0-M2 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1906797 - in /tomcat/site/trunk: docs/whichversion.html xdocs/whichversion.xml
Author: markt Date: Thu Jan 19 09:51:47 2023 New Revision: 1906797 URL: http://svn.apache.org/viewvc?rev=1906797=rev Log: Update minimum Java version for Tomcat 11 Modified: tomcat/site/trunk/docs/whichversion.html tomcat/site/trunk/xdocs/whichversion.xml Modified: tomcat/site/trunk/docs/whichversion.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/whichversion.html?rev=1906797=1906796=1906797=diff == --- tomcat/site/trunk/docs/whichversion.html (original) +++ tomcat/site/trunk/docs/whichversion.html Thu Jan 19 09:51:47 2023 @@ -29,7 +29,7 @@ specifications and the respective Ap TBD 11.0.x 11.0.0-M1 (alpha) - 11 and later + 17 and later Modified: tomcat/site/trunk/xdocs/whichversion.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/whichversion.xml?rev=1906797=1906796=1906797=diff == --- tomcat/site/trunk/xdocs/whichversion.xml (original) +++ tomcat/site/trunk/xdocs/whichversion.xml Thu Jan 19 09:51:47 2023 @@ -40,7 +40,7 @@ specifications and the respective Ap TBD 11.0.x 11.0.0-M1 (alpha) - 11 and later + 17 and later - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Increase minimum Java version to 17
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 7eec47eeb2 Increase minimum Java version to 17 7eec47eeb2 is described below commit 7eec47eeb22d47ef4392f6f0468300a7b0c12748 Author: Mark Thomas AuthorDate: Thu Jan 19 09:50:18 2023 + Increase minimum Java version to 17 --- build.xml | 6 +++--- webapps/docs/changelog.xml | 10 ++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/build.xml b/build.xml index 9ed54055d5..b640f3a0a7 100644 --- a/build.xml +++ b/build.xml @@ -105,9 +105,9 @@ - - - + + + diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 31d232d01f..b89a5756ed 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -105,6 +105,16 @@ issues do not "pop up" wrt. others). --> + + + +Increase the minimum supported Java version to Java 17. Note that +Jakarta EE 11 permits a minimum Java version of 21. The minimum Java +version for Tomcat 11 may be increased to Java 21 before the first +stable release. (markt) + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1906793 - in /tomcat/site/trunk: docs/ci.html xdocs/ci.xml
Author: markt Date: Thu Jan 19 09:26:52 2023 New Revision: 1906793 URL: http://svn.apache.org/viewvc?rev=1906793=rev Log: Fix copy/paste errors 10.1.x Gump links Modified: tomcat/site/trunk/docs/ci.html tomcat/site/trunk/xdocs/ci.xml Modified: tomcat/site/trunk/docs/ci.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/ci.html?rev=1906793=1906792=1906793=diff == --- tomcat/site/trunk/docs/ci.html (original) +++ tomcat/site/trunk/docs/ci.html Thu Jan 19 09:26:52 2023 @@ -166,11 +166,11 @@ for not-yet-released versions of Apache Source path: https://github.com/apache/tomcat;>https://github.com/apache/tomcat Projects: - http://vmgump.apache.org/tomcat-10.1.x/tomcat-10.0.x/;>tomcat-10.1.x - http://vmgump.apache.org/tomcat-10.1.x/tomcat-10.0.x-test-nio/;>tomcat-10.1.x-test-nio - http://vmgump.apache.org/tomcat-10.1.x/tomcat-10.0.x-test-nio2/;>tomcat-10.1.x-test-nio2 - http://vmgump.apache.org/tomcat-10.1.x/tomcat-10.0.x-validate/;>tomcat-10.1.x-validate - http://vmgump.apache.org/tomcat-10.1.x/tomcat-10.0.x-validate-eoln/;>tomcat-10.0.x-validate-eoln + http://vmgump.apache.org/tomcat-10.1.x/tomcat-10.1.x/;>tomcat-10.1.x + http://vmgump.apache.org/tomcat-10.1.x/tomcat-10.1.x-test-nio/;>tomcat-10.1.x-test-nio + http://vmgump.apache.org/tomcat-10.1.x/tomcat-10.1.x-test-nio2/;>tomcat-10.1.x-test-nio2 + http://vmgump.apache.org/tomcat-10.1.x/tomcat-10.1.x-validate/;>tomcat-10.1.x-validate + http://vmgump.apache.org/tomcat-10.1.x/tomcat-10.1.x-validate-eoln/;>tomcat-10.1.x-validate-eoln http://vmgump.apache.org/tomcat-10.1.x/tomcat-10.1.x-test-nio/gump_file/TEST-org.apache.catalina.util.TestServerInfo.NIO.txt.html; rel="nofollow">TestServerInfo result Modified: tomcat/site/trunk/xdocs/ci.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/ci.xml?rev=1906793=1906792=1906793=diff == --- tomcat/site/trunk/xdocs/ci.xml (original) +++ tomcat/site/trunk/xdocs/ci.xml Thu Jan 19 09:26:52 2023 @@ -186,11 +186,11 @@ for not-yet-released versions of Apache Source path: https://github.com/apache/tomcat;>https://github.com/apache/tomcat Projects: - http://vmgump.apache.org/tomcat-10.1.x/tomcat-10.0.x/;>tomcat-10.1.x - http://vmgump.apache.org/tomcat-10.1.x/tomcat-10.0.x-test-nio/;>tomcat-10.1.x-test-nio - http://vmgump.apache.org/tomcat-10.1.x/tomcat-10.0.x-test-nio2/;>tomcat-10.1.x-test-nio2 - http://vmgump.apache.org/tomcat-10.1.x/tomcat-10.0.x-validate/;>tomcat-10.1.x-validate - http://vmgump.apache.org/tomcat-10.1.x/tomcat-10.0.x-validate-eoln/;>tomcat-10.0.x-validate-eoln + http://vmgump.apache.org/tomcat-10.1.x/tomcat-10.1.x/;>tomcat-10.1.x + http://vmgump.apache.org/tomcat-10.1.x/tomcat-10.1.x-test-nio/;>tomcat-10.1.x-test-nio + http://vmgump.apache.org/tomcat-10.1.x/tomcat-10.1.x-test-nio2/;>tomcat-10.1.x-test-nio2 + http://vmgump.apache.org/tomcat-10.1.x/tomcat-10.1.x-validate/;>tomcat-10.1.x-validate + http://vmgump.apache.org/tomcat-10.1.x/tomcat-10.1.x-validate-eoln/;>tomcat-10.1.x-validate-eoln http://vmgump.apache.org/tomcat-10.1.x/tomcat-10.1.x-test-nio/gump_file/TEST-org.apache.catalina.util.TestServerInfo.NIO.txt.html; rel="nofollow">TestServerInfo result - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tomcat 11 - minimum Java version
On Thu, Jan 19, 2023 at 10:01 AM Mark Thomas wrote: > > Hi all, > > As a result of the discussions and reminding myself of various issues I > intend to proceed as follows: > > - Switch the minimum JRE to Java 17 for Tomcat 11. While Jakarta >EE 11 permits a minimum of Java 21, we will decide later whether to >increase the minimum Java version to 21 for Tomcat 11. > > - Switch the CI systems to build with Java 17 for all branches except >Tomcat 8.5.x on buildbot since the version of ECJ we are restricted to >for Tomcat 8.5.x has issues on Java 17 (BZ 65599). > > - I intend to leave the minimum build version as Java 11 for 8.5.x, >9.0.x and 10.1.x as there is no driver to increase that at this time +1 I plan to keep on building 9.0 with Java 11 for now (no incentive to update yet). Rémy > Mark > > > On 11/01/2023 11:23, Mark Thomas wrote: > > Hi all, > > > > The Jakarta EE platform group has announced that the minimum Java > > version for Jakarta EE 11 will be Java 21. [1] > > > > Given that the Java SecurityManager was deprecated in Java 17 and > > planned for removal I intend to remove all references to the > > SecurityManager from the Tomcat 11 code base. I plan to do this shortly. > > > > We would normally make Java 21 the minimum Java version. Given that Java > > 21 is still in EA, I don't plan to do that yet. > > > > We could switch all branches to Java 17 as the the default build JRE now > > as that supports targeting Java 7 onwards. That would allow us to easily > > use some newer Java features in Tomcat 11 whilst still only requiring > > RMs to use a single JDK version. If there are no objections I'll do this > > shortly. > > > > Java 21 supports targeting Java 8 onwards which means we won't be able > > to switch to that when available for all branches unless Tomcat 8.5.x > > has already reached EOL. > > > > The target date for Jakarta EE 11 is Q1 2024. Given that there are no > > Java 21 features we want to use in Tomcat 11 right now I suggest we wait > > until we need to build Tomcat 11 with Java 21 to decide what to do. > > Worst case, we'll need to build most branches with Java 21 and 8.5.x > > with Java 17 until 8.5.x reaches EOL (31 March 2024). > > > > I don't think there are any other immediate implications for Tomcat 11. > > I'll continue to track the changes in the various specifications. The > > summary at the moment is: > > - removal of SecurityManager references from all > > - servlet > >- minor improvements / new features > >- lots of clarifications of the Async API > >- possible new low level HTTP API but not much movement so far > > - EL > >- removing reference to JavaBean spec is largish piece of work > > - JSP > >- no plans other than necessary updates triggered by changes in > > EL/Servlet > > - WebSocket > >- minor improvements / new features > >- clarifications > > > > Mark > > > > [1] https://www.eclipse.org/lists/jakartaee-platform-dev/msg03898.html > > > > - > > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > > For additional commands, e-mail: dev-h...@tomcat.apache.org > > > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tomcat 11 - minimum Java version
Hi all, As a result of the discussions and reminding myself of various issues I intend to proceed as follows: - Switch the minimum JRE to Java 17 for Tomcat 11. While Jakarta EE 11 permits a minimum of Java 21, we will decide later whether to increase the minimum Java version to 21 for Tomcat 11. - Switch the CI systems to build with Java 17 for all branches except Tomcat 8.5.x on buildbot since the version of ECJ we are restricted to for Tomcat 8.5.x has issues on Java 17 (BZ 65599). - I intend to leave the minimum build version as Java 11 for 8.5.x, 9.0.x and 10.1.x as there is no driver to increase that at this time Mark On 11/01/2023 11:23, Mark Thomas wrote: Hi all, The Jakarta EE platform group has announced that the minimum Java version for Jakarta EE 11 will be Java 21. [1] Given that the Java SecurityManager was deprecated in Java 17 and planned for removal I intend to remove all references to the SecurityManager from the Tomcat 11 code base. I plan to do this shortly. We would normally make Java 21 the minimum Java version. Given that Java 21 is still in EA, I don't plan to do that yet. We could switch all branches to Java 17 as the the default build JRE now as that supports targeting Java 7 onwards. That would allow us to easily use some newer Java features in Tomcat 11 whilst still only requiring RMs to use a single JDK version. If there are no objections I'll do this shortly. Java 21 supports targeting Java 8 onwards which means we won't be able to switch to that when available for all branches unless Tomcat 8.5.x has already reached EOL. The target date for Jakarta EE 11 is Q1 2024. Given that there are no Java 21 features we want to use in Tomcat 11 right now I suggest we wait until we need to build Tomcat 11 with Java 21 to decide what to do. Worst case, we'll need to build most branches with Java 21 and 8.5.x with Java 17 until 8.5.x reaches EOL (31 March 2024). I don't think there are any other immediate implications for Tomcat 11. I'll continue to track the changes in the various specifications. The summary at the moment is: - removal of SecurityManager references from all - servlet - minor improvements / new features - lots of clarifications of the Async API - possible new low level HTTP API but not much movement so far - EL - removing reference to JavaBean spec is largish piece of work - JSP - no plans other than necessary updates triggered by changes in EL/Servlet - WebSocket - minor improvements / new features - clarifications Mark [1] https://www.eclipse.org/lists/jakartaee-platform-dev/msg03898.html - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Deprecate SecurityManager references in ContextBind
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 5ce4262fed Deprecate SecurityManager references in ContextBind
5ce4262fed is described below
commit 5ce4262fededa6effcd5bdaebd0b8a4911bcda5c
Author: Mark Thomas
AuthorDate: Thu Jan 19 08:38:24 2023 +
Deprecate SecurityManager references in ContextBind
---
.../apache/catalina/connector/CoyoteAdapter.java | 16 +++---
.../catalina/core/ApplicationDispatcher.java | 4 +-
.../org/apache/catalina/core/AsyncContextImpl.java | 12 ++---
java/org/apache/catalina/core/ContainerBase.java | 4 +-
java/org/apache/catalina/core/StandardContext.java | 12 +
.../apache/catalina/core/StandardHostValve.java| 4 +-
.../apache/catalina/session/DataSourceStore.java | 8 +--
java/org/apache/catalina/session/FileStore.java| 4 +-
.../apache/catalina/session/StandardSession.java | 8 +--
.../org/apache/catalina/startup/FailedContext.java | 10
.../apache/catalina/valves/PersistentValve.java| 4 +-
java/org/apache/coyote/AbstractProtocol.java | 8 +--
.../http11/upgrade/UpgradeServletInputStream.java | 8 +--
.../http11/upgrade/UpgradeServletOutputStream.java | 8 +--
java/org/apache/tomcat/ContextBind.java| 58 +-
test/org/apache/tomcat/unittest/TesterContext.java | 10
16 files changed, 121 insertions(+), 57 deletions(-)
diff --git a/java/org/apache/catalina/connector/CoyoteAdapter.java
b/java/org/apache/catalina/connector/CoyoteAdapter.java
index 0fd2a482ff..9efcce07e6 100644
--- a/java/org/apache/catalina/connector/CoyoteAdapter.java
+++ b/java/org/apache/catalina/connector/CoyoteAdapter.java
@@ -153,7 +153,7 @@ public class CoyoteAdapter implements Adapter {
Context context = request.getContext();
ClassLoader oldCL = null;
try {
-oldCL = context.bind(false, null);
+oldCL = context.bind(null);
if (req.getReadListener() != null) {
req.getReadListener().onError(t);
}
@@ -163,7 +163,7 @@ public class CoyoteAdapter implements Adapter {
res.action(ActionCode.CLOSE_NOW, t);
asyncConImpl.setErrorState(t, true);
} finally {
-context.unbind(false, oldCL);
+context.unbind(oldCL);
}
}
@@ -175,7 +175,7 @@ public class CoyoteAdapter implements Adapter {
Context context = request.getContext();
ClassLoader oldCL = null;
try {
-oldCL = context.bind(false, null);
+oldCL = context.bind(null);
res.onWritePossible();
if (request.isFinished() && req.sendAllDataReadEvent()
&&
readListener != null) {
@@ -196,13 +196,13 @@ public class CoyoteAdapter implements Adapter {
res.action(ActionCode.CLOSE_NOW, t);
asyncConImpl.setErrorState(t, true);
} finally {
-context.unbind(false, oldCL);
+context.unbind(oldCL);
}
} else if (readListener != null && status ==
SocketEvent.OPEN_READ) {
Context context = request.getContext();
ClassLoader oldCL = null;
try {
-oldCL = context.bind(false, null);
+oldCL = context.bind(null);
// If data is being read on a non-container thread a
// dispatch with status OPEN_READ will be used to get
// execution back on a container thread for the
@@ -229,7 +229,7 @@ public class CoyoteAdapter implements Adapter {
res.action(ActionCode.CLOSE_NOW, t);
asyncConImpl.setErrorState(t, true);
} finally {
-context.unbind(false, oldCL);
+context.unbind(oldCL);
}
}
}
@@ -365,12 +365,12 @@ public class CoyoteAdapter implements Adapter {
// method so this needs to be checked here
ClassLoader oldCL = null;
try {
-oldCL = request.getContext().bind(false, null);
+oldCL = request.getContext().bind(null);
if (req.sendAllDataReadEvent()) {
req.getReadListener().onAllDataRead();
}
} finally {
-
