[jira] [Created] (MTOMCAT-327) Tomcat 9.0.50 and it has apr-1.7.0 dependency, with Address CVE-2021-35940
yuanhuaijiang created MTOMCAT-327: - Summary: Tomcat 9.0.50 and it has apr-1.7.0 dependency, with Address CVE-2021-35940 Key: MTOMCAT-327 URL: https://issues.apache.org/jira/browse/MTOMCAT-327 Project: Apache Tomcat Maven Plugin Issue Type: Bug Reporter: yuanhuaijiang Tomcat 9.0.50 and it has apr-1.7.0 dependency, which is vulnerable.(https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-35940) -- This message was sent by Atlassian Jira (v8.3.4#803005) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Resolved] (MTOMCAT-327) Tomcat 9.0.50 and it has apr-1.7.0 dependency, with Address CVE-2021-35940
[ https://issues.apache.org/jira/browse/MTOMCAT-327?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Mark Thomas resolved MTOMCAT-327. - Resolution: Invalid Not an Apache Tomcat Maven Plugin issue. > Tomcat 9.0.50 and it has apr-1.7.0 dependency, with Address CVE-2021-35940 > -- > > Key: MTOMCAT-327 > URL: https://issues.apache.org/jira/browse/MTOMCAT-327 > Project: Apache Tomcat Maven Plugin > Issue Type: Bug >Reporter: yuanhuaijiang >Priority: Major > > Tomcat 9.0.50 and it has apr-1.7.0 dependency, which is > vulnerable.(https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-35940) -- This message was sent by Atlassian Jira (v8.3.4#803005) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 65587] https://tomcat.apache.org/download-90.cgi is not accessible
https://bz.apache.org/bugzilla/show_bug.cgi?id=65587 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #2 from Mark Thomas --- This has been fixed now. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 04/05: Remove more STM references
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 8dc018ffe0cdc8c7352a41dd24ddb5d072c3a6df
Author: Mark Thomas
AuthorDate: Tue Sep 21 12:50:18 2021 +0100
Remove more STM references
---
java/org/apache/catalina/Container.java | 4 +---
java/org/apache/catalina/Wrapper.java | 15 ---
java/org/apache/catalina/core/StandardWrapper.java | 11 +++
java/org/apache/catalina/core/StandardWrapperValve.java | 2 +-
java/org/apache/catalina/core/mbeans-descriptors.xml| 9 -
res/findbugs/filter-false-positives.xml | 6 --
6 files changed, 9 insertions(+), 38 deletions(-)
diff --git a/java/org/apache/catalina/Container.java
b/java/org/apache/catalina/Container.java
index 98dd2be..0881a70 100644
--- a/java/org/apache/catalina/Container.java
+++ b/java/org/apache/catalina/Container.java
@@ -43,9 +43,7 @@ import org.apache.juli.logging.Log;
* of Contexts.
* Context - Representation of a single ServletContext, which will
* typically contain one or more Wrappers for the supported servlets.
- * Wrapper - Representation of an individual servlet definition
- * (which may support multiple servlet instances if the servlet itself
- * implements SingleThreadModel).
+ * Wrapper - Representation of an individual servlet definition.
*
* A given deployment of Catalina need not include Containers at all of the
* levels described above. For example, an administration application
diff --git a/java/org/apache/catalina/Wrapper.java
b/java/org/apache/catalina/Wrapper.java
index 160e6f6..b40252e 100644
--- a/java/org/apache/catalina/Wrapper.java
+++ b/java/org/apache/catalina/Wrapper.java
@@ -31,8 +31,7 @@ import jakarta.servlet.UnavailableException;
*
* Implementations of Wrapper are responsible for managing the servlet life
* cycle for their underlying servlet class, including calling init() and
- * destroy() at appropriate times, as well as respecting the existence of
- * the SingleThreadModel declaration on the servlet class itself.
+ * destroy() at appropriate times.
*
* The parent Container attached to a Wrapper will generally be an
* implementation of Context, representing the servlet context (and
@@ -190,12 +189,8 @@ public interface Wrapper extends Container {
/**
* Allocate an initialized instance of this Servlet that is ready to have
- * its service() method called. If the Servlet class does
- * not implement SingleThreadModel, the (only) initialized
- * instance may be returned immediately. If the Servlet class implements
- * SingleThreadModel, the Wrapper implementation must ensure
- * that this instance is not allocated again until it is deallocated by a
- * call to deallocate().
+ * its service() method called. The previously initialized
+ * instance may be returned immediately.
*
* @exception ServletException if the Servlet init() method threw
* an exception
@@ -206,9 +201,7 @@ public interface Wrapper extends Container {
/**
- * Return this previously allocated servlet to the pool of available
- * instances. If this servlet class does not implement SingleThreadModel,
- * no action is actually required.
+ * Decrement the allocation count for the servlet instance.
*
* @param servlet The servlet to be returned
*
diff --git a/java/org/apache/catalina/core/StandardWrapper.java
b/java/org/apache/catalina/core/StandardWrapper.java
index 83599ae..22aef41 100644
--- a/java/org/apache/catalina/core/StandardWrapper.java
+++ b/java/org/apache/catalina/core/StandardWrapper.java
@@ -110,8 +110,7 @@ public class StandardWrapper extends ContainerBase
protected final NotificationBroadcasterSupport broadcaster;
/**
- * The count of allocations that are currently active (even if they
- * are for the same instance, as will be true on a non-STM servlet).
+ * The count of allocations that are currently active.
*/
protected final AtomicInteger countAllocated = new AtomicInteger(0);
@@ -679,11 +678,8 @@ public class StandardWrapper extends ContainerBase
if (instance == null) {
try {
if (log.isDebugEnabled()) {
-log.debug("Allocating non-STM instance");
+log.debug("Allocating instance");
}
-
-// Note: We don't know if the Servlet implements
-// SingleThreadModel until we have loaded it.
instance = loadServlet();
newInstance = true;
// Increment here to prevent a race condition
@@ -703,7 +699,7 @@ public class StandardWrapper extends ContainerBase
}
if (l
[tomcat] branch main updated (ff7f2c4 -> d96e0fc)
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 ff7f2c4 Fix delete then create new 28aad28 Remove deprecated code from the Servlet API new ab17b97 Delete references to deprecated (and deleted) Servlet API elements new c5ffc06 Remove references to STM and other deleted parts of the Servlet API new 8dc018f Remove more STM references new d96e0fc Remove test for STM JSP The 5 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: java/jakarta/el/ImportHandler.java | 2 - java/jakarta/servlet/ServletContext.java | 65 - java/jakarta/servlet/ServletRequest.java | 9 - java/jakarta/servlet/ServletRequestWrapper.java| 12 - java/jakarta/servlet/SingleThreadModel.java| 43 java/jakarta/servlet/UnavailableException.java | 60 - java/jakarta/servlet/http/HttpServletRequest.java | 8 - .../servlet/http/HttpServletRequestWrapper.java| 12 - java/jakarta/servlet/http/HttpServletResponse.java | 36 --- .../servlet/http/HttpServletResponseWrapper.java | 36 --- java/jakarta/servlet/http/HttpSession.java | 57 - java/jakarta/servlet/http/HttpSessionContext.java | 53 java/jakarta/servlet/http/HttpUtils.java | 281 - java/org/apache/catalina/Container.java| 4 +- java/org/apache/catalina/Wrapper.java | 15 +- java/org/apache/catalina/connector/Request.java| 43 .../apache/catalina/connector/RequestFacade.java | 25 -- java/org/apache/catalina/connector/Response.java | 53 .../apache/catalina/connector/ResponseFacade.java | 36 --- .../apache/catalina/core/ApplicationContext.java | 40 --- .../catalina/core/ApplicationContextFacade.java| 70 - .../catalina/core/ApplicationHttpResponse.java | 21 -- java/org/apache/catalina/core/StandardContext.java | 24 -- java/org/apache/catalina/core/StandardWrapper.java | 260 +++ .../apache/catalina/core/StandardWrapperValve.java | 2 +- .../apache/catalina/core/mbeans-descriptors.xml| 15 -- .../catalina/filters/CsrfPreventionFilter.java | 12 - .../apache/catalina/session/StandardSession.java | 177 + .../catalina/session/StandardSessionFacade.java| 55 java/org/apache/catalina/startup/Tomcat.java | 25 +- .../apache/jasper/servlet/JspCServletContext.java | 54 .../apache/jasper/servlet/JspServletWrapper.java | 13 +- res/findbugs/filter-false-positives.xml| 6 - .../apache/catalina/core/TestStandardWrapper.java | 178 - .../catalina/filters/TestCsrfPreventionFilter.java | 10 - .../catalina/filters/TesterHttpServletRequest.java | 10 - .../filters/TesterHttpServletResponse.java | 12 - .../apache/catalina/startup/TomcatBaseTest.java| 3 +- test/org/apache/jasper/compiler/TestGenerator.java | 5 - .../tomcat/unittest/TesterServletContext.java | 23 -- test/webapp/jsp/generator/single-threaded.jsp | 17 -- webapps/docs/changelog.xml | 4 + 42 files changed, 53 insertions(+), 1833 deletions(-) delete mode 100644 java/jakarta/servlet/SingleThreadModel.java delete mode 100644 java/jakarta/servlet/http/HttpSessionContext.java delete mode 100644 java/jakarta/servlet/http/HttpUtils.java delete mode 100644 test/webapp/jsp/generator/single-threaded.jsp - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/05: Remove deprecated code from the Servlet API
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 28aad28a317d262115fcc8afdd4d85e82cab51aa
Author: Mark Thomas
AuthorDate: Wed Sep 22 11:17:58 2021 +0100
Remove deprecated code from the Servlet API
---
java/jakarta/servlet/ServletContext.java | 65 -
java/jakarta/servlet/ServletRequest.java | 9 -
java/jakarta/servlet/ServletRequestWrapper.java| 12 -
java/jakarta/servlet/SingleThreadModel.java| 43
java/jakarta/servlet/UnavailableException.java | 60 -
java/jakarta/servlet/http/HttpServletRequest.java | 8 -
.../servlet/http/HttpServletRequestWrapper.java| 12 -
java/jakarta/servlet/http/HttpServletResponse.java | 36 ---
.../servlet/http/HttpServletResponseWrapper.java | 36 ---
java/jakarta/servlet/http/HttpSession.java | 57 -
java/jakarta/servlet/http/HttpSessionContext.java | 53
java/jakarta/servlet/http/HttpUtils.java | 281 -
webapps/docs/changelog.xml | 4 +
13 files changed, 4 insertions(+), 672 deletions(-)
diff --git a/java/jakarta/servlet/ServletContext.java
b/java/jakarta/servlet/ServletContext.java
index 301a3e0..fcac8be 100644
--- a/java/jakarta/servlet/ServletContext.java
+++ b/java/jakarta/servlet/ServletContext.java
@@ -299,57 +299,6 @@ public interface ServletContext {
public RequestDispatcher getNamedDispatcher(String name);
/**
- * Do not use. This method was originally defined to retrieve a servlet
from
- * a ServletContext. In this version, this method always
- * returns null and remains only to preserve binary
- * compatibility. This method will be permanently removed in a future
- * version of the Java Servlet API.
- *
- * In lieu of this method, servlets can share information using the
- * ServletContext class and can perform shared business logic
- * by invoking methods on common non-servlet classes.
- *
- * @param name Not used
- *
- * @return Always null
- *
- * @throws ServletException never
- *
- * @deprecated As of Java Servlet API 2.1, with no direct replacement.
- */
-@Deprecated
-public Servlet getServlet(String name) throws ServletException;
-
-/**
- * Do not use. This method was originally defined to return an
- * Enumeration of all the servlets known to this servlet
- * context. In this version, this method always returns an empty
enumeration
- * and remains only to preserve binary compatibility. This method will be
- * permanently removed in a future version of the Java Servlet API.
- *
- * @return Always and empty Enumeration
- *
- * @deprecated As of Java Servlet API 2.0, with no replacement.
- */
-@Deprecated
-public Enumeration getServlets();
-
-/**
- * Do not use. This method was originally defined to return an
- * Enumeration of all the servlet names known to this context.
- * In this version, this method always returns an empty
- * Enumeration and remains only to preserve binary
- * compatibility. This method will be permanently removed in a future
- * version of the Java Servlet API.
- *
- * @return Always and empty Enumeration
- *
- * @deprecated As of Java Servlet API 2.1, with no replacement.
- */
-@Deprecated
-public Enumeration getServletNames();
-
-/**
* Writes the specified message to a servlet log file, usually an event
log.
* The name and type of the servlet log file is specific to the servlet
* container.
@@ -361,20 +310,6 @@ public interface ServletContext {
public void log(String msg);
/**
- * Do not use.
- * @param exception The exception to log
- * @param msg The message to log with the exception
- * @deprecated As of Java Servlet API 2.1, use
- * {@link #log(String message, Throwable throwable)} instead.
- *
- * This method was originally defined to write an exception's
- * stack trace and an explanatory error message to the servlet
- * log file.
- */
-@Deprecated
-public void log(Exception exception, String msg);
-
-/**
* Writes an explanatory message and a stack trace for a given
* Throwable exception to the servlet log file. The name and
* type of the servlet log file is specific to the servlet container,
diff --git a/java/jakarta/servlet/ServletRequest.java
b/java/jakarta/servlet/ServletRequest.java
index 1d0bbdd..4bb3206 100644
--- a/java/jakarta/servlet/ServletRequest.java
+++ b/java/jakarta/servlet/ServletRequest.java
@@ -404,15 +404,6 @@ public interface ServletRequest {
public RequestDispatcher getRequestDispatcher(String path);
/**
- * @param path The virtual path to be convert
[tomcat] 05/05: Remove test for STM JSP
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 d96e0fc444f3ba0a484632318184c0fcc4353664
Author: Mark Thomas
AuthorDate: Tue Sep 21 13:00:52 2021 +0100
Remove test for STM JSP
---
test/org/apache/jasper/compiler/TestGenerator.java | 5 -
test/webapp/jsp/generator/single-threaded.jsp | 17 -
2 files changed, 22 deletions(-)
diff --git a/test/org/apache/jasper/compiler/TestGenerator.java
b/test/org/apache/jasper/compiler/TestGenerator.java
index baeb808..65fb6d6 100644
--- a/test/org/apache/jasper/compiler/TestGenerator.java
+++ b/test/org/apache/jasper/compiler/TestGenerator.java
@@ -720,11 +720,6 @@ public class TestGenerator extends TomcatBaseTest {
}
@Test
-public void testSingleThreaded() throws Exception {
-doTestJsp("single-threaded.jsp");
-}
-
-@Test
public void testXpoweredBy() throws Exception {
doTestJsp("x-powered-by.jsp");
}
diff --git a/test/webapp/jsp/generator/single-threaded.jsp
b/test/webapp/jsp/generator/single-threaded.jsp
deleted file mode 100644
index 371ec50..000
--- a/test/webapp/jsp/generator/single-threaded.jsp
+++ /dev/null
@@ -1,17 +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.
---%>
-<%@ page isThreadSafe="false" %>
\ No newline at end of file
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 03/05: Remove references to STM and other deleted parts of the Servlet API
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 c5ffc0638cda8fce02e61dd19c222d0136d694da
Author: Mark Thomas
AuthorDate: Tue Sep 21 12:39:18 2021 +0100
Remove references to STM and other deleted parts of the Servlet API
---
java/jakarta/el/ImportHandler.java | 2 -
java/org/apache/catalina/core/StandardWrapper.java | 248 +++--
.../apache/catalina/core/mbeans-descriptors.xml| 6 -
java/org/apache/catalina/startup/Tomcat.java | 19 +-
4 files changed, 41 insertions(+), 234 deletions(-)
diff --git a/java/jakarta/el/ImportHandler.java
b/java/jakarta/el/ImportHandler.java
index 7e21719..138a6da 100644
--- a/java/jakarta/el/ImportHandler.java
+++ b/java/jakarta/el/ImportHandler.java
@@ -65,7 +65,6 @@ public class ImportHandler {
servletClassNames.add("ServletRequestListener");
servletClassNames.add("ServletResponse");
servletClassNames.add("SessionCookieConfig");
-servletClassNames.add("SingleThreadModel");
servletClassNames.add("WriteListener");
// Classes
servletClassNames.add("AsyncEvent");
@@ -101,7 +100,6 @@ public class ImportHandler {
servletHttpClassNames.add("HttpSessionActivationListener");
servletHttpClassNames.add("HttpSessionAttributeListener");
servletHttpClassNames.add("HttpSessionBindingListener");
-servletHttpClassNames.add("HttpSessionContext");
servletHttpClassNames.add("HttpSessionIdListener");
servletHttpClassNames.add("HttpSessionListener");
servletHttpClassNames.add("HttpUpgradeHandler");
diff --git a/java/org/apache/catalina/core/StandardWrapper.java
b/java/org/apache/catalina/core/StandardWrapper.java
index b003b3d..83599ae 100644
--- a/java/org/apache/catalina/core/StandardWrapper.java
+++ b/java/org/apache/catalina/core/StandardWrapper.java
@@ -24,7 +24,6 @@ import java.util.Enumeration;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Set;
-import java.util.Stack;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.locks.ReentrantReadWriteLock;
@@ -180,36 +179,12 @@ public class StandardWrapper extends ContainerBase
/**
- * Does this servlet implement the SingleThreadModel interface?
- */
-protected volatile boolean singleThreadModel = false;
-
-
-/**
* Are we unloading our servlet instance at the moment?
*/
protected volatile boolean unloading = false;
/**
- * Maximum number of STM instances.
- */
-protected int maxInstances = 20;
-
-
-/**
- * Number of instances currently loaded for a STM servlet.
- */
-protected int nInstances = 0;
-
-
-/**
- * Stack containing the STM instances.
- */
-protected Stack instancePool = null;
-
-
-/**
* Wait time for servlet unload in ms.
*/
protected long unloadDelay = 2000;
@@ -319,9 +294,7 @@ public class StandardWrapper extends ContainerBase
/**
- * @return the number of active allocations of this servlet, even if they
- * are all for the same instance (as will be true for servlets that do
- * not implement SingleThreadModel.
+ * @return the number of active allocations of this servlet.
*/
public int getCountAllocated() {
return this.countAllocated.get();
@@ -393,31 +366,6 @@ public class StandardWrapper extends ContainerBase
/**
- * @return maximum number of instances that will be allocated when a single
- * thread model servlet is used.
- */
-public int getMaxInstances() {
-return this.maxInstances;
-}
-
-
-/**
- * Set the maximum number of instances that will be allocated when a single
- * thread model servlet is used.
- *
- * @param maxInstances New value of maxInstances
- */
-public void setMaxInstances(int maxInstances) {
-
-int oldMaxInstances = this.maxInstances;
-this.maxInstances = maxInstances;
-support.firePropertyChange("maxInstances", oldMaxInstances,
- this.maxInstances);
-
-}
-
-
-/**
* Set the parent Container of this Wrapper, but only if it is a Context.
*
* @param container Proposed parent Container
@@ -507,26 +455,6 @@ public class StandardWrapper extends ContainerBase
/**
- * Does the servlet class represented by this component implement the
- * SingleThreadModel interface? This can only be determined
- * once the class is loaded. Calling this method will not trigger loading
- * the class since that may cause the application to behave unexpectedly.
- *
- * @return {@code null} if the class has not been loaded, otherwise {@code
- * true} if the servlet does implement {@code SingleThreadModel}
and
- * {@code false
[jira] [Commented] (MTOMCAT-327) Tomcat 9.0.50 and it has apr-1.7.0 dependency, with Address CVE-2021-35940
[ https://issues.apache.org/jira/browse/MTOMCAT-327?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17418613#comment-17418613 ] yuanhuaijiang commented on MTOMCAT-327: --- dependency file tcnative-1.dll，location：../bin/tcnative-1.dll > Tomcat 9.0.50 and it has apr-1.7.0 dependency, with Address CVE-2021-35940 > -- > > Key: MTOMCAT-327 > URL: https://issues.apache.org/jira/browse/MTOMCAT-327 > Project: Apache Tomcat Maven Plugin > Issue Type: Bug >Reporter: yuanhuaijiang >Priority: Major > > Tomcat 9.0.50 and it has apr-1.7.0 dependency, which is > vulnerable.(https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-35940) -- This message was sent by Atlassian Jira (v8.3.4#803005) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Reopened] (MTOMCAT-327) Tomcat 9.0.50 and it has apr-1.7.0 dependency, with Address CVE-2021-35940
[ https://issues.apache.org/jira/browse/MTOMCAT-327?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] yuanhuaijiang reopened MTOMCAT-327: --- dependency file tcnative-1.dll，location：../bin/tcnative-1.dll > Tomcat 9.0.50 and it has apr-1.7.0 dependency, with Address CVE-2021-35940 > -- > > Key: MTOMCAT-327 > URL: https://issues.apache.org/jira/browse/MTOMCAT-327 > Project: Apache Tomcat Maven Plugin > Issue Type: Bug >Reporter: yuanhuaijiang >Priority: Major > > Tomcat 9.0.50 and it has apr-1.7.0 dependency, which is > vulnerable.(https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-35940) -- This message was sent by Atlassian Jira (v8.3.4#803005) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Resolved] (MTOMCAT-327) Tomcat 9.0.50 and it has apr-1.7.0 dependency, with Address CVE-2021-35940
[ https://issues.apache.org/jira/browse/MTOMCAT-327?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Mark Thomas resolved MTOMCAT-327. - Resolution: Invalid Again, this is not an issue with the Apache Tomact Maven plugin. > Tomcat 9.0.50 and it has apr-1.7.0 dependency, with Address CVE-2021-35940 > -- > > Key: MTOMCAT-327 > URL: https://issues.apache.org/jira/browse/MTOMCAT-327 > Project: Apache Tomcat Maven Plugin > Issue Type: Bug >Reporter: yuanhuaijiang >Priority: Major > > Tomcat 9.0.50 and it has apr-1.7.0 dependency, which is > vulnerable.(https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-35940) -- This message was sent by Atlassian Jira (v8.3.4#803005) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated (d96e0fc -> e6304ca)
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 d96e0fc Remove test for STM JSP
new 3e3c4d9 Add currently available Jakarta EE 10 schemas
new 1fb7a2c Update license files for Jakarta EE 10 schemas
new 5674941 Add the Servlet/JSP version specific tests for Servlet 6.0 /
JSP 3.1
new 60d8274 Update web apps, pre-compilation etc to use Jakarta EE 10
schema
new e6304ca Fix test failures
The 5 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:
LICENSE| 6 +++
conf/web.xml | 4 +-
.../{jakartaee_9.xsd => jakartaee_10.xsd} | 8 ++--
.../servlet/resources/{jsp_3_0.xsd => jsp_3_1.xsd} | 12 ++---
.../resources/{web-app_5_0.xsd => web-app_6_0.xsd} | 12 ++---
.../{web-common_5_0.xsd => web-common_6_0.xsd} | 53 ++
.../{web-fragment_5_0.xsd => web-fragment_6_0.xsd} | 12 ++---
...aglibrary_3_0.xsd => web-jsptaglibrary_3_1.xsd} | 40
.../jasper/resources/LocalStrings.properties | 4 +-
.../jasper/resources/LocalStrings_cs.properties| 4 +-
.../jasper/resources/LocalStrings_de.properties| 4 +-
.../jasper/resources/LocalStrings_es.properties| 4 +-
.../jasper/resources/LocalStrings_fr.properties| 4 +-
.../jasper/resources/LocalStrings_ja.properties| 4 +-
.../jasper/resources/LocalStrings_ko.properties| 4 +-
.../jasper/resources/LocalStrings_pt_BR.properties | 4 +-
.../jasper/resources/LocalStrings_zh_CN.properties | 4 +-
.../tomcat/util/descriptor/DigesterFactory.java| 10
.../tomcat/util/descriptor/XmlIdentifiers.java | 6 +++
.../apache/tomcat/util/descriptor/web/WebXml.java | 5 +-
res/INSTALLLICENSE | 6 +++
res/META-INF/servlet-api.jar.license | 6 +++
res/maven/tomcat-servlet-api.pom | 6 +++
res/rat/rat-excludes.txt | 18
.../servlet/resources/TestSchemaValidation.java| 16 ++-
test/org/apache/jasper/TestJspC.java | 8
test/org/apache/jasper/compiler/TestJspConfig.java | 18
test/org/apache/jasper/compiler/TestValidator.java | 27 +++
.../jasper/servlet/TestJspCServletContext.java | 14 +-
.../tomcat/util/descriptor/web/TestWebXml.java | 7 ++-
test/{webapp-5.0 => webapp-6.0}/WEB-INF/tags11.tld | 0
test/{webapp-5.0 => webapp-6.0}/WEB-INF/tags12.tld | 0
test/{webapp-5.0 => webapp-6.0}/WEB-INF/tags20.tld | 0
test/{webapp-5.0 => webapp-6.0}/WEB-INF/tags21.tld | 0
test/{webapp-5.0 => webapp-6.0}/WEB-INF/tags30.tld | 0
.../tags21.tld => webapp-6.0/WEB-INF/tags31.tld} | 8 ++--
test/{webapp-5.0 => webapp-6.0}/WEB-INF/web.xml| 10 ++--
test/{webapp-5.0 => webapp-6.0}/el-as-literal.jsp | 0
test/{webapp-5.0 => webapp-6.0}/tld-versions.jsp | 2 +
test/webapp/WEB-INF/web.xml| 4 +-
webapps/ROOT/WEB-INF/web.xml | 4 +-
webapps/docs/WEB-INF/web.xml | 4 +-
webapps/docs/appdev/sample/web/WEB-INF/web.xml | 4 +-
webapps/docs/appdev/web.xml.txt| 11 ++---
webapps/docs/changelog.xml | 12 +
webapps/docs/jndi-datasource-examples-howto.xml| 11 +++--
webapps/examples/WEB-INF/web.xml | 4 +-
webapps/host-manager/WEB-INF/web.xml | 4 +-
webapps/manager/WEB-INF/web.xml| 4 +-
49 files changed, 303 insertions(+), 109 deletions(-)
copy java/jakarta/servlet/resources/{jakartaee_9.xsd => jakartaee_10.xsd} (99%)
copy java/jakarta/servlet/resources/{jsp_3_0.xsd => jsp_3_1.xsd} (97%)
copy java/jakarta/servlet/resources/{web-app_5_0.xsd => web-app_6_0.xsd} (97%)
copy java/jakarta/servlet/resources/{web-common_5_0.xsd => web-common_6_0.xsd}
(96%)
copy java/jakarta/servlet/resources/{web-fragment_5_0.xsd =>
web-fragment_6_0.xsd} (97%)
copy java/jakarta/servlet/resources/{web-jsptaglibrary_3_0.xsd =>
web-jsptaglibrary_3_1.xsd} (96%)
copy test/{webapp-5.0 => webapp-6.0}/WEB-INF/tags11.tld (100%)
copy test/{webapp-5.0 => webapp-6.0}/WEB-INF/tags12.tld (100%)
copy test/{webapp-5.0 => webapp-6.0}/WEB-INF/tags20.tld (100%)
copy test/{webapp-5.0 => webapp-6.0}/WEB-INF/tags21.tld (100%)
copy test/{webapp-5.0 => webapp-6.0}/WEB-INF/tags30.tld (100%)
copy test/{webapp-2.3/WEB-INF/tags21.tld => webapp-6.0/WEB-INF/tags31.tld}
(88%)
copy test/{webapp-5.0 => webapp-6.0}/WEB-INF/web.xml (87%)
copy test/{webapp-5.0 => webapp-6.0}/el-as-literal.jsp (100%)
copy test/{webapp-5.0 => webapp-6.0}/tld-versions.jsp (92%)
---
[tomcat] 04/05: Update web apps, pre-compilation etc to use Jakarta EE 10 schema
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 60d8274a3fba7853150385eefb29a3422fe7561f Author: Mark Thomas AuthorDate: Wed Sep 22 19:18:18 2021 +0100 Update web apps, pre-compilation etc to use Jakarta EE 10 schema --- conf/web.xml | 4 ++-- java/org/apache/jasper/resources/LocalStrings.properties | 4 ++-- java/org/apache/jasper/resources/LocalStrings_cs.properties | 4 ++-- java/org/apache/jasper/resources/LocalStrings_de.properties | 4 ++-- java/org/apache/jasper/resources/LocalStrings_es.properties | 4 ++-- java/org/apache/jasper/resources/LocalStrings_fr.properties | 4 ++-- java/org/apache/jasper/resources/LocalStrings_ja.properties | 4 ++-- java/org/apache/jasper/resources/LocalStrings_ko.properties | 4 ++-- .../apache/jasper/resources/LocalStrings_pt_BR.properties| 4 ++-- .../apache/jasper/resources/LocalStrings_zh_CN.properties| 4 ++-- java/org/apache/tomcat/util/descriptor/web/WebXml.java | 3 +++ test/webapp/WEB-INF/web.xml | 4 ++-- webapps/ROOT/WEB-INF/web.xml | 4 ++-- webapps/docs/WEB-INF/web.xml | 4 ++-- webapps/docs/appdev/sample/web/WEB-INF/web.xml | 4 ++-- webapps/docs/appdev/web.xml.txt | 11 +-- webapps/docs/changelog.xml | 12 webapps/docs/jndi-datasource-examples-howto.xml | 11 ++- webapps/examples/WEB-INF/web.xml | 4 ++-- webapps/host-manager/WEB-INF/web.xml | 4 ++-- webapps/manager/WEB-INF/web.xml | 4 ++-- 21 files changed, 60 insertions(+), 45 deletions(-) diff --git a/conf/web.xml b/conf/web.xml index a685947..cbdd6fe 100644 --- a/conf/web.xml +++ b/conf/web.xml @@ -18,8 +18,8 @@ https://jakarta.ee/xml/ns/jakartaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee - https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd"; - version="5.0"> + https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"; + version="6.0"> diff --git a/java/org/apache/jasper/resources/LocalStrings.properties b/java/org/apache/jasper/resources/LocalStrings.properties index 867c69f..898e173 100644 --- a/java/org/apache/jasper/resources/LocalStrings.properties +++ b/java/org/apache/jasper/resources/LocalStrings.properties @@ -395,8 +395,8 @@ jspc.webxml.header=\n\ https://jakarta.ee/xml/ns/jakartaee"\n\ \ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\ \ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee\n\ -\ https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd"\n\ -\ version="5.0"\n\ +\ https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"\n\ +\ version="6.0"\n\ \ metadata-complete="false">\n\ - -http://java.sun.com/dtd/web-app_2_3.dtd";> - - +https://jakarta.ee/xml/ns/jakartaee"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee + https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"; + version="6.0"> diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index e596cf1..5aba0a1 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -119,6 +119,10 @@ Remove all deprecated code from the Servlet API to align Tomcat with recent changes in the Jakarta Servlet specification project. (markt) + +Add the current available Jakarta EE 10 schemas from the Jakarta EE +schema project. (markt) + @@ -177,6 +181,14 @@ + + + +Update the web applications that are included with Apache Tomcat to use +the Jakarta EE 10 schema for web.xml. (markt) + + + diff --git a/webapps/docs/jndi-datasource-examples-howto.xml b/webapps/docs/jndi-datasource-examples-howto.xml index 60ea32f..d1b6eff 100644 --- a/webapps/docs/jndi-datasource-examples-howto.xml +++ b/webapps/docs/jndi-datasource-examples-howto.xml @@ -294,11 +294,12 @@ resource to your Context. 3. web.xml configuration Now create a WEB-INF/web.xml for this test application. -
[tomcat] 02/05: Update license files for Jakarta EE 10 schemas
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 1fb7a2c1549bc492357c9477f7dfddc981893b1b Author: Mark Thomas AuthorDate: Wed Sep 22 16:06:07 2021 +0100 Update license files for Jakarta EE 10 schemas --- LICENSE | 6 ++ res/INSTALLLICENSE | 6 ++ res/META-INF/servlet-api.jar.license | 6 ++ res/maven/tomcat-servlet-api.pom | 6 ++ res/rat/rat-excludes.txt | 18 ++ 5 files changed, 42 insertions(+) diff --git a/LICENSE b/LICENSE index a3cd18e..4c3277f 100644 --- a/LICENSE +++ b/LICENSE @@ -213,13 +213,19 @@ conditions of the following licenses. For the Eclipse JDT Core Batch Compiler (ecj-x.x.x.jar) component and the following Jakarta EE Schemas: - jakartaee_9.xsd +- jakartaee_10.xsd - jakarta_web-services_2_0.xsd - jakarta_web-services_client_2_0.xsd - jsp_3_0.xsd +- jsp_3_1.xsd - web-app_5_0.xsd +- web-app_6_0.xsd - web-commonn_5_0.xsd +- web-commonn_6_0.xsd - web-fragment_5_0.xsd +- web-fragment_6_0.xsd - web-jsptaglibrary_3_0.xsd +- web-jsptaglibrary_3_1.xsd Eclipse Public License - v 2.0 diff --git a/res/INSTALLLICENSE b/res/INSTALLLICENSE index a3cd18e..4c3277f 100644 --- a/res/INSTALLLICENSE +++ b/res/INSTALLLICENSE @@ -213,13 +213,19 @@ conditions of the following licenses. For the Eclipse JDT Core Batch Compiler (ecj-x.x.x.jar) component and the following Jakarta EE Schemas: - jakartaee_9.xsd +- jakartaee_10.xsd - jakarta_web-services_2_0.xsd - jakarta_web-services_client_2_0.xsd - jsp_3_0.xsd +- jsp_3_1.xsd - web-app_5_0.xsd +- web-app_6_0.xsd - web-commonn_5_0.xsd +- web-commonn_6_0.xsd - web-fragment_5_0.xsd +- web-fragment_6_0.xsd - web-jsptaglibrary_3_0.xsd +- web-jsptaglibrary_3_1.xsd Eclipse Public License - v 2.0 diff --git a/res/META-INF/servlet-api.jar.license b/res/META-INF/servlet-api.jar.license index 66f8ecb..2b4876a 100644 --- a/res/META-INF/servlet-api.jar.license +++ b/res/META-INF/servlet-api.jar.license @@ -565,13 +565,19 @@ COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 For the following Jakarta EE Schemas: - jakartaee_9.xsd +- jakartaee_10.xsd - jakarta_web-services_2_0.xsd - jakarta_web-services_client_2_0.xsd - jsp_3_0.xsd +- jsp_3_1.xsd - web-app_5_0.xsd +- web-app_6_0.xsd - web-commonn_5_0.xsd +- web-commonn_6_0.xsd - web-fragment_5_0.xsd +- web-fragment_6_0.xsd - web-jsptaglibrary_3_0.xsd +- web-jsptaglibrary_3_1.xsd Eclipse Public License - v 2.0 diff --git a/res/maven/tomcat-servlet-api.pom b/res/maven/tomcat-servlet-api.pom index 6ec093c..67d11b2 100644 --- a/res/maven/tomcat-servlet-api.pom +++ b/res/maven/tomcat-servlet-api.pom @@ -63,13 +63,19 @@ web-fragment_4_0.xsd, to which the CDDL version 1.0 applies and jakartaee_9.xsd +jakartaee_10.xsd jakarta_web-services_2_0.xsd jakarta_web-services_client_2_0.xsd jsp_3_0.xsd +jsp_3_1.xsd web-app_5_0.xsd +web-app_6_0.xsd web-commonn_5_0.xsd +web-commonn_6_0.xsd web-fragment_5_0.xsd +web-fragment_6_0.xsd web-jsptaglibrary_3_0.xsd +web-jsptaglibrary_3_1.xsd to which the EPLv2 applies. diff --git a/res/rat/rat-excludes.txt b/res/rat/rat-excludes.txt index 8d23f0f..470b5af 100644 --- a/res/rat/rat-excludes.txt +++ b/res/rat/rat-excludes.txt @@ -115,6 +115,7 @@ java/jakarta/servlet/resources/javaee_6.xsd java/jakarta/servlet/resources/javaee_7.xsd java/jakarta/servlet/resources/javaee_8.xsd java/jakarta/servlet/resources/jakartaee_9.xsd +java/jakarta/servlet/resources/jakartaee_10.xsd java/jakarta/servlet/resources/javaee_web_services_1_2.xsd java/jakarta/servlet/resources/javaee_web_services_1_3.xsd java/jakarta/servlet/resources/javaee_web_services_1_4.xsd @@ -126,24 +127,30 @@ java/jakarta/servlet/resources/jakartaee_web_services_client_2_0.xsd java/jakarta/servlet/resources/jsp_2_2.xsd java/jakarta/servlet/resources/jsp_2_3.xsd java/jakarta/servlet/resources/jsp_3_0.xsd +java/jakarta/servlet/resources/jsp_3_1.xsd java/jakarta/servlet/resources/web-app_3_0.xsd java/jakarta/servlet/resources/web-app_3_1.xsd java/jakarta/servlet/resources/web-app_4_0.xsd java/jakarta/servlet/resources/web-app_5_0.xsd +java/jakarta/servlet/resources/web-app_6_0.xsd java/jakarta/servlet/resources/web-common_3_0.xsd java/jakarta/servlet/resources/web-common_3_1.xsd java/jakarta/servlet/resources/web-common_4_0.xsd java/jakarta/servlet/resources/web-common_5_0.xsd +java/jakarta/servlet/resources/web-common_6_0.xsd java/jakarta/servlet/resources/web-fragment_3_0.xsd java/jakarta/servlet/resources/web-fragment_3_1.xsd java/jakarta/servlet/resources/web-fragment_4_0.xsd java/jakarta/servlet/resources/web-fragment_5_0.xsd +java/jakarta/servlet/resources/web-fragment_6_0.xsd java/ja
[tomcat] 05/05: Fix test failures
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 e6304ca9f0e08730efb630b498d975545d7ab754
Author: Mark Thomas
AuthorDate: Wed Sep 22 19:53:35 2021 +0100
Fix test failures
---
test/jakarta/servlet/resources/TestSchemaValidation.java | 2 +-
test/org/apache/jasper/servlet/TestJspCServletContext.java | 4 ++--
test/org/apache/tomcat/util/descriptor/web/TestWebXml.java | 7 ++-
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/test/jakarta/servlet/resources/TestSchemaValidation.java
b/test/jakarta/servlet/resources/TestSchemaValidation.java
index 223e5be..dd070fb 100644
--- a/test/jakarta/servlet/resources/TestSchemaValidation.java
+++ b/test/jakarta/servlet/resources/TestSchemaValidation.java
@@ -39,7 +39,7 @@ public class TestSchemaValidation {
digester.push(new WebXml());
WebXml desc = (WebXml) digester.parse(
new File("test/webapp/WEB-INF/web.xml"));
-Assert.assertEquals("5.0", desc.getVersion());
+Assert.assertEquals("6.0", desc.getVersion());
Assert.assertEquals(0, handler.getErrors().size());
Assert.assertEquals(0, handler.getWarnings().size());
}
diff --git a/test/org/apache/jasper/servlet/TestJspCServletContext.java
b/test/org/apache/jasper/servlet/TestJspCServletContext.java
index 57cd4e9..f8d0adb 100644
--- a/test/org/apache/jasper/servlet/TestJspCServletContext.java
+++ b/test/org/apache/jasper/servlet/TestJspCServletContext.java
@@ -34,7 +34,7 @@ public class TestJspCServletContext {
File appDir = new File("test/webapp");
JspCServletContext context = new JspCServletContext(
null, appDir.toURI().toURL(), null, false, false);
-Assert.assertEquals(5, context.getEffectiveMajorVersion());
+Assert.assertEquals(6, context.getEffectiveMajorVersion());
Assert.assertEquals(0, context.getEffectiveMinorVersion());
JspConfigDescriptor jspConfigDescriptor =
context.getJspConfigDescriptor();
@@ -148,7 +148,7 @@ public class TestJspCServletContext {
File appDir = new File("test/webresources/dir1");
JspCServletContext context = new JspCServletContext(
null, appDir.toURI().toURL(), null, false, false);
-Assert.assertEquals(5, context.getEffectiveMajorVersion());
+Assert.assertEquals(6, context.getEffectiveMajorVersion());
Assert.assertEquals(0, context.getEffectiveMinorVersion());
}
diff --git a/test/org/apache/tomcat/util/descriptor/web/TestWebXml.java
b/test/org/apache/tomcat/util/descriptor/web/TestWebXml.java
index 898cec6..a2c79e2 100644
--- a/test/org/apache/tomcat/util/descriptor/web/TestWebXml.java
+++ b/test/org/apache/tomcat/util/descriptor/web/TestWebXml.java
@@ -46,7 +46,7 @@ public class TestWebXml {
WebXml webxml = new WebXml();
// Defaults
-Assert.assertEquals(5, webxml.getMajorVersion());
+Assert.assertEquals(6, webxml.getMajorVersion());
Assert.assertEquals(0, webxml.getMinorVersion());
// Both get changed
@@ -182,6 +182,11 @@ public class TestWebXml {
doTestValidateVersion("5.0");
}
+@Test
+public void testValidateVersion60() throws IOException, SAXException {
+doTestValidateVersion("6.0");
+}
+
private void doTestValidateVersion(String version) throws IOException,
SAXException {
WebXml webxml = new WebXml();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 03/05: Add the Servlet/JSP version specific tests for Servlet 6.0 / JSP 3.1
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 5674941dddf60f028fc77f2dea0424bcb0d5c59c
Author: Mark Thomas
AuthorDate: Wed Sep 22 16:06:51 2021 +0100
Add the Servlet/JSP version specific tests for Servlet 6.0 / JSP 3.1
---
.../tomcat/util/descriptor/DigesterFactory.java| 10 ++
.../tomcat/util/descriptor/XmlIdentifiers.java | 6
.../apache/tomcat/util/descriptor/web/WebXml.java | 2 +-
.../servlet/resources/TestSchemaValidation.java| 14
test/org/apache/jasper/TestJspC.java | 8 +
test/org/apache/jasper/compiler/TestJspConfig.java | 18 +++
test/org/apache/jasper/compiler/TestValidator.java | 27
.../jasper/servlet/TestJspCServletContext.java | 10 ++
test/webapp-6.0/WEB-INF/tags11.tld | 37 ++
test/webapp-6.0/WEB-INF/tags12.tld | 37 ++
test/webapp-6.0/WEB-INF/tags20.tld | 37 ++
test/webapp-6.0/WEB-INF/tags21.tld | 37 ++
test/webapp-6.0/WEB-INF/tags30.tld | 37 ++
test/webapp-6.0/WEB-INF/tags31.tld | 37 ++
test/webapp-6.0/WEB-INF/web.xml| 36 +
test/webapp-6.0/el-as-literal.jsp | 21
test/webapp-6.0/tld-versions.jsp | 33 +++
17 files changed, 406 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/descriptor/DigesterFactory.java
b/java/org/apache/tomcat/util/descriptor/DigesterFactory.java
index 046e768..823b4fe 100644
--- a/java/org/apache/tomcat/util/descriptor/DigesterFactory.java
+++ b/java/org/apache/tomcat/util/descriptor/DigesterFactory.java
@@ -135,6 +135,16 @@ public class DigesterFactory {
addSelf(systemIds, "jakartaee_web_services_2_0.xsd");
addSelf(systemIds, "jakartaee_web_services_client_2_0.xsd");
+// from JakartaEE 10
+add(systemIds, XmlIdentifiers.WEB_60_XSD,
locationFor("web-app_6_0.xsd"));
+add(systemIds, XmlIdentifiers.WEB_FRAGMENT_60_XSD,
locationFor("web-fragment_6_0.xsd"));
+add(systemIds, XmlIdentifiers.TLD_31_XSD,
locationFor("web-jsptaglibrary_3_1.xsd"));
+addSelf(systemIds, "web-common_6_0.xsd");
+addSelf(systemIds, "jakartaee_10.xsd");
+addSelf(systemIds, "jsp_3_1.xsd");
+addSelf(systemIds, "jakartaee_web_services_2_0.xsd");
+addSelf(systemIds, "jakartaee_web_services_client_2_0.xsd");
+
SERVLET_API_PUBLIC_IDS = Collections.unmodifiableMap(publicIds);
SERVLET_API_SYSTEM_IDS = Collections.unmodifiableMap(systemIds);
}
diff --git a/java/org/apache/tomcat/util/descriptor/XmlIdentifiers.java
b/java/org/apache/tomcat/util/descriptor/XmlIdentifiers.java
index 60327c9..1f492a7 100644
--- a/java/org/apache/tomcat/util/descriptor/XmlIdentifiers.java
+++ b/java/org/apache/tomcat/util/descriptor/XmlIdentifiers.java
@@ -85,6 +85,12 @@ public final class XmlIdentifiers {
public static final String TLD_30_XSD = JAKARTAEE_9_NS +
"/web-jsptaglibrary_3_0.xsd";
public static final String WEBSERVICES_20_XSD = JAKARTAEE_9_NS +
"/jakartaee_web_services_2_0.xsd";
+// from Jakarta EE 10
+public static final String JAKARTAEE_10_NS = JAKARTAEE_9_NS;
+public static final String WEB_60_XSD = JAKARTAEE_10_NS +
"/web-app_6_0.xsd";
+public static final String WEB_FRAGMENT_60_XSD = JAKARTAEE_10_NS +
"/web-fragment_6_0.xsd";
+public static final String TLD_31_XSD = JAKARTAEE_10_NS +
"/web-jsptaglibrary_3_1.xsd";
+
private XmlIdentifiers() {
}
}
\ No newline at end of file
diff --git a/java/org/apache/tomcat/util/descriptor/web/WebXml.java
b/java/org/apache/tomcat/util/descriptor/web/WebXml.java
index 62b5ed7..8384413 100644
--- a/java/org/apache/tomcat/util/descriptor/web/WebXml.java
+++ b/java/org/apache/tomcat/util/descriptor/web/WebXml.java
@@ -237,7 +237,7 @@ public class WebXml extends XmlEncodingBase implements
DocumentProperties.Charse
}
// Derived major and minor version attributes
-private int majorVersion = 5;
+private int majorVersion = 6;
private int minorVersion = 0;
public int getMajorVersion() { return majorVersion; }
public int getMinorVersion() { return minorVersion; }
diff --git a/test/jakarta/servlet/resources/TestSchemaValidation.java
b/test/jakarta/servlet/resources/TestSchemaValidation.java
index d47d2b2..223e5be 100644
--- a/test/jakarta/servlet/resources/TestSchemaValidation.java
+++ b/test/jakarta/servlet/resources/TestSchemaValidation.java
@@ -158,4 +158,18 @@ public class TestSchemaValidation {
Assert.assertEquals(0, handler.getWarnings().size());
}
+
+@Test
+public void testWebapp_6_0() throws Exception
