Update Jetty to 10.0.6; javax.servlet-api to 4.0.1

Fixes #1219
validator · Sep 1, 2021 · 11e9ee1 · 11e9ee1
1 parent b1dd328
commit 11e9ee1
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 30 deletions.
diff --git a/.classpath b/.classpath
@@ -50,34 +50,34 @@
 			<attribute name="javadoc_location" value="http://docs.oracle.com/javaee/7/api/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="lib" path="dependencies/jetty-server-9.4.18.v20190429.jar">
+	<classpathentry kind="lib" path="dependencies/jetty-server-10.0.6.jar">
 		<attributes>
-			<attribute name="javadoc_location" value="https://www.eclipse.org/jetty/javadoc/9.4.18.v20190429/"/>
+			<attribute name="javadoc_location" value="https://www.eclipse.org/jetty/javadoc/10.0.6/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="lib" path="dependencies/http2-server-9.4.18.v20190429.jar">
+	<classpathentry kind="lib" path="dependencies/http2-server-10.0.6.jar">
 		<attributes>
-			<attribute name="javadoc_location" value="https://www.eclipse.org/jetty/javadoc/9.4.18.v20190429/"/>
+			<attribute name="javadoc_location" value="https://www.eclipse.org/jetty/javadoc/10.0.6/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="lib" path="dependencies/jetty-servlet-9.4.18.v20190429.jar">
+	<classpathentry kind="lib" path="dependencies/jetty-servlet-10.0.6.jar">
 		<attributes>
-			<attribute name="javadoc_location" value="https://www.eclipse.org/jetty/javadoc/9.4.18.v20190429/"/>
+			<attribute name="javadoc_location" value="https://www.eclipse.org/jetty/javadoc/10.0.6/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="lib" path="dependencies/jetty-servlets-9.4.18.v20190429.jar">
+	<classpathentry kind="lib" path="dependencies/jetty-servlets-10.0.6.jar">
 		<attributes>
-			<attribute name="javadoc_location" value="https://www.eclipse.org/jetty/javadoc/9.4.18.v20190429/"/>
+			<attribute name="javadoc_location" value="https://www.eclipse.org/jetty/javadoc/10.0.6/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="lib" path="dependencies/jetty-util-9.4.18.v20190429.jar">
+	<classpathentry kind="lib" path="dependencies/jetty-util-10.0.6.jar">
 		<attributes>
-			<attribute name="javadoc_location" value="https://www.eclipse.org/jetty/javadoc/9.4.18.v20190429/"/>
+			<attribute name="javadoc_location" value="https://www.eclipse.org/jetty/javadoc/10.0.6/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="lib" path="dependencies/jetty-util-ajax-9.4.18.v20190429.jar">
+	<classpathentry kind="lib" path="dependencies/jetty-util-ajax-10.0.6.jar">
 		<attributes>
-			<attribute name="javadoc_location" value="https://www.eclipse.org/jetty/javadoc/9.4.18.v20190429/"/>
+			<attribute name="javadoc_location" value="https://www.eclipse.org/jetty/javadoc/10.0.6/"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="lib" path="jars/langdetect.jar">

diff --git a/build/build.py b/build/build.py
@@ -160,22 +160,22 @@
     ("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/3.1.0/javax.servlet-api-3.1.0.jar", "79de69e9f5ed8c7fcb8342585732bbf7"),  # 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/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.9/httpclient-4.5.9.jar", "62fce5f1f44f9df4a68d9a390b8982eb"),  # nopep8
     ("https://repo1.maven.org/maven2/org/apache/httpcomponents/httpcore/4.4.9/httpcore-4.4.9.jar", "b89455507839c09d6119661defd2166a"),  # nopep8
