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 <ma...@apache.org>
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.
</comments>
</license>
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/jakarta/servlet/resources/web-jsptaglibrary_3_0.xsd
+java/jakarta/servlet/resources/web-jsptaglibrary_3_1.xsd
output/classes/jakarta/servlet/resources/javaee_5.xsd
output/classes/jakarta/servlet/resources/javaee_6.xsd
output/classes/jakarta/servlet/resources/javaee_7.xsd
output/classes/jakarta/servlet/resources/javaee_8.xsd
output/classes/jakarta/servlet/resources/jakartaee_9.xsd
+output/classes/jakarta/servlet/resources/jakartaee_10.xsd
output/classes/jakarta/servlet/resources/javaee_web_services_1_2.xsd
output/classes/jakarta/servlet/resources/javaee_web_services_1_3.xsd
output/classes/jakarta/servlet/resources/javaee_web_services_1_4.xsd
@@ -156,24 +163,30 @@
output/classes/jakarta/servlet/resources/jakartaee_web_services_client_2_0.xsd
output/classes/jakarta/servlet/resources/jsp_2_2.xsd
output/classes/jakarta/servlet/resources/jsp_2_3.xsd
output/classes/jakarta/servlet/resources/jsp_3_0.xsd
+output/classes/jakarta/servlet/resources/jsp_3_1.xsd
output/classes/jakarta/servlet/resources/web-app_3_0.xsd
output/classes/jakarta/servlet/resources/web-app_3_1.xsd
output/classes/jakarta/servlet/resources/web-app_4_0.xsd
output/classes/jakarta/servlet/resources/web-app_5_0.xsd
+output/classes/jakarta/servlet/resources/web-app_6_0.xsd
output/classes/jakarta/servlet/resources/web-common_3_0.xsd
output/classes/jakarta/servlet/resources/web-common_3_1.xsd
output/classes/jakarta/servlet/resources/web-common_4_0.xsd
output/classes/jakarta/servlet/resources/web-common_5_0.xsd
+output/classes/jakarta/servlet/resources/web-common_6_0.xsd
output/classes/jakarta/servlet/resources/web-fragment_3_0.xsd
output/classes/jakarta/servlet/resources/web-fragment_3_1.xsd
output/classes/jakarta/servlet/resources/web-fragment_4_0.xsd
output/classes/jakarta/servlet/resources/web-fragment_5_0.xsd
+output/classes/jakarta/servlet/resources/web-fragment_6_0.xsd
output/classes/jakarta/servlet/resources/web-jsptaglibrary_3_0.xsd
+output/classes/jakarta/servlet/resources/web-jsptaglibrary_3_1.xsd
output/dist/src/java/jakarta/servlet/resources/javaee_5.xsd
output/dist/src/java/jakarta/servlet/resources/javaee_6.xsd
output/dist/src/java/jakarta/servlet/resources/javaee_7.xsd
output/dist/src/java/jakarta/servlet/resources/javaee_8.xsd
output/dist/src/java/jakarta/servlet/resources/jakartaee_9.xsd
+output/dist/src/java/jakarta/servlet/resources/jakartaee_10.xsd
output/dist/src/java/jakarta/servlet/resources/javaee_web_services_1_2.xsd
output/dist/src/java/jakarta/servlet/resources/javaee_web_services_1_3.xsd
output/dist/src/java/jakarta/servlet/resources/javaee_web_services_1_4.xsd
@@ -185,19 +198,24 @@
output/dist/src/java/jakarta/servlet/resources/jakartaee_web_services_client_2_0
output/dist/src/java/jakarta/servlet/resources/jsp_2_2.xsd
output/dist/src/java/jakarta/servlet/resources/jsp_2_3.xsd
output/dist/src/java/jakarta/servlet/resources/jsp_3_0.xsd
+output/dist/src/java/jakarta/servlet/resources/jsp_3_1.xsd
output/dist/src/java/jakarta/servlet/resources/web-app_3_0.xsd
output/dist/src/java/jakarta/servlet/resources/web-app_3_1.xsd
output/dist/src/java/jakarta/servlet/resources/web-app_4_0.xsd
output/dist/src/java/jakarta/servlet/resources/web-app_5_0.xsd
+output/dist/src/java/jakarta/servlet/resources/web-app_6_0.xsd
output/dist/src/java/jakarta/servlet/resources/web-common_3_0.xsd
output/dist/src/java/jakarta/servlet/resources/web-common_3_1.xsd
output/dist/src/java/jakarta/servlet/resources/web-common_4_0.xsd
output/dist/src/java/jakarta/servlet/resources/web-common_5_0.xsd
+output/dist/src/java/jakarta/servlet/resources/web-common_6_0.xsd
output/dist/src/java/jakarta/servlet/resources/web-fragment_3_0.xsd
output/dist/src/java/jakarta/servlet/resources/web-fragment_3_1.xsd
output/dist/src/java/jakarta/servlet/resources/web-fragment_4_0.xsd
output/dist/src/java/jakarta/servlet/resources/web-fragment_5_0.xsd
+output/dist/src/java/jakarta/servlet/resources/web-fragment_6_0.xsd
output/dist/src/java/jakarta/servlet/resources/web-jsptaglibrary_3_0.xsd
+output/dist/src/java/jakarta/servlet/resources/web-jsptaglibrary_3_1.xsd
output/dist/src/res/checkstyle/header-al2.txt
res/checkstyle/header-al2.txt
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
