[java-identity-provider] branch main updated: Relocated HTTPResource classes.

[Scott Cantor]

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

scantor pushed a commit to branch main
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=ff510c5e08b5ad3895de47002e9197b02daa12dd

The following commit(s) were added to refs/heads/main by this push:
     new ff510c5e0 Relocated HTTPResource classes.
ff510c5e0 is described below

commit ff510c5e08b5ad3895de47002e9197b02daa12dd
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Sep 13 14:35:05 2022 -0400

    Relocated HTTPResource classes.
---
 idp-installer/pom.xml                                               | 6 ++++++
 .../net/shibboleth/idp/installer/plugin/impl/PluginInstaller.java   | 2 +-
 .../shibboleth/idp/installer/plugin/impl/PluginInstallerCLI.java    | 2 +-
 .../java/net/shibboleth/idp/installer/plugin/impl/PluginState.java  | 2 +-
 .../net/shibboleth/idp/installer/plugin/impl/PluginCLITest.java     | 2 +-
 idp-war/pom.xml                                                     | 4 ++++
 6 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/idp-installer/pom.xml b/idp-installer/pom.xml
index 3abf8c2ce..aabda839e 100644
--- a/idp-installer/pom.xml
+++ b/idp-installer/pom.xml
@@ -55,6 +55,12 @@
             <artifactId>shib-networking</artifactId>
             <scope>provided</scope>
         </dependency>
+
+        <dependency>
+            <groupId>${shib-shared.groupId}</groupId>
+            <artifactId>shib-networking-spring</artifactId>
+            <scope>provided</scope>
+        </dependency>
         
         <dependency>
             <groupId>${shib-shared.groupId}</groupId>
diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstaller.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstaller.java
index 5eb2fa2cd..f9ea496a0 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstaller.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstaller.java
@@ -67,7 +67,6 @@ import org.slf4j.Logger;
 
 import com.google.common.base.Predicates;
 
-import net.shibboleth.ext.spring.resource.HTTPResource;
 import net.shibboleth.idp.Version;
 import net.shibboleth.idp.installer.BuildWar;
 import net.shibboleth.idp.installer.InstallerSupport;
@@ -81,6 +80,7 @@ import net.shibboleth.idp.module.ModuleContext;
 import net.shibboleth.idp.module.ModuleException;
 import net.shibboleth.idp.plugin.IdPPlugin;
 import net.shibboleth.idp.plugin.PluginVersion;
+import net.shibboleth.shared.spring.httpclient.resource.HTTPResource;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
 import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 import net.shibboleth.utilities.java.support.component.AbstractInitializableComponent;
diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstallerCLI.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstallerCLI.java
index a51cf5778..0774d5374 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstallerCLI.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstallerCLI.java
@@ -47,13 +47,13 @@ import org.springframework.core.io.FileSystemResource;
 import org.springframework.core.io.Resource;
 
 import net.shibboleth.ext.spring.cli.AbstractCommandLine;
-import net.shibboleth.ext.spring.resource.HTTPResource;
 import net.shibboleth.idp.Version;
 import net.shibboleth.idp.cli.AbstractIdPHomeAwareCommandLine;
 import net.shibboleth.idp.installer.impl.InstallationLogger;
 import net.shibboleth.idp.installer.plugin.impl.PluginState.VersionInfo;
 import net.shibboleth.idp.plugin.IdPPlugin;
 import net.shibboleth.idp.plugin.PluginSupport.SupportLevel;
+import net.shibboleth.shared.spring.httpclient.resource.HTTPResource;
 import net.shibboleth.idp.plugin.PluginVersion;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginState.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginState.java
index f745cca11..d1d2f4987 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginState.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginState.java
@@ -29,10 +29,10 @@ import org.slf4j.Logger;
 import org.springframework.core.io.FileSystemResource;
 import org.springframework.core.io.Resource;
 
-import net.shibboleth.ext.spring.resource.HTTPResource;
 import net.shibboleth.idp.installer.impl.InstallationLogger;
 import net.shibboleth.idp.plugin.IdPPlugin;
 import net.shibboleth.idp.plugin.PluginSupport.SupportLevel;
+import net.shibboleth.shared.spring.httpclient.resource.HTTPResource;
 import net.shibboleth.idp.plugin.PluginVersion;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
 import net.shibboleth.utilities.java.support.component.AbstractInitializableComponent;
diff --git a/idp-installer/src/test/java/net/shibboleth/idp/installer/plugin/impl/PluginCLITest.java b/idp-installer/src/test/java/net/shibboleth/idp/installer/plugin/impl/PluginCLITest.java
index a9ab4d1c2..30fe735db 100644
--- a/idp-installer/src/test/java/net/shibboleth/idp/installer/plugin/impl/PluginCLITest.java
+++ b/idp-installer/src/test/java/net/shibboleth/idp/installer/plugin/impl/PluginCLITest.java
@@ -33,8 +33,8 @@ import org.testng.annotations.BeforeSuite;
 import org.testng.annotations.Test;
 
 import net.shibboleth.ext.spring.cli.AbstractCommandLine;
-import net.shibboleth.ext.spring.resource.HTTPResource;
 import net.shibboleth.idp.installer.ProgressReportingOutputStream;
+import net.shibboleth.shared.spring.httpclient.resource.HTTPResource;
 import net.shibboleth.utilities.java.support.httpclient.HttpClientBuilder;
 
 @SuppressWarnings("javadoc")
diff --git a/idp-war/pom.xml b/idp-war/pom.xml
index fd5980825..d580049e6 100644
--- a/idp-war/pom.xml
+++ b/idp-war/pom.xml
@@ -230,6 +230,10 @@
             <groupId>${shib-shared.groupId}</groupId>
             <artifactId>shib-networking</artifactId>
         </dependency>
+        <dependency>
+            <groupId>${shib-shared.groupId}</groupId>
+            <artifactId>shib-networking-spring</artifactId>
+        </dependency>
         <dependency>
             <groupId>${shib-shared.groupId}</groupId>
             <artifactId>shib-security</artifactId>

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