Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update third-party java components to their recent versions #1486

Merged
merged 1 commit into from
Nov 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions auto/modules/java
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ cat << END > $NXT_JAVA_JARS
static const char *nxt_java_system_jars[] = {
END

NXT_TOMCAT_VERSION=9.0.93
NXT_TOMCAT_VERSION=9.0.97

NXT_JAR_VERSION=$NXT_TOMCAT_VERSION

Expand Down Expand Up @@ -297,7 +297,7 @@ NXT_JAR_NAME=jetty-http
. auto/modules/java_get_jar

NXT_JAR_NAME=classgraph
NXT_JAR_VERSION=4.8.175
NXT_JAR_VERSION=4.8.177
NXT_JAR_NAMESPACE=io/github/classgraph/
. auto/modules/java_get_jar

Expand Down
20 changes: 10 additions & 10 deletions auto/modules/java_jar.sha512
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
75eb34c016ce4eb4c7a8413ed06570b491f9f2fb852b19097d0e7692c746052da466d6e86810a9c899890a87f49d5c94cffd724b15d47b006e34e7c334437efc classgraph-4.8.175.jar
10b6604bb136c52ee30a2950a6563e936f974627c3adea20cf288fcf00b7a18eb1e9392def96e2d7ca2517ce7ba757e0cb2a16f9933d6a5724da5de7357dbf4a classgraph-4.8.177.jar
ab441acf5551a7dc81c353eaccb3b3df9e89a48987294d19e39acdb83a5b640fcdff7414cee29f5b96eaa8826647f1d5323e185018fe33a64c402d69c73c9158 ecj-3.26.0.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
486a079fbdcc5c5a05b70ab25db64376c766e50fb3fc62cf721cf6b0d05ae8eb6c5e3f95210dc846ebd7db017a0054883dc344374593a39b170d22e505786ea7 tomcat-api-9.0.97.jar
bc690d7c66f060dc5b5069d7ca4a0e09464b6a95db9a7dca7bd8614489511a20c29e706a5bf09f6d44808032bf1715b56385a09312f3baa613735c89dafe57c0 tomcat-el-api-9.0.97.jar
7fc16b8c14c7ed77d74e49db7dd1a503c4159e63d58662dd32ea7110f3e098e9bfd6bd99e5604a1fa18d1a8cf3c7607f5e0ab3d1fe38d18bd7e0045dc3254091 tomcat-jasper-9.0.97.jar
02899034f4c3a13a5d8b1c17eba50deb7f0b8780b4786bf80ea0e45d49fecf0d781fe5891725bc170c6f66c56583d8cf4e5858708b6cfaa38fbd89582fed6e50 tomcat-jasper-el-9.0.97.jar
aebf1dfa50b244a0ae30800cb32164670f8039196076d5b8f9229df8b45291cf0f1f729edd20a98632e82dcdfae5f8762c4317b7d713ec1eb45e3a4a1a09f05a tomcat-jsp-api-9.0.97.jar
779d6e87b1e5d9d0b4704c3df3889a4b1a8b4b24f4c4819e362267bbf676917d4241de88f648f786136298e995b406416c3b12cea620761b27e4011a2e8d2af3 tomcat-juli-9.0.97.jar
09fe67661b442d8c2e856a07d49ece15b8b3b3030cc3c0630246a073112ea62f25c1a9235046967bd7b0e2263553c9b7d069dc8b61d8a0acde485997c109b699 tomcat-servlet-api-9.0.97.jar
9cbcd73b3440800fa7c610a50bf4405f17333f4cc418f76a8a902b166f90e065d100739a7c60447782529f0cba175509dc6de653a97e794e1715e4d89aaa30d1 tomcat-util-9.0.97.jar
1ff72a6dbf579c1ba56a5515b488e32aa0d83004e5eb3d6e74902300f8db1ac8d63b151d4c857d7b95e13447d46857642e6c215c0cfb2b4ebf72341123ad4fdd tomcat-util-scan-9.0.97.jar
2 changes: 1 addition & 1 deletion test/unit/applications/lang/java.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def prepare_env(self, script):
os.makedirs(classes_path)

classpath = (
f'{option.current_dir}/build/tomcat-servlet-api-9.0.93.jar'
f'{option.current_dir}/build/tomcat-servlet-api-9.0.97.jar'
)

ws_jars = glob.glob(
Expand Down