-    ("https://repo1.maven.org/maven2/org/eclipse/jetty/http2/http2-common/9.4.18.v20190429/http2-common-9.4.18.v20190429.jar", "d4f0dede20f81acfb53f97c01fae71cf"),  # nopep8
-    ("https://repo1.maven.org/maven2/org/eclipse/jetty/http2/http2-hpack/9.4.18.v20190429/http2-hpack-9.4.18.v20190429.jar", "0323c6dd472c456a99d068f171cbd661"),  # nopep8
-    ("https://repo1.maven.org/maven2/org/eclipse/jetty/http2/http2-server/9.4.18.v20190429/http2-server-9.4.18.v20190429.jar", "9c82833f49671905299a1a0d0edc031d"),  # nopep8
-    ("https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-http/9.4.18.v20190429/jetty-http-9.4.18.v20190429.jar", "0f5299204d64fb561a8062f594185dc6"),  # nopep8
-    ("https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-io/9.4.18.v20190429/jetty-io-9.4.18.v20190429.jar", "d430c2038527a0788675049f9d48760e"),  # nopep8
-    ("https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-security/9.4.18.v20190429/jetty-security-9.4.18.v20190429.jar", "ea1d2d43fdc539ddf8192e2782f45e79"),  # nopep8
-    ("https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-server/9.4.18.v20190429/jetty-server-9.4.18.v20190429.jar", "b0bc6045c38e309d41f84d3c60fb31cd"),  # nopep8
-    ("https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-servlet/9.4.18.v20190429/jetty-servlet-9.4.18.v20190429.jar", "63d8201a1db1aa10454015245472fdd4"),  # nopep8
-    ("https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-servlets/9.4.18.v20190429/jetty-servlets-9.4.18.v20190429.jar", "ed9e6c52ea1c28d92b81bf5c4cff5e22"),  # nopep8
-    ("https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-util/9.4.18.v20190429/jetty-util-9.4.18.v20190429.jar", "0e98accd79ef0f0709e67b32d1882712"),  # nopep8
-    ("https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-util-ajax/9.4.18.v20190429/jetty-util-ajax-9.4.18.v20190429.jar", "ec81b52cf2801e04c47e4be7fbeaa9d2"),  # nopep8
+    ("https://repo1.maven.org/maven2/org/eclipse/jetty/http2/http2-common/10.0.6/http2-common-10.0.6.jar", "44b258fd14a0f40faa89635ba1271598"),  # nopep8
+    ("https://repo1.maven.org/maven2/org/eclipse/jetty/http2/http2-hpack/10.0.6/http2-hpack-10.0.6.jar", "7968408d6b864a803901c8651873baac"),  # nopep8
+    ("https://repo1.maven.org/maven2/org/eclipse/jetty/http2/http2-server/10.0.6/http2-server-10.0.6.jar", "27040f45a024ef19aab9c9da015235e3"),  # nopep8
+    ("https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-http/10.0.6/jetty-http-10.0.6.jar", "41ea38b964318fecfeb1e7f08f45ca65"),  # nopep8
+    ("https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-io/10.0.6/jetty-io-10.0.6.jar", "ea99e5373710b2f8fb43372e48aea158"),  # nopep8
+    ("https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-security/10.0.6/jetty-security-10.0.6.jar", "a0a73ccebc9b383dfdcdaed7040ccf1a"),  # nopep8
+    ("https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-server/10.0.6/jetty-server-10.0.6.jar", "54cd76220b8e58c3b09d1a1cead39f25"),  # nopep8
+    ("https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-servlet/10.0.6/jetty-servlet-10.0.6.jar", "b94b49c288f4518c97609f484d655383"),  # nopep8
+    ("https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-servlets/10.0.6/jetty-servlets-10.0.6.jar", "3b388105ad3901bb1f55ba2801b998d3"),  # nopep8
+    ("https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-util/10.0.6/jetty-util-10.0.6.jar", "ee6565ad43292dffc713e5053678d64b"),  # nopep8
+    ("https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-util-ajax/10.0.6/jetty-util-ajax-10.0.6.jar", "948a3c0562dc8d0e714a75ba2c81cce3"),  # nopep8
 ]
 
 moduleDependencyPackages = [
@@ -188,7 +188,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.18.v20190429/jetty-jmx-9.4.18.v20190429.jar", "d599ed43d0b6a445df9b55d048f54aa5"),  # nopep8
+    ("https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-jmx/10.0.6/jetty-jmx-10.0.6.jar", "a448e0740fa14fc53d5da742c6779bdf"),  # 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.26/slf4j-api-1.7.26.jar", "60ec8751be37d54a2aa1b6178f87b968"),  # nopep8

diff --git a/build/build.xml b/build/build.xml
@@ -40,9 +40,9 @@ DEALINGS IN THE SOFTWARE.
   <property name="httpclient-version" value="4.5.9" />
   <property name="httpcore-version" value="4.4.9" />
   <property name="icu4j-version" value="58.2" />
-  <property name="javax.servlet-api-version" value="3.1.0" />
+  <property name="javax.servlet-api-version" value="4.0.1" />
   <property name="jchardet-version" value="1.0" />
-  <property name="jetty-version" value="9.4.18.v20190429" />
+  <property name="jetty-version" value="10.0.6" />
   <property name="log4j-version" value="1.2.17" />
   <property name="salvation-version" value="2.7.2" />
   <!-- module dependencies -->

diff --git a/langdetect b/langdetect
diff --git a/src/nu/validator/client/TestRunner.java b/src/nu/validator/client/TestRunner.java
@@ -43,6 +43,7 @@
 import org.xml.sax.SAXParseException;
 
 import org.eclipse.jetty.util.ajax.JSON;
+import org.eclipse.jetty.util.ajax.JSON.ReaderSource;
 
 import org.relaxng.datatype.DatatypeException;
 
@@ -450,7 +451,7 @@ private void checkTestFiles(File directory, State state)
             OutputStreamWriter out = new OutputStreamWriter(
                     new FileOutputStream(messagesFile), "utf-8");
             try (BufferedWriter bw = new BufferedWriter(out)) {
-                bw.write(JSON.toString(reportedMessages));
+                bw.write((new JSON()).toJSON(reportedMessages));
             }
         }
     }
@@ -460,7 +461,8 @@ public boolean runTestSuite() throws SAXException, Exception {
             baseDir = messagesFile.getCanonicalFile().getParentFile();
             FileInputStream fis = new FileInputStream(messagesFile);
             InputStreamReader reader = new InputStreamReader(fis, "UTF-8");
-            expectedMessages = (HashMap<String, String>) JSON.parse(reader);
+            expectedMessages = (HashMap<String, String>)
+                    (new JSON()).parse(new ReaderSource(reader));
         } else {
             baseDir = new File(System.getProperty("user.dir"));
         }