[java-shib-metadata] branch main updated: JSSH-16: Update to Apache HttpClient 5.x

[Brent Putman]

This is an automated email from the git hooks/post-receive script.

putmanb pushed a commit to branch main
in repository java-shib-metadata.

View the commit online:
http://git.shibboleth.net/view/?p=java-shib-metadata.git;a=commit;h=49ed64a1cb9e5d8e18e66ee2777e96e5df0b7d32

The following commit(s) were added to refs/heads/main by this push:
     new 49ed64a1 JSSH-16: Update to Apache HttpClient 5.x
49ed64a1 is described below

commit 49ed64a1cb9e5d8e18e66ee2777e96e5df0b7d32
Author: Brent Putman <putmanb at georgetown.edu>
AuthorDate: Thu Feb 2 23:42:03 2023 -0500

    JSSH-16: Update to Apache HttpClient 5.x
    
    Initial refactor.
---
 shib-metadata-spring/pom.xml                                          | 4 ++--
 .../main/java/net/shibboleth/spring/http/HTTPResourceFactoryBean.java | 3 +--
 .../src/main/resources/schema/shibboleth-metadata.xsd                 | 4 ++--
 .../src/test/resources/net/shibboleth/spring/metadata/beans.xml       | 2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/shib-metadata-spring/pom.xml b/shib-metadata-spring/pom.xml
index 2889a434..5601d1f0 100644
--- a/shib-metadata-spring/pom.xml
+++ b/shib-metadata-spring/pom.xml
@@ -77,8 +77,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
+            <groupId>${httpclient.groupId}</groupId>
+            <artifactId>${httpclient.artifactId}</artifactId>
         </dependency>
 
         <dependency>
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/http/HTTPResourceFactoryBean.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/http/HTTPResourceFactoryBean.java
index 1cccabb1..68d59210 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/http/HTTPResourceFactoryBean.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/http/HTTPResourceFactoryBean.java
@@ -29,8 +29,7 @@ import java.util.List;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.protocol.HttpClientContext;
+import org.apache.hc.client5.http.classic.HttpClient;
 import org.cryptacular.EncodingException;
 import org.cryptacular.StreamException;
 import org.cryptacular.util.KeyPairUtil;
diff --git a/shib-metadata-spring/src/main/resources/schema/shibboleth-metadata.xsd b/shib-metadata-spring/src/main/resources/schema/shibboleth-metadata.xsd
index a5a3730f..0dec3898 100644
--- a/shib-metadata-spring/src/main/resources/schema/shibboleth-metadata.xsd
+++ b/shib-metadata-spring/src/main/resources/schema/shibboleth-metadata.xsd
@@ -155,7 +155,7 @@
                     <annotation>
                         <documentation>
 	                        The reference to an externally defined Spring bean which specifies an
-	                        org.apache.http.client.HttpClient object.
+	                        org.apache.hc.client5.http.classic.HttpClient.
 	                        
 	                        This attribute conflicts with all other settings except metadata URL
                        </documentation>
@@ -390,7 +390,7 @@
                     <annotation>
                         <documentation>
                             A reference to an externally defined Spring bean which specifies an
-                            org.apache.http.client.HttpClient object.
+                            org.apache.hc.client5.http.classic.HttpClient.
                             
                             This attribute conflicts with and overrides the other HttpClient-related properties: 
                             disregardTLSCertificate, proxyHost, proxyPort, proxyUser, proxyPassword.
diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/beans.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/beans.xml
index 8dd5bb1e..e63a756a 100644
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/beans.xml
+++ b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/beans.xml
@@ -81,7 +81,7 @@
         class="org.opensaml.security.httpclient.HttpClientSecurityParameters" />
     
     <bean id="metadata.CredentialsProvider" destroy-method=""
-        class="org.apache.http.impl.client.SystemDefaultCredentialsProvider" />
+        class="org.apache.hc.client5.http.impl.auth.SystemDefaultCredentialsProvider" />
             
     <util:set id="metadata.Indexes">
         <bean class="org.opensaml.saml.metadata.resolver.index.impl.RoleMetadataIndex" destroy-method="" />

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.