Update third-party java components to their recent versions

Acked-by: Timo Stark <[email protected]> [ Remove trailing '.' from subject line - Andrew ] Signed-off-by: Andrew Clayton <[email protected]>
nginx · Feb 21, 2024 · 1724225 · 1724225
1 parent 4c55869
commit 1724225
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/auto/modules/java b/auto/modules/java
@@ -238,7 +238,7 @@ cat << END > $NXT_JAVA_JARS
 static const char *nxt_java_system_jars[] = {
 END
 
-NXT_TOMCAT_VERSION=9.0.83
+NXT_TOMCAT_VERSION=9.0.86
 
 NXT_JAR_VERSION=$NXT_TOMCAT_VERSION
 
@@ -284,7 +284,7 @@ static const char *nxt_java_unit_jars[] = {
     "$NXT_UNIT_JAR",
 END
 
-NXT_JAR_VERSION=9.4.53.v20231009
+NXT_JAR_VERSION=9.4.54.v20240208
 NXT_JAR_NAMESPACE=org/eclipse/jetty/
 
 NXT_JAR_NAME=jetty-util

diff --git a/auto/modules/java_jar.sha512 b/auto/modules/java_jar.sha512
@@ -1,14 +1,14 @@
 d0c17607eee55e181baa03f1abb2cf77f50e5114c471c2031607206768d8549c74ebb0a276d87dd3f8ea44db5e54e56087311c229ba18ad6013c388fc861beed  classgraph-4.8.165.jar
 ab441acf5551a7dc81c353eaccb3b3df9e89a48987294d19e39acdb83a5b640fcdff7414cee29f5b96eaa8826647f1d5323e185018fe33a64c402d69c73c9158  ecj-3.26.0.jar
-867afb0e69ab225a3d57c0eda4e773ca2f41dcc6eb294e14aef4d69441314bee88221081f9edc6289b9e4a99184804b60c32f4443c8ff96eb34d6508b348b755  jetty-http-9.4.53.v20231009.jar
-aca14debabc0cc40e154d4de4de404c383c4611e9f2482911e17d9072f0941cef8a88511d5d49d70946e65872e1bc8d395b9401b2ec91132553d782d99140ce3  jetty-server-9.4.53.v20231009.jar
-429b269e21c6e7bf86ba8a8b71569e3abf61b06ace9dd064a9c80af4282227e910a8d20be86ef6581895ff283a5aa4711bbb238de45dc7628f494624879c4d49  jetty-util-9.4.53.v20231009.jar
-96af9145dfe3a9566af2a1c93085ed48d80fde0587db7e951b07ec32f1654aa17977b37d011589e2eec6f1f9b3ff52937d429a86d68febb23fde9572fda3b246  tomcat-api-9.0.83.jar
-1b8a5de6e75664fdc1e8c1c1fd58694e0b4057ac33508c24fc95662f44fd177bc20c36d134926f68b93978fa659d3c9874e70a6f0e2ac8dd2dd9c7a7643d4ba3  tomcat-el-api-9.0.83.jar
-71a560be521bb71366541ddac79b1a412e40e635165c18e9bd05dac59e4417557fe836109687181d4799c6089a375bc05d9fa86a14cd60b19e54e8828d00cf47  tomcat-jasper-9.0.83.jar
-7a42a590f6af52e34aef323766295bb2b8ae87ac48b5bba0de6ac1240e262c0f37ef9ef4d185d4ec08249faff6125863d01256587810a3d9131bb20bf57159d1  tomcat-jasper-el-9.0.83.jar
-4051eb6b13a7e59f64ffc99c6dad176e1908a4eb6936765f69c1df63048d3f28f94b93164ec7c9579ea8b37dff26a7f2e66354ddbcb594596839e9068fd8c18e  tomcat-jsp-api-9.0.83.jar
-2e1d417495b08cf3bf9d7f2806aee8fc96f42ad8152489497cb539dcb4d6668f3d6f6f7a6ae10df06abe7c9db3e11c7b03c9d46c35ec1074c8f7d6788a6cfc80  tomcat-juli-9.0.83.jar
-96032c24db4336498d1b0328a48a6eae35010c840ceefd140c7c79a6fcdf5319ad5a16c4fc21de4ae1494c5b5eadcedca3da01a4584b27deb25dc80ac21ae4a9  tomcat-servlet-api-9.0.83.jar
-ab0c1868ce50ec0d45c0d541921fd3e33b5b3bc314a97230467380461e8d80c54d08ba8ef94b0a28493ed3ffde3333623170850f3ad630485fc332dbceb2745b  tomcat-util-9.0.83.jar
-acc12ed11fce573003b4bd973a7dce311704a1c317811a8fd4086b9eb73296cc5f1e291f81c065869f578091cb508f49cbfbec32aba747b9367a504898bb4d04  tomcat-util-scan-9.0.83.jar
+6e1d6fdffcb2acf8daa9ce5b3ad973526a30b3556dc8e950254c68c64cd70e101b28a8acac41b3bd74de6b9c8eac10676afdc3c58ccb1f61a74323721592e0b5  jetty-http-9.4.54.v20240208.jar
+780ee47a8722bdfb4b159f440acbfb69afdb73cc329906392b10eba8d30c564aa6377fab129e61b85a56945f01c4403913c80b6ce3158d108d88a3ad64527f06  jetty-server-9.4.54.v20240208.jar
+fbe9cf7efeba9f29297f75de3f1c2d98f0e02816a1dc9e6eaddcabb84c3a699a9332218c532017a3707ec57f4f99066bc671708bde4ec84dd873b8403422d7e9  jetty-util-9.4.54.v20240208.jar
+1aa9024f49f74b44252f7c90d00bbfdd6aae4e96866708a0c2325def0314c8b7e5ad2fd17bb6b4b135eb2c513fe74b5b591d4b0fe3d1921192cfecadf140b7fa  tomcat-api-9.0.86.jar
+60a9991ff7b95ef4edfac57cd7c18b6c5177d9aee4f775b5794b5833246b928e1a685b80785babd2f450e3cd18383c58b843b0b5e742252a37044494bc90d608  tomcat-el-api-9.0.86.jar
+b09cbfb834564cc7025ffad7bf069569989d3efa3bd176696045aea08bfb53622aa1aece5c84ea4371f0193d4fd477b9179999399e75d04205b219a3ab19bb66  tomcat-jasper-9.0.86.jar
+1431469e91debc0ffcf820df2973782221be955dac0739a77d9030ac619cde96320970cb27eb2ff9de1e6bde3227a70b1645d1934da8e10fe2b32c069d33afec  tomcat-jasper-el-9.0.86.jar
+1ad9ebc1c49beb243c18ab2c459dbd54cab9514223c44b5c7e05d53d290c64c49990fc0fe276c66b1f6f6625acca651fdcb4b7df9e23fb0cc43bc05ad3900798  tomcat-jsp-api-9.0.86.jar
+d30055aabf5d45ad350e01702ed0ff4bfbcdd14bee40e1e8a9a7690719816aff019ca961b7970234eaba673c3c13f5cea5dbf1bc0612ce4e8f7de795af2f170d  tomcat-juli-9.0.86.jar
+d7fa7d7bf35b35b7bb925cce6284e2f750e8e94ee54057daff4e369a32b361e6044e9011048a9dff54b12371ee785d34e82306b60ffae8add76602071e5fc9c5  tomcat-servlet-api-9.0.86.jar
+b4a268b79fbfcd610ea5d14446ef71ad5f2ad3da247ae148669e3082ff5fd7f7256a2ecdf2529e4280ed393f53c3a7f6d09a5c38d5653b30b25ab3c4b74ed732  tomcat-util-9.0.86.jar
+f2086356c8eca5cfe890232056ce30378422d3994c499845f52ec8641453af02041ae31ffdcb567bb998f0f24465d1ab65456b23e8f781058efdc01658c7252d  tomcat-util-scan-9.0.86.jar
diff --git a/test/unit/applications/lang/java.py b/test/unit/applications/lang/java.py
@@ -53,7 +53,7 @@ def prepare_env(self, script):
                 os.makedirs(classes_path)
 
             classpath = (
-                f'{option.current_dir}/build/tomcat-servlet-api-9.0.83.jar'
+                f'{option.current_dir}/build/tomcat-servlet-api-9.0.86.jar'
             )
 
             ws_jars = glob.glob(