From c7918ffefaf9e6b3a9604673015e88b082a3849b Mon Sep 17 00:00:00 2001 From: Michael Bien Date: Sat, 3 Jan 2026 02:58:50 +0100 Subject: [PATCH] Update embedded tomcat from 9.0.102 to 9.0.113 --- ide/httpserver/external/binaries-list | 4 ++-- ...license.txt => tomcat-annotations-api-9.0.113-license.txt} | 2 +- ...2-notice.txt => tomcat-annotations-api-9.0.113-notice.txt} | 0 ....102-license.txt => tomcat-embed-core-9.0.113-license.txt} | 2 +- ....0.102-notice.txt => tomcat-embed-core-9.0.113-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.102-license.txt => tomcat-annotations-api-9.0.113-license.txt} (99%) rename ide/httpserver/external/{tomcat-annotations-api-9.0.102-notice.txt => tomcat-annotations-api-9.0.113-notice.txt} (100%) rename ide/httpserver/external/{tomcat-embed-core-9.0.102-license.txt => tomcat-embed-core-9.0.113-license.txt} (99%) rename ide/httpserver/external/{tomcat-embed-core-9.0.102-notice.txt => tomcat-embed-core-9.0.113-notice.txt} (100%) diff --git a/ide/httpserver/external/binaries-list b/ide/httpserver/external/binaries-list index e927ab13ea10..9d01de696f19 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. -3AA6C33C386D649763838B2F0F7EF20E3E27E80B org.apache.tomcat:tomcat-annotations-api:9.0.102 -371C7ADD45D1A5B97DAA457BBF3804FF82923092 org.apache.tomcat.embed:tomcat-embed-core:9.0.102 +6C156B32284C8371ADB228AE21688387627E558B org.apache.tomcat:tomcat-annotations-api:9.0.113 +B364692BCA96817268B38F183FAFD14DBD00950E org.apache.tomcat.embed:tomcat-embed-core:9.0.113 diff --git a/ide/httpserver/external/tomcat-annotations-api-9.0.102-license.txt b/ide/httpserver/external/tomcat-annotations-api-9.0.113-license.txt similarity index 99% rename from ide/httpserver/external/tomcat-annotations-api-9.0.102-license.txt rename to ide/httpserver/external/tomcat-annotations-api-9.0.113-license.txt index d0161d4120a4..d307e1f44b07 100644 --- a/ide/httpserver/external/tomcat-annotations-api-9.0.102-license.txt +++ b/ide/httpserver/external/tomcat-annotations-api-9.0.113-license.txt @@ -1,5 +1,5 @@ Name: Apache Tomcat (Annotations Package) -Version: 9.0.102 +Version: 9.0.113 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.102-notice.txt b/ide/httpserver/external/tomcat-annotations-api-9.0.113-notice.txt similarity index 100% rename from ide/httpserver/external/tomcat-annotations-api-9.0.102-notice.txt rename to ide/httpserver/external/tomcat-annotations-api-9.0.113-notice.txt diff --git a/ide/httpserver/external/tomcat-embed-core-9.0.102-license.txt b/ide/httpserver/external/tomcat-embed-core-9.0.113-license.txt similarity index 99% rename from ide/httpserver/external/tomcat-embed-core-9.0.102-license.txt rename to ide/httpserver/external/tomcat-embed-core-9.0.113-license.txt index 526263fc38c8..815ec88f7f11 100644 --- a/ide/httpserver/external/tomcat-embed-core-9.0.102-license.txt +++ b/ide/httpserver/external/tomcat-embed-core-9.0.113-license.txt @@ -1,5 +1,5 @@ Name: Apache Tomcat (embedded) -Version: 9.0.102 +Version: 9.0.113 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.102-notice.txt b/ide/httpserver/external/tomcat-embed-core-9.0.113-notice.txt similarity index 100% rename from ide/httpserver/external/tomcat-embed-core-9.0.102-notice.txt rename to ide/httpserver/external/tomcat-embed-core-9.0.113-notice.txt diff --git a/ide/httpserver/nbproject/project.properties b/ide/httpserver/nbproject/project.properties index f37aada6a7a1..e47f18018cc1 100644 --- a/ide/httpserver/nbproject/project.properties +++ b/ide/httpserver/nbproject/project.properties @@ -18,8 +18,8 @@ javac.compilerargs=-Xlint:unchecked javac.source=1.8 spec.version.base=2.67.0 -release.external/tomcat-embed-core-9.0.102.jar=modules/ext/webserver.jar -release.external/tomcat-annotations-api-9.0.102.jar=modules/ext/webserver-annotations.jar +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 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 adc72eeb2536..cba5abb17f4b 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.102.jar + external/tomcat-embed-core-9.0.113.jar ext/webserver-annotations.jar - external/tomcat-annotations-api-9.0.102.jar + external/tomcat-annotations-api-9.0.113.jar