From 27d3a5c7c0d9b9fc03b69871aea6b3c9ab16aaa0 Mon Sep 17 00:00:00 2001 From: "Sergey A. Osokin" Date: Sat, 7 Sep 2024 11:43:10 -0400 Subject: [PATCH] java: Update third-party components [ Tweaked subject - Andrew ] Signed-off-by: Andrew Clayton --- auto/modules/java | 6 +++--- auto/modules/java_jar.sha512 | 26 +++++++++++++------------- test/unit/applications/lang/java.py | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/auto/modules/java b/auto/modules/java index 54d934e22..4bb34ae79 100644 --- 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.89 +NXT_TOMCAT_VERSION=9.0.93 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.54.v20240208 +NXT_JAR_VERSION=9.4.56.v20240826 NXT_JAR_NAMESPACE=org/eclipse/jetty/ NXT_JAR_NAME=jetty-util @@ -297,7 +297,7 @@ NXT_JAR_NAME=jetty-http . auto/modules/java_get_jar NXT_JAR_NAME=classgraph -NXT_JAR_VERSION=4.8.172 +NXT_JAR_VERSION=4.8.175 NXT_JAR_NAMESPACE=io/github/classgraph/ . auto/modules/java_get_jar diff --git a/auto/modules/java_jar.sha512 b/auto/modules/java_jar.sha512 index 10058264e..14516b8ca 100644 --- a/auto/modules/java_jar.sha512 +++ b/auto/modules/java_jar.sha512 @@ -1,14 +1,14 @@ -e9902308f706e94989132825ceecb5401e8440ab3c092270e248f24a604ec9aa964f32b87a249e0cf98a303cd12b895ba57793efc55d782c575f2086dd04695e classgraph-4.8.172.jar +75eb34c016ce4eb4c7a8413ed06570b491f9f2fb852b19097d0e7692c746052da466d6e86810a9c899890a87f49d5c94cffd724b15d47b006e34e7c334437efc classgraph-4.8.175.jar ab441acf5551a7dc81c353eaccb3b3df9e89a48987294d19e39acdb83a5b640fcdff7414cee29f5b96eaa8826647f1d5323e185018fe33a64c402d69c73c9158 ecj-3.26.0.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 -f52247c8ede15330b83de6947852ccad85b00e58a877693a7a6b1240e5965a7576227dc02a9bd0e499fb84b2d6c9ed8f3e893fc777843bcc9fca07eb1e89673e tomcat-api-9.0.89.jar -1de5e968568355f5bcd8efe1cf7fad5c427436d9307f2822636ce82d888033d01247e63a7b45941d7823c9eaa7204663281fe3a0d4ed765305ba3071d3525fb6 tomcat-el-api-9.0.89.jar -aa9af50b2198a2fa772691f867ecadaeb582381fce8324523e73f4a766b526866447450a5c62184fcfe8ed0b9def7f6268a7296aad628fcd5442b426f62e3cbb tomcat-jasper-9.0.89.jar -40448f3fe8cdd920d0f81c2b8bd1322f3f308a1ba3598050d4623941056061485c26fb9aad53caffe433de8fd98a92d4c101d63ad876eb2700b052f6c50e9e84 tomcat-jasper-el-9.0.89.jar -0b174cf2b3dde3bb768ec9af60429572bd1e1c1a009173406f60113c3ca0165216f1d235d505b295fad95b8298bac759c0e36715a111a91c4ec759a738a27a29 tomcat-jsp-api-9.0.89.jar -f4ebbb1a57b3f797c272d99e67474dad5f7eba7649a2d33a18c4ca8fb4b03f7f83dfe37363b6e6029eefbda3615982d23383f9dee35bfb45b2e882f3f3216839 tomcat-juli-9.0.89.jar -ff646b3afce76efd7385434866ee9b9b55fe24c561c0eb1666656b87acd4bb3efb822e81b578bee5b1e4a1dbe5f5ddf39e7f3ccf009ec95982874b24e72cd00e tomcat-servlet-api-9.0.89.jar -ee1d45adf8be50a941c553dcf2edfb479f0bae9bc07223578ae490f7ffd362db8d1ad0b0e6d08dc839737c3b25995a99e66df909b4501898388b09df42a38d6c tomcat-util-9.0.89.jar -8364c2fa7beb5a4bf0d5766e9081eb80a7b7160f89944af3889a14daffb9566b25ce9d91cc193b62b6def357a19f6ab18d75f856c7cb6f4190faf5ff66808eaf tomcat-util-scan-9.0.89.jar +48d5512d378d58c3df93bbe1c68d5a4b097e2dc7466992393e0731414dc0fe449312e067d0874e503dd27cb9b6a1f2da0d1f1569a7b484c1f12bd533afbe2723 jetty-http-9.4.56.v20240826.jar +dc0d1f05a7f8477e1f7f57adb307224aadcb1e1fed6f7e5df72d9b84437bf75276c3b0f13da9d079c541ad94601bdbd7314c61477b224dbbdc93a6d5b9f98478 jetty-server-9.4.56.v20240826.jar +025751c45cd8a23f1b436eaa1849af2421f78a2a82bc07c4175df8b4ec5dfc15247036194156897aafb8b0ec83406bbaa25e4092fea5ddd3b900da0ffdfaae19 jetty-util-9.4.56.v20240826.jar +9ea72285b395592dbee58339e3a2a9a8e9d9b623f9c37eace3cb45842107469880d3556a18023f870ef4fcad007705652ff300c12f57fa13af9a8cd666f545de tomcat-api-9.0.93.jar +3a91b9dda9d015aaf0c931847ba40a17bd77102ec0b596a1406142dfac556ab95fa5e0fe554743757d80f28436bcd05f28d2716ca62204bded81f0ed98ac2bf8 tomcat-el-api-9.0.93.jar +d50a0d26c6b8ee2b855df54e7a2647f423181f7fa45fe67daf33b8828122b891cacc7bd8312ae72c05a20708f2b405053045d71939427e1526796b02432db72d tomcat-jasper-9.0.93.jar +4886719cbe70ec7bd9190f691d0a85bc84a343ecdb969eb946b0718f0a8bd670f9bc771a309d2d90b23dae06be1f51d3049df7ed157c90b8f4d724a1064eb21b tomcat-jasper-el-9.0.93.jar +17696c91cb90c71dbebac36cebd5205c001a4ebd4df22eeef0762d818dde16f8b6e8ccfa28301ea2fa6efb001ea2f428a813a2aea1b593f08c7c62d31884571c tomcat-jsp-api-9.0.93.jar +cf9582e6fbc3dae8bdc55e4e687fd2dbc6f44d1bfce77e2117f8673b011d69c07ade7f715493e1d14e205d122284114edc2fe9f19888933645931a093dd26a01 tomcat-juli-9.0.93.jar +280c000ec81893a87feaf7db46702d0b13599e82aedf1540597f69c609bd20a48d04f887131bc464c7f715911aa8c3b44a3502e1c736e5c7575765c419fdb064 tomcat-servlet-api-9.0.93.jar +55a47b7bc9cc3dc47d93f7850d60375d900f7aac3a7b16bdd06e01e4523672ea93cdac8660825307c6699bda8bb5e4f668b2d1d42967194dddceeb56b1acc004 tomcat-util-9.0.93.jar +db933442c1cbbc1e277cce2a374b17b37aea14b3a7f1a42f1bf7152af8edc0d876ee25ae5087f31e0b06474d1e2a134de36f3e3eaca0f04dac734deeecfd773e tomcat-util-scan-9.0.93.jar diff --git a/test/unit/applications/lang/java.py b/test/unit/applications/lang/java.py index a65eb0f5a..2b3194ae8 100644 --- 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.89.jar' + f'{option.current_dir}/build/tomcat-servlet-api-9.0.93.jar' ) ws_jars = glob.glob(