Migrate from Apache HttpClient to JDK 11 HttpClient

README.md

@@ -18,19 +18,8 @@ I suggest you use a well tested proxy instead of something non-tested that is pe
 
 If you need something more sophisticated than there are some alternatives listed at the bottom of this page.
 
-This proxy depends on [Apache HttpClient](http://hc.apache.org/httpcomponents-client-ga/), which offers another point of extension for this proxy.
-At some point I may write an alternative that uses the JDK and thus doesn't have any dependencies, which is desirable.
-In the meantime, you'll have to add the jar files for this and its dependencies:
-
-     +- org.apache.httpcomponents:httpclient:jar:4.5.13:compile
-        +- org.apache.httpcomponents:httpcore:jar:4.4.13:compile
-        |  +- commons-logging:commons-logging:jar:1.2:compile
-        |  \- commons-codec:commons-codec:jar:1.11:compile
-
-This proxy supports HttpClient 4.5, and newer version too.
-If you need to support _older_ HttpClient versions:
-* use 1.8 version of this proxy for HttpClient versions 4.1 and 4.2
-* use 1.12 version of this proxy for HttpClient versions 4.3 and 4.4
+This proxy now uses the JDK 11 HttpClient and is dependency-free (aside from the servlet API). 
+Previous versions used Apache HttpClient.
 
 As of version 2.0 of the proxy, the proxy switched to the `jakarta servlet-api`, while nonetheless retaining support for the `javax servlet-api` version for those that need it.  To use that, specify the `javax` classifier on the dependency declaration as follows:
 ```xml

pom.xml

@@ -40,11 +40,6 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-
-    <!-- works with v4.3 and forward; see .github/workflows/maven.yml -->
-    <httpclient.version>[4.5.14,5.0)</httpclient.version>
-    <!-- the last version to provide LocalTestServer.java -->
-    <httpclient.test.version>4.3.6</httpclient.test.version>
   </properties>
 
   <!-- To check for new plugins and dependencies:
@@ -61,27 +56,13 @@
       <scope>provided</scope>
     </dependency>
 
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpclient</artifactId>
-      <version>${httpclient.version}</version>
-    </dependency>
-
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>4.13.2</version>
       <scope>test</scope>
     </dependency>
 
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpclient</artifactId>
-      <version>${httpclient.test.version}</version>
-      <classifier>tests</classifier>
-      <scope>test</scope>
-    </dependency>
-
     <dependency>
       <groupId>com.github.hazendaz.httpunit</groupId>
       <artifactId>httpunit</artifactId>
@@ -159,17 +140,10 @@
               <Bundle-Name>${project.artifactId}</Bundle-Name>
               <Bundle-SymbolicName>org.mitre.dsmiley.http-proxy-servlet</Bundle-SymbolicName>
               <Export-Package>org.mitre.dsmiley.httpproxy;version="0"</Export-Package>
-              <Import-Package>org.apache.http;version="0",
- org.apache.http.client;version="0",
- org.apache.http.entity;version="0",
- org.apache.http.impl.client;version="0",
- org.apache.http.message;version="0",
- org.apache.http.util; version="0",
- org.apache.http.client.utils;version="0",
- org.apache.http.client.methods;version="0",
- jakarta.servlet;version="0",
+              <Import-Package>jakarta.servlet;version="0",
  jakarta.servlet.http;version="0",
- javax.net.ssl;version="0", org.apache.http.client.config;version="0"</Import-Package>
+ javax.net.ssl;version="0",
+ java.net.http;version="0"</Import-Package>
             </manifestEntries>
           </archive>
         </configuration>