[java-shib-metadata] branch main updated: Rename httpclient package.
Scott Cantor
cantor.2 at osu.edu
Wed Sep 21 15:13:21 UTC 2022
This is an automated email from the git hooks/post-receive script.
scantor 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=3094e23af1058b6cc36cdea2b5a758a3d49a64d4
The following commit(s) were added to refs/heads/main by this push:
new 3094e23af Rename httpclient package.
3094e23af is described below
commit 3094e23af1058b6cc36cdea2b5a758a3d49a64d4
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Sep 21 11:13:19 2022 -0400
Rename httpclient package.
---
.../main/java/net/shibboleth/spring/http/HTTPResourceFactoryBean.java | 2 +-
.../src/test/resources/net/shibboleth/spring/http/HTTPResources.xml | 2 +-
.../src/test/resources/net/shibboleth/spring/metadata/httpClient.xml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
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 6c21abd17..45cec07c7 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
@@ -53,11 +53,11 @@ import org.springframework.beans.FatalBeanException;
import org.springframework.beans.factory.config.AbstractFactoryBean;
import org.springframework.core.io.Resource;
+import net.shibboleth.shared.httpclient.HttpClientContextHandler;
import net.shibboleth.shared.spring.httpclient.resource.FileBackedHTTPResource;
import net.shibboleth.shared.spring.httpclient.resource.HTTPResource;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.httpclient.HttpClientContextHandler;
/**
* Factory bean for simple use cases that auto-configure PKIX or key pinning for
diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/http/HTTPResources.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/http/HTTPResources.xml
index 9231eeccc..21a2ca6af 100644
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/http/HTTPResources.xml
+++ b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/http/HTTPResources.xml
@@ -9,7 +9,7 @@
p:placeholderPrefix="%{" p:placeholderSuffix="}" />
<bean id="clientBuilder"
- class="net.shibboleth.utilities.java.support.httpclient.FileCachingHttpClientBuilder"
+ class="net.shibboleth.shared.httpclient.FileCachingHttpClientBuilder"
p:maxCacheEntries="3" p:cacheDirectory-ref="theDir" />
<bean id="basicClient" factory-bean="clientBuilder" init-method="initialize" destroy-method="destroy"
diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/httpClient.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/httpClient.xml
index ad95533d9..9a4162673 100644
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/httpClient.xml
+++ b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/httpClient.xml
@@ -7,7 +7,7 @@
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
- <bean id="clientBuilder" class="net.shibboleth.utilities.java.support.httpclient.HttpClientBuilder"
+ <bean id="clientBuilder" class="net.shibboleth.shared.httpclient.HttpClientBuilder"
p:userAgent="disguised/1.0.0 hidden/3.4.5" lazy-init="true"/>
<bean id="apacheClient"
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list