From 581bb0889133e184654420d292d42f9c4f394345 Mon Sep 17 00:00:00 2001 From: Michael Bien Date: Tue, 14 Jul 2026 03:23:30 +0200 Subject: [PATCH] Update embedded tomcat from 9.0.113 to 9.0.120 --- ide/httpserver/external/binaries-list | 4 ++-- ...license.txt => tomcat-annotations-api-9.0.120-license.txt} | 2 +- ...3-notice.txt => tomcat-annotations-api-9.0.120-notice.txt} | 0 ....113-license.txt => tomcat-embed-core-9.0.120-license.txt} | 2 +- ....0.113-notice.txt => tomcat-embed-core-9.0.120-notice.txt} | 0 ide/httpserver/nbproject/project.properties | 4 ++-- ide/httpserver/nbproject/project.xml | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) rename ide/httpserver/external/{tomcat-annotations-api-9.0.113-license.txt => tomcat-annotations-api-9.0.120-license.txt} (99%) rename ide/httpserver/external/{tomcat-annotations-api-9.0.113-notice.txt => tomcat-annotations-api-9.0.120-notice.txt} (100%) rename ide/httpserver/external/{tomcat-embed-core-9.0.113-license.txt => tomcat-embed-core-9.0.120-license.txt} (99%) rename ide/httpserver/external/{tomcat-embed-core-9.0.113-notice.txt => tomcat-embed-core-9.0.120-notice.txt} (100%) diff --git a/ide/httpserver/external/binaries-list b/ide/httpserver/external/binaries-list index 9d01de696f19..00469b1855e4 100644 --- a/ide/httpserver/external/binaries-list +++ b/ide/httpserver/external/binaries-list @@ -15,5 +15,5 @@ # specific language governing permissions and limitations # under the License. -6C156B32284C8371ADB228AE21688387627E558B org.apache.tomcat:tomcat-annotations-api:9.0.113 -B364692BCA96817268B38F183FAFD14DBD00950E org.apache.tomcat.embed:tomcat-embed-core:9.0.113 +6E0C2F4053E116D67FCE53B73EEC0891547564EB org.apache.tomcat:tomcat-annotations-api:9.0.120 +5CD45B75D11191DA4AF66A1AE05667822A4C6647 org.apache.tomcat.embed:tomcat-embed-core:9.0.120 diff --git a/ide/httpserver/external/tomcat-annotations-api-9.0.113-license.txt b/ide/httpserver/external/tomcat-annotations-api-9.0.120-license.txt similarity index 99% rename from ide/httpserver/external/tomcat-annotations-api-9.0.113-license.txt rename to ide/httpserver/external/tomcat-annotations-api-9.0.120-license.txt index d307e1f44b07..559d6c79142a 100644 --- a/ide/httpserver/external/tomcat-annotations-api-9.0.113-license.txt +++ b/ide/httpserver/external/tomcat-annotations-api-9.0.120-license.txt @@ -1,5 +1,5 @@ Name: Apache Tomcat (Annotations Package) -Version: 9.0.113 +Version: 9.0.120 License: Apache-2.0 Description: Annotations used in Apache Tomcat Origin: http://tomcat.apache.org diff --git a/ide/httpserver/external/tomcat-annotations-api-9.0.113-notice.txt b/ide/httpserver/external/tomcat-annotations-api-9.0.120-notice.txt similarity index 100% rename from ide/httpserver/external/tomcat-annotations-api-9.0.113-notice.txt rename to ide/httpserver/external/tomcat-annotations-api-9.0.120-notice.txt diff --git a/ide/httpserver/external/tomcat-embed-core-9.0.113-license.txt b/ide/httpserver/external/tomcat-embed-core-9.0.120-license.txt similarity index 99% rename from ide/httpserver/external/tomcat-embed-core-9.0.113-license.txt rename to ide/httpserver/external/tomcat-embed-core-9.0.120-license.txt index 815ec88f7f11..9c2d92eab34b 100644 --- a/ide/httpserver/external/tomcat-embed-core-9.0.113-license.txt +++ b/ide/httpserver/external/tomcat-embed-core-9.0.120-license.txt @@ -1,5 +1,5 @@ Name: Apache Tomcat (embedded) -Version: 9.0.113 +Version: 9.0.120 License: Apache-2.0-tomcat Description: Apache Tomcat (embedded) is a library version of the Apache Tomcat servlet container, which can be used to create embedded servlet containers in other applications. Origin: http://tomcat.apache.org diff --git a/ide/httpserver/external/tomcat-embed-core-9.0.113-notice.txt b/ide/httpserver/external/tomcat-embed-core-9.0.120-notice.txt similarity index 100% rename from ide/httpserver/external/tomcat-embed-core-9.0.113-notice.txt rename to ide/httpserver/external/tomcat-embed-core-9.0.120-notice.txt diff --git a/ide/httpserver/nbproject/project.properties b/ide/httpserver/nbproject/project.properties index 02d82a6d9897..6a1b4ffdc3b5 100644 --- a/ide/httpserver/nbproject/project.properties +++ b/ide/httpserver/nbproject/project.properties @@ -18,8 +18,8 @@ javac.compilerargs=-Xlint javac.release=17 spec.version.base=2.69.0 -release.external/tomcat-embed-core-9.0.113.jar=modules/ext/webserver.jar -release.external/tomcat-annotations-api-9.0.113.jar=modules/ext/webserver-annotations.jar +release.external/tomcat-embed-core-9.0.120.jar=modules/ext/webserver.jar +release.external/tomcat-annotations-api-9.0.120.jar=modules/ext/webserver-annotations.jar test-unit-sys-prop.xtest.data=${nb_all}/ide/httpserver/test/unit/testfs test.unit.data.dir=${nb_all}/ide/httpserver/test/unit/testfs diff --git a/ide/httpserver/nbproject/project.xml b/ide/httpserver/nbproject/project.xml index cba5abb17f4b..57ca0fcc6d5b 100644 --- a/ide/httpserver/nbproject/project.xml +++ b/ide/httpserver/nbproject/project.xml @@ -162,11 +162,11 @@ ext/webserver.jar - external/tomcat-embed-core-9.0.113.jar + external/tomcat-embed-core-9.0.120.jar ext/webserver-annotations.jar - external/tomcat-annotations-api-9.0.113.jar + external/tomcat-annotations-api-9.0.120.jar