Revert "Add Jetty backend HTTP/2 support (clear text, h2c)"

This reverts commit 969c883.
validator · Sep 1, 2021 · be0bcb0 · be0bcb0
1 parent f86bde2
commit be0bcb0
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 13 deletions.
diff --git a/.classpath b/.classpath
@@ -45,7 +45,7 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="lib" path="dependencies/salvation-2.7.1.jar"/>
-	<classpathentry kind="lib" path="dependencies/javax.servlet-api-3.1.0.jar">
+        <classpathentry kind="lib" path="dependencies/javax.servlet-api-4.0.1.jar">
 		<attributes>
 			<attribute name="javadoc_location" value="http://docs.oracle.com/javaee/7/api/"/>
 		</attributes>

diff --git a/build/build.py b/build/build.py
@@ -165,9 +165,6 @@
     ("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/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
@@ -195,7 +192,6 @@
     ("https://repo1.maven.org/maven2/org/slf4j/slf4j-log4j12/1.7.9/slf4j-log4j12-1.7.9.jar", "54528e0b3ea7656072a9b591248c6457"),  # nopep8
 ]
 
-
 javaSafeNamePat = re.compile(r'[^a-zA-Z0-9]')
 directoryPat = re.compile(r'^[a-zA-Z0-9_-]+/$')
 leafPat = re.compile(r'^[a-zA-Z0-9_-]+\.[a-z]+$')

diff --git a/build/build.xml b/build/build.xml
@@ -75,11 +75,6 @@ DEALINGS IN THE SOFTWARE.
       <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/http2-common-${jetty-version}.jar"/>
-      <zipfileset src="../dependencies/http2-hpack-${jetty-version}.jar">
-        <exclude name="META-INF/services/**"/>
-      </zipfileset>
-      <zipfileset src="../dependencies/http2-server-${jetty-version}.jar"/>
       <zipfileset src="../dependencies/httpclient-${httpclient-version}.jar"/>
       <zipfileset src="../dependencies/httpcore-${httpcore-version}.jar"/>
       <zipfileset src="../dependencies/icu4j-${icu4j-version}.jar"/>

diff --git a/src/nu/validator/servlet/Main.java b/src/nu/validator/servlet/Main.java
@@ -45,7 +45,6 @@
 import org.apache.log4j.Logger;
 import org.apache.log4j.PatternLayout;
 import org.apache.log4j.PropertyConfigurator;
-import org.eclipse.jetty.http2.server.HTTP2CServerConnectionFactory;
 import org.eclipse.jetty.server.Connector;
 import org.eclipse.jetty.server.HttpConfiguration;
 import org.eclipse.jetty.server.HttpConnectionFactory;
@@ -189,8 +188,7 @@ public static void main(String[] args) throws Exception {
         server.setHandler(gzipHandler);
 
         ServerConnector serverConnector = new ServerConnector(server,
-                new HttpConnectionFactory(new HttpConfiguration()),
-                new HTTP2CServerConnectionFactory(new HttpConfiguration()));
+                new HttpConnectionFactory(new HttpConfiguration()));
         int port = args.length > 0 ? Integer.parseInt(args[0]) : 8888;
         serverConnector.setPort(port);
         serverConnector.setHost(BIND_ADDRESS);