Updated to HttpClient 5.4

phax · Jan 21, 2025 · e058d87 · e058d87
1 parent c64ca2e
commit e058d87
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/as2-demo-spring-boot/pom.xml b/as2-demo-spring-boot/pom.xml
@@ -39,6 +39,10 @@
       <distribution>repo</distribution>
     </license>
   </licenses>
+
+  <properties>
+    <junit.jupiter.version>5.11.4</junit.jupiter.version>
+  </properties>
 
   <dependencies>
     <dependency>
@@ -69,6 +73,12 @@
       <version>${spring-boot.version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <version>${junit.jupiter.version}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>

diff --git a/as2-lib/src/main/java/com/helger/as2lib/util/http/AS2HttpClient.java b/as2-lib/src/main/java/com/helger/as2lib/util/http/AS2HttpClient.java
@@ -57,7 +57,8 @@
 import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
 import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager;
 import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuilder;
-import org.apache.hc.client5.http.ssl.SSLConnectionSocketFactory;
+import org.apache.hc.client5.http.ssl.DefaultClientTlsStrategy;
+import org.apache.hc.client5.http.ssl.TlsSocketStrategy;
 import org.apache.hc.core5.http.ClassicHttpRequest;
 import org.apache.hc.core5.http.ContentType;
 import org.apache.hc.core5.http.Header;
@@ -120,9 +121,9 @@ public AS2HttpClient (@Nonnull @Nonempty final String sUrl,
     final HttpClientBuilder aClientBuilder = HttpClientBuilder.create ().setDefaultRequestConfig (aRequestConf);
     if (aSSLContext != null)
     {
-      final SSLConnectionSocketFactory aSSLFactory = new SSLConnectionSocketFactory (aSSLContext, aHV);
+      final TlsSocketStrategy aTlsSocketFactory = new DefaultClientTlsStrategy (aSSLContext, aHV);
       final PoolingHttpClientConnectionManager aConnMgr = PoolingHttpClientConnectionManagerBuilder.create ()
-                                                                                                   .setSSLSocketFactory (aSSLFactory)
+                                                                                                   .setTlsSocketStrategy (aTlsSocketFactory)
                                                                                                    .build ();
       aClientBuilder.setConnectionManager (aConnMgr);
     }

diff --git a/pom.xml b/pom.xml
@@ -91,7 +91,7 @@
       <dependency>
         <groupId>com.helger.web</groupId>
         <artifactId>ph-web-parent-pom</artifactId>
-        <version>10.1.9</version>
+        <version>10.1.10-SNAPSHOT</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>