Merge pull request apache#7919 from mbien/embedded-tomcat9096

Update embedded tomcat from 9.0.71 to 9.0.96
thurka · Nov 4, 2024 · 022ded6 · 022ded6
2 parents ba8326b + a9787f2
commit 022ded6
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git 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.
 
-898AD20682CB807F734E600BA224D6A3EECAEDBC org.apache.tomcat:tomcat-annotations-api:9.0.71
-ADAED61B4EAA5B52448336C0881FCD828FD51A2F org.apache.tomcat.embed:tomcat-embed-core:9.0.71
+ACBF9E2E7580A723ACA3185BD554D3BC602D1C96 org.apache.tomcat:tomcat-annotations-api:9.0.96
+5CEA46A9D71D3FF8D85A0964591C09DBCF014F82 org.apache.tomcat.embed:tomcat-embed-core:9.0.96
diff --git a/...tomcat-annotations-api-9.0.71-license.txt → ...tomcat-annotations-api-9.0.96-license.txt b/...tomcat-annotations-api-9.0.71-license.txt → ...tomcat-annotations-api-9.0.96-license.txt
@@ -1,5 +1,5 @@
 Name: Apache Tomcat (Annotations Package)
-Version: 9.0.71
+Version: 9.0.96
 License: Apache-2.0
 Description: Annotations used in Apache Tomcat
 Origin: http://tomcat.apache.org

diff --git a/.../tomcat-annotations-api-9.0.71-notice.txt → .../tomcat-annotations-api-9.0.96-notice.txt b/.../tomcat-annotations-api-9.0.71-notice.txt → .../tomcat-annotations-api-9.0.96-notice.txt
diff --git a/...rnal/tomcat-embed-core-9.0.71-license.txt → ...rnal/tomcat-embed-core-9.0.96-license.txt b/...rnal/tomcat-embed-core-9.0.71-license.txt → ...rnal/tomcat-embed-core-9.0.96-license.txt
@@ -1,5 +1,5 @@
 Name: Apache Tomcat (embedded)
-Version: 9.0.71
+Version: 9.0.96
 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/...ernal/tomcat-embed-core-9.0.71-notice.txt → ...ernal/tomcat-embed-core-9.0.96-notice.txt b/...ernal/tomcat-embed-core-9.0.71-notice.txt → ...ernal/tomcat-embed-core-9.0.96-notice.txt
diff --git 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.63.0
-release.external/tomcat-embed-core-9.0.71.jar=modules/ext/webserver.jar
-release.external/tomcat-annotations-api-9.0.71.jar=modules/ext/webserver-annotations.jar
+release.external/tomcat-embed-core-9.0.96.jar=modules/ext/webserver.jar
+release.external/tomcat-annotations-api-9.0.96.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
@@ -162,11 +162,11 @@
             <public-packages/>
             <class-path-extension>
                 <runtime-relative-path>ext/webserver.jar</runtime-relative-path>
-                <binary-origin>external/tomcat-embed-core-9.0.71.jar</binary-origin>
+                <binary-origin>external/tomcat-embed-core-9.0.96.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/webserver-annotations.jar</runtime-relative-path>
-                <binary-origin>external/tomcat-annotations-api-9.0.71.jar</binary-origin>
+                <binary-origin>external/tomcat-annotations-api-9.0.96.jar</binary-origin>
             </class-path-extension>
         </data>
     </configuration>