Skip to content

Commit

Permalink
Update jetty to 11.0.20 (#1723)
Browse files Browse the repository at this point in the history
  • Loading branch information
@marcospereira
marcospereira committed May 11, 2024
1 parent 45793aa commit c9a3326
Show file tree
Hide file tree
Showing 20 changed files with 310 additions and 277 deletions.
4 changes: 4 additions & 0 deletions .editorconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,9 @@ indent_size = 2
[*.{js,css,xml}]
indent_style = tab

[**/build.xml]
indent_style = space
indent_size = 2

[*.md]
trim_trailing_whitespace = false
27 changes: 14 additions & 13 deletions build/build.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,25 +155,26 @@
("https://repo1.maven.org/maven2/com/ibm/icu/icu4j/70.1/icu4j-70.1.jar", "d0583e891bfeb065b17806d8c6535bda"), # nopep8
("https://repo1.maven.org/maven2/com/shapesecurity/salvation/2.7.2/salvation-2.7.2.jar", "d81345b141a8cc93fc6be49a6840a7f0"), # nopep8
("https://repo1.maven.org/maven2/commons-codec/commons-codec/1.15/commons-codec-1.15.jar", "303baf002ce6d382198090aedd9d79a2"), # nopep8
("https://repo1.maven.org/maven2/commons-fileupload/commons-fileupload/1.4/commons-fileupload-1.4.jar", "0c3b924dcaaa90c3fb93fe04ae96a35e"), # nopep8
("https://repo1.maven.org/maven2/commons-io/commons-io/2.11.0/commons-io-2.11.0.jar", "3b4b7ccfaeceeac240b804839ee1a1ca"), # nopep8
("https://repo1.maven.org/maven2/org/apache/commons/commons-fileupload2-core/2.0.0-M2/commons-fileupload2-core-2.0.0-M2.jar", "6180d94509d26d293bd2d04389156e4b"), # nopep8
("https://repo1.maven.org/maven2/org/apache/commons/commons-fileupload2-jakarta-servlet5/2.0.0-M2/commons-fileupload2-jakarta-servlet5-2.0.0-M2.jar", "6389bdd4bbcc54082686e3707289e780"), # nopep8
("https://repo1.maven.org/maven2/commons-io/commons-io/2.15.1/commons-io-2.15.1.jar", "84351f7991a0e6722f00e96a4ccc376f"), # nopep8
("https://repo1.maven.org/maven2/commons-logging/commons-logging/1.2/commons-logging-1.2.jar", "040b4b4d8eac886f6b4a2a3bd2f31b00"), # nopep8
("https://repo1.maven.org/maven2/commons-logging/commons-logging/1.2/commons-logging-1.2-adapters.jar", "5c82e86cc5b769f72abd2af1f92255fa"), # nopep8
("https://repo1.maven.org/maven2/commons-logging/commons-logging/1.2/commons-logging-1.2-api.jar", "289dcb376743ab24ecaeb194a0d287d9"), # nopep8
("https://repo1.maven.org/maven2/javax/mail/mail/1.4.7/mail-1.4.7.jar", "77f53ff0c78ba43c4812ecc9f53e20f8"), # nopep8
("https://repo1.maven.org/maven2/javax/servlet/javax.servlet-api/4.0.1/javax.servlet-api-4.0.1.jar", "b80414033bf3397de334b95e892a2f44"), # nopep8
("https://repo1.maven.org/maven2/org/eclipse/jetty/toolchain/jetty-jakarta-servlet-api/5.0.2/jetty-jakarta-servlet-api-5.0.2.jar", "7de826f76a829dc9dfb41e437ff4bd01"), # nopep8
("https://repo1.maven.org/maven2/log4j/log4j/1.2.17/log4j-1.2.17.jar", "04a41f0a068986f0f73485cf507c0f40"), # nopep8
("https://repo1.maven.org/maven2/net/sourceforge/jchardet/jchardet/1.0/jchardet-1.0.jar", "90c63f0e53e6f714dbc7641e066620e4"), # nopep8
("https://repo1.maven.org/maven2/org/apache/httpcomponents/httpclient/4.5.13/httpclient-4.5.13.jar", "40d6b9075fbd28fa10292a45a0db9457"), # nopep8
("https://repo1.maven.org/maven2/org/apache/httpcomponents/httpcore/4.4.14/httpcore-4.4.14.jar", "2b3991eda121042765a5ee299556c200"), # nopep8
("https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-http/9.4.44.v20210927/jetty-http-9.4.44.v20210927.jar", "632ab6ec05d82af095c0df1bbd36a1af"), # nopep8
("https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-io/9.4.44.v20210927/jetty-io-9.4.44.v20210927.jar", "d508ec41df25082316d21abe268ea768"), # nopep8
("https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-security/9.4.44.v20210927/jetty-security-9.4.44.v20210927.jar", "8a1a277265ecd525eb049f28074085a3"), # nopep8
("https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-server/9.4.44.v20210927/jetty-server-9.4.44.v20210927.jar", "aef1d939f1750ce2512ce8f7619cf997"), # nopep8
("https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-servlet/9.4.44.v20210927/jetty-servlet-9.4.44.v20210927.jar", "0bee43f80fe155ce9f2839f031feaf67"), # nopep8
("https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-servlets/9.4.44.v20210927/jetty-servlets-9.4.44.v20210927.jar", "fc18884cf5ec835b10deba9d18facb20"), # nopep8
("https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-util/9.4.44.v20210927/jetty-util-9.4.44.v20210927.jar", "73b579e6f53afefaadeac30915de8875"), # nopep8
("https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-util-ajax/9.4.44.v20210927/jetty-util-ajax-9.4.44.v20210927.jar", "2229353304338936514b0a349bcbbfb0"), # nopep8
("https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-http/11.0.20/jetty-http-11.0.20.jar", "fbbf12c985f7e9f5387c52b700057129"), # nopep8
("https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-io/11.0.20/jetty-io-11.0.20.jar", "69edc0f6fb44ad9cd341f15d086859d7"), # nopep8
("https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-security/11.0.20/jetty-security-11.0.20.jar", "65160e47126973ac352857430c0f0eb3"), # nopep8
("https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-server/11.0.20/jetty-server-11.0.20.jar", "b6d93046e20136bfca140d4f68cd9c8a"), # nopep8
("https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-servlet/11.0.20/jetty-servlet-11.0.20.jar", "eef8ffa65723dfd913af3c56173041b2"), # nopep8
("https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-servlets/11.0.20/jetty-servlets-11.0.20.jar", "d3c54ba8c07b70c124a8908f5a5f6d9f"), # nopep8
("https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-util/11.0.20/jetty-util-11.0.20.jar", "83d40c5c7d81c7f6ba2772d76387397d"), # nopep8
("https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-util-ajax/11.0.20/jetty-util-ajax-11.0.20.jar", "c853563f3fa877f512e91dab5c30fd3a"), # nopep8
]

moduleDependencyPackages = [
Expand All @@ -186,7 +187,7 @@
("https://repo1.maven.org/maven2/javax/inject/javax.inject/1/javax.inject-1.jar", "289075e48b909e9e74e6c915b3631d2e"), # nopep8
("https://repo1.maven.org/maven2/javax/interceptor/javax.interceptor-api/1.2.2/javax.interceptor-api-1.2.2.jar", "d46f2dac1607941fbfb81eb7bc83157a"), # nopep8
("https://repo1.maven.org/maven2/javax/jms/javax.jms-api/2.0.1/javax.jms-api-2.0.1.jar", "d69d2e02910e97b2478c0105e9b2caab"), # nopep8
("https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-jmx/9.4.44.v20210927/jetty-jmx-9.4.44.v20210927.jar", "d07aa06079b53b659bc20f0f5aa0a945"), # nopep8
("https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-jmx/11.0.20/jetty-jmx-11.0.20.jar", "605528653766f728f7ff994e39c17fa2"), # nopep8
("https://repo1.maven.org/maven2/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar", "dd83accb899363c32b07d7a1b2e4ce40"), # nopep8
("https://repo1.maven.org/maven2/javax/portlet/portlet-api/3.0.1/portlet-api-3.0.1.jar", "ff22c9434e12a87b6023e301600b6c44"), # nopep8
("https://repo1.maven.org/maven2/org/slf4j/slf4j-api/1.7.29/slf4j-api-1.7.29.jar", "75191c97f2d6ef4f990cbb4b2e56a46b"), # nopep8
Expand Down Expand Up @@ -1064,7 +1065,7 @@ def createRuntimeImage(self):
return
if not os.path.exists(vnuJar):
self.createJarOrWar("jar")
runCmd([jdepsCmd, '--generate-open-module', distDir, vnuJar])
runCmd([jdepsCmd, '--ignore-missing-deps', '--generate-open-module', distDir, vnuJar])
f = open(os.path.join(self.vnuModuleInfoDir, "module-info.java"), 'r+')
lines = f.readlines()
lines = lines[:-2]
Expand Down
61 changes: 43 additions & 18 deletions build/build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@ DEALINGS IN THE SOFTWARE.
<property name="validator-sources-jar" value="${dist}/${artifactId}-${version}-sources.jar" />
<property name="validator-bundle-jar" value="${dist}/${artifactId}-${version}-bundle.jar" />
<property name="commons-codec-version" value="1.15" />
<property name="commons-fileupload-version" value="1.4" />
<property name="commons-io-version" value="2.11.0" />
<property name="commons-fileupload-version" value="2.0.0-M2" />
<property name="commons-io-version" value="2.15.1" />
<property name="commons-logging-version" value="1.2" />
<property name="httpclient-version" value="4.5.13" />
<property name="httpcore-version" value="4.4.14" />
<property name="icu4j-version" value="70.1" />
<property name="javax.servlet-api-version" value="4.0.1" />
<property name="jakarta.servlet-api-version" value="5.0.2" />
<property name="jchardet-version" value="1.0" />
<property name="jetty-version" value="9.4.44.v20210927" />
<property name="jetty-version" value="11.0.20" />
<property name="log4j-version" value="1.2.17" />
<property name="salvation-version" value="2.7.2" />
<!-- module dependencies -->
Expand Down Expand Up @@ -70,26 +70,45 @@ DEALINGS IN THE SOFTWARE.
<zipfileset src="../jing-trang/build/jing.jar"/>
<zipfileset src="../jing-trang/lib/saxon9.jar"/>
<zipfileset src="../dependencies/commons-codec-${commons-codec-version}.jar"/>
<zipfileset src="../dependencies/commons-fileupload-${commons-fileupload-version}.jar"/>
<zipfileset src="../dependencies/commons-fileupload2-core-${commons-fileupload-version}.jar"/>
<zipfileset src="../dependencies/commons-fileupload2-jakarta-servlet5-${commons-fileupload-version}.jar"/>
<zipfileset src="../dependencies/commons-io-${commons-io-version}.jar"/>
<zipfileset src="../dependencies/commons-logging-${commons-logging-version}.jar"/>
<zipfileset src="../dependencies/commons-logging-${commons-logging-version}-adapters.jar"/>
<zipfileset src="../dependencies/commons-logging-${commons-logging-version}-api.jar"/>
<zipfileset src="../dependencies/httpclient-${httpclient-version}.jar"/>
<zipfileset src="../dependencies/httpcore-${httpcore-version}.jar"/>
<zipfileset src="../dependencies/icu4j-${icu4j-version}.jar"/>
<zipfileset src="../dependencies/javax.servlet-api-${javax.servlet-api-version}.jar"/>

<zipfileset src="../dependencies/jchardet-${jchardet-version}.jar"/>
<zipfileset src="../dependencies/jetty-http-${jetty-version}.jar">
<exclude name="module-info.class" />
<exclude name="META-INF/services/**"/>
</zipfileset>
<zipfileset src="../dependencies/jetty-io-${jetty-version}.jar"/>
<zipfileset src="../dependencies/jetty-security-${jetty-version}.jar"/>
<zipfileset src="../dependencies/jetty-server-${jetty-version}.jar"/>
<zipfileset src="../dependencies/jetty-servlet-${jetty-version}.jar"/>
<zipfileset src="../dependencies/jetty-servlets-${jetty-version}.jar"/>
<zipfileset src="../dependencies/jetty-util-${jetty-version}.jar"/>
<zipfileset src="../dependencies/jetty-util-ajax-${jetty-version}.jar"/>
<zipfileset src="../dependencies/jetty-io-${jetty-version}.jar">
<exclude name="module-info.class" />
</zipfileset>
<zipfileset src="../dependencies/jetty-jakarta-servlet-api-${jakarta.servlet-api-version}.jar">
<exclude name="module-info.class" />
</zipfileset>
<zipfileset src="../dependencies/jetty-security-${jetty-version}.jar">
<exclude name="module-info.class" />
</zipfileset>
<zipfileset src="../dependencies/jetty-server-${jetty-version}.jar">
<exclude name="module-info.class" />
</zipfileset>
<zipfileset src="../dependencies/jetty-servlet-${jetty-version}.jar">
<exclude name="module-info.class" />
</zipfileset>
<zipfileset src="../dependencies/jetty-servlets-${jetty-version}.jar">
<exclude name="module-info.class" />
</zipfileset>
<zipfileset src="../dependencies/jetty-util-${jetty-version}.jar">
<exclude name="module-info.class" />
</zipfileset>
<zipfileset src="../dependencies/jetty-util-ajax-${jetty-version}.jar">
<exclude name="module-info.class" />
</zipfileset>
<zipfileset src="../dependencies/log4j-${log4j-version}.jar"/>
<zipfileset src="../dependencies/salvation-${salvation-version}.jar"/>
<!-- module dependencies -->
Expand All @@ -104,7 +123,9 @@ DEALINGS IN THE SOFTWARE.
<zipfileset src="../dependencies/javax.inject-${javax-inject-version}.jar"/>
<zipfileset src="../dependencies/javax.interceptor-api-${javax-interceptor-api-version}.jar"/>
<zipfileset src="../dependencies/javax.jms-api-${javax-jms-api-version}.jar"/>
<zipfileset src="../dependencies/jetty-jmx-${jetty-version}.jar"/>
<zipfileset src="../dependencies/jetty-jmx-${jetty-version}.jar">
<exclude name="module-info.class" />
</zipfileset>
<zipfileset src="../dependencies/jsr305-${jsr305-version}.jar"/>
<zipfileset src="../dependencies/mail-${mail-version}.jar"/>
<zipfileset src="../dependencies/portlet-api-${portlet-api-version}.jar"/>
Expand Down Expand Up @@ -199,7 +220,8 @@ DEALINGS IN THE SOFTWARE.
<fileset file="../jing-trang/build/jing.jar"/>
<fileset file="../jing-trang/lib/saxon9.jar"/>
<fileset file="../dependencies/commons-codec-${commons-codec-version}.jar"/>
<fileset file="../dependencies/commons-fileupload-${commons-fileupload-version}.jar"/>
<fileset file="../dependencies/commons-fileupload2-core-${commons-fileupload-version}.jar"/>
<fileset file="../dependencies/commons-fileupload2-jakarta-servlet5-${commons-fileupload-version}.jar"/>
<fileset file="../dependencies/commons-io-${commons-io-version}.jar"/>
<fileset file="../dependencies/commons-logging-${commons-logging-version}.jar"/>
<fileset file="../dependencies/commons-logging-${commons-logging-version}-adapters.jar"/>
Expand All @@ -212,6 +234,8 @@ DEALINGS IN THE SOFTWARE.
<fileset file="../dependencies/log4j-${log4j-version}.jar"/>
<fileset file="../dependencies/jetty-util-ajax-${jetty-version}.jar"/>
<fileset file="../dependencies/jetty-util-${jetty-version}.jar"/>
<fileset file="../dependencies/jetty-util-${jetty-version}.jar"/>
<fileset file="../dependencies/jetty-jakarta-servlet-api-${jakarta.servlet-api-version}.jar"/>
</copy>
<war destfile="${dist}/vnu.war" webxml="${dist}/war/web.xml">
<lib dir="${dist}/war/lib"/>
Expand All @@ -224,7 +248,7 @@ DEALINGS IN THE SOFTWARE.
<provider classname="nu.validator.datatype.Html5DatatypeLibraryFactory"/>
</service>
</war>
<delete dir="${dist}/war"></delete>
<delete dir="${dist}/war" />
</target>
<target name="validator-javadoc-jar">
<property name="javadoc-dir" value="${dist}/javadoc" />
Expand Down Expand Up @@ -288,11 +312,12 @@ DEALINGS IN THE SOFTWARE.
<dependency groupId="com.ibm.icu" artifactId="icu4j" version="${icu4j-version}"/>
<dependency groupId="com.shapesecurity" artifactId="salvation" version="${salvation-version}"/>
<dependency groupId="commons-codec" artifactId="commons-codec" version="${commons-codec-version}"/>
<dependency groupId="commons-fileupload" artifactId="commons-fileupload" version="${commons-fileupload-version}"/>
<dependency groupId="org.apache.commons" artifactId="commons-fileupload2-core" version="${commons-fileupload-version}"/>
<dependency groupId="org.apache.commons" artifactId="commons-fileupload2-jakarta-servlet5" version="${commons-fileupload-version}"/>
<dependency groupId="commons-io" artifactId="commons-io" version="${commons-io-version}"/>
<dependency groupId="commons-logging" artifactId="commons-logging" version="${commons-logging-version}"/>
<dependency groupId="isorelax" artifactId="isorelax" version="20030108"/>
<dependency groupId="javax.servlet" artifactId="javax.servlet-api" version="${javax.servlet-api-version}"/>
<dependency groupId="org.eclipse.jetty.toolchain" artifactId="jetty-jakarta-servlet-api" version="${jakarta.servlet-api-version}"/>
<dependency groupId="log4j" artifactId="log4j" version="${log4j-version}"/>
<dependency groupId="net.sf.saxon" artifactId="Saxon-HE" version="9.6.0-4"/>
<dependency groupId="nu.validator" artifactId="langdetect" version="1.2"/>
Expand Down
2 changes: 1 addition & 1 deletion htmlparser
Submodule htmlparser updated 2 files
+520 −508 src/nu/validator/htmlparser/impl/AttributeName.java
+77 −2 src/nu/validator/htmlparser/impl/TreeBuilder.java

0 comments on commit c9a3326

Please sign in to comment.