NTLM scheme deprecated and disabled by default

apache · Aug 12, 2023 · 83c6079 · 83c6079
1 parent 8aa4fbc
commit 83c6079
Show file tree

Hide file tree

Showing 40 changed files with 72 additions and 1,238 deletions.
diff --git a/BUILDING.txt b/BUILDING.txt
@@ -30,7 +30,6 @@ The JAR packages can be found in the target folders of their respective modules
 httpclient5/target/httpclient5-<VERSION>.jar
 httpclient5-cache/target/httpclient5-cache-<VERSION>.jar
 httpclient5-fluent/target/httpclient5-fluent-<VERSION>.jar
-httpclient5-win/target/httpclient5-win-<VERSION>.jar
 httpclient5-osgi/target/org.apache.httpcomponents.httpclient_<VERSION>.jar
 
 where <VERSION> is the release version

diff --git a/...rc/test/java/org/apache/hc/client5/http/impl/cache/TestByteArrayCacheEntrySerializer.java b/...rc/test/java/org/apache/hc/client5/http/impl/cache/TestByteArrayCacheEntrySerializer.java
@@ -52,6 +52,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+@SuppressWarnings("deprecation")
 public class TestByteArrayCacheEntrySerializer {
 
     private ByteArrayCacheEntrySerializer impl;

diff --git a/httpclient5-fluent/src/main/java/org/apache/hc/client5/http/fluent/Executor.java b/httpclient5-fluent/src/main/java/org/apache/hc/client5/http/fluent/Executor.java
@@ -33,7 +33,6 @@
 import org.apache.hc.client5.http.auth.AuthScope;
 import org.apache.hc.client5.http.auth.Credentials;
 import org.apache.hc.client5.http.auth.CredentialsStore;
-import org.apache.hc.client5.http.auth.NTCredentials;
 import org.apache.hc.client5.http.auth.UsernamePasswordCredentials;
 import org.apache.hc.client5.http.config.ConnectionConfig;
 import org.apache.hc.client5.http.cookie.CookieStore;
@@ -186,10 +185,14 @@ public Executor auth(final HttpHost host,
         return auth(host, new UsernamePasswordCredentials(username, password));
     }
 
+    /**
+     * @deprecated Use {@link #auth(HttpHost, String, char[])}.
+     */
+    @Deprecated
     public Executor auth(final HttpHost host,
             final String username, final char[] password,
             final String workstation, final String domain) {
-        return auth(host, new NTCredentials(username, password, workstation, domain));
+        return auth(host, new org.apache.hc.client5.http.auth.NTCredentials(username, password, workstation, domain));
     }
 
     public Executor clearAuth() {

diff --git a/httpclient5-testing/pom.xml b/httpclient5-testing/pom.xml
@@ -77,11 +77,6 @@
       <artifactId>httpclient5-fluent</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.httpcomponents.client5</groupId>
-      <artifactId>httpclient5-win</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-params</artifactId>

diff --git a/...src/test/java/org/apache/hc/client5/http/impl/win/WindowsNegotiateSchemeGetTokenFail.java b/...src/test/java/org/apache/hc/client5/http/impl/win/WindowsNegotiateSchemeGetTokenFail.java
diff --git a/...ng/src/test/java/org/apache/hc/client5/testing/sync/TestClientAuthenticationFakeNTLM.java b/...ng/src/test/java/org/apache/hc/client5/testing/sync/TestClientAuthenticationFakeNTLM.java
diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestSPNegoScheme.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestSPNegoScheme.java
@@ -125,6 +125,7 @@ protected GSSManager getManager() {
 
     }
 
+    @SuppressWarnings("deprecation")
     private static class UseJaasCredentials implements Credentials {
 
         @Override
-Original file line number
+Diff line change
@@ Expand Up / @@ -125,6 +125,7 @@ protected GSSManager getManager() { @@
         }
+        @SuppressWarnings("deprecation")
         private static class UseJaasCredentials implements Credentials {
             @Override
@@ Expand Down @@