[java-identity-provider] branch main updated: Account for relocated factory beans.

[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=6073fefd4014d544732f57bd4189f64763d2804b

The following commit(s) were added to refs/heads/main by this push:
     new 6073fefd4 Account for relocated factory beans.
6073fefd4 is described below

commit 6073fefd4014d544732f57bd4189f64763d2804b
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Sep 13 11:11:47 2022 -0400

    Account for relocated factory beans.
---
 idp-conf/pom.xml                                              |  7 +++++++
 .../java/net/shibboleth/idp/test/flows/AbstractFlowTest.java  |  2 +-
 idp-conf/src/test/resources/test/test-beans.xml               | 11 +++++++++++
 idp-war/pom.xml                                               |  4 ++++
 4 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/idp-conf/pom.xml b/idp-conf/pom.xml
index b94163b48..0030dca82 100644
--- a/idp-conf/pom.xml
+++ b/idp-conf/pom.xml
@@ -120,6 +120,13 @@
             <artifactId>opensaml-storage-impl</artifactId>
             <scope>test</scope>
         </dependency>
+        
+        <dependency>
+            <groupId>${shib-shared.groupId}</groupId>
+            <artifactId>shib-security-spring</artifactId>
+            <scope>test</scope>
+        </dependency>
+        
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/AbstractFlowTest.java b/idp-conf/src/test/java/net/shibboleth/idp/test/flows/AbstractFlowTest.java
index ecf84e913..0a51ebefc 100644
--- a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/AbstractFlowTest.java
+++ b/idp-conf/src/test/java/net/shibboleth/idp/test/flows/AbstractFlowTest.java
@@ -70,12 +70,12 @@ import com.unboundid.ldap.sdk.LDAPException;
 
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-import net.shibboleth.ext.spring.factory.X509CertificateFactoryBean;
 import net.shibboleth.idp.spring.IdPPropertiesApplicationContextInitializer;
 import net.shibboleth.idp.test.InMemoryDirectory;
 import net.shibboleth.idp.test.PreferFileSystemApplicationContextInitializer;
 import net.shibboleth.idp.test.PreferFileSystemContextLoader;
 import net.shibboleth.idp.test.TestEnvironmentApplicationContextInitializer;
+import net.shibboleth.shared.spring.security.factory.X509CertificateFactoryBean;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.net.HttpServletRequestResponseContext;
diff --git a/idp-conf/src/test/resources/test/test-beans.xml b/idp-conf/src/test/resources/test/test-beans.xml
index 791073f11..1ba05366e 100644
--- a/idp-conf/src/test/resources/test/test-beans.xml
+++ b/idp-conf/src/test/resources/test/test-beans.xml
@@ -9,6 +9,17 @@
 
     default-init-method="initialize" default-destroy-method="destroy">
 
+    <bean class="net.shibboleth.ext.spring.util.RelocatedBeanFactoryPostProcessor">
+        <property name="classes">
+            <map>
+                <entry key="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean"
+                    value="net.shibboleth.shared.spring.security.factory.X509CertificateFactoryBean" />
+                <entry key="net.shibboleth.ext.spring.factory.PrivateKeyFactoryBean"
+                    value="net.shibboleth.shared.spring.security.factory.PrivateKeyFactoryBean" />
+            </map>
+        </property>
+    </bean>
+
     <bean id="test.sp.X509Certificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean"
         p:resource="classpath:/credentials/sp.crt" />
 
diff --git a/idp-war/pom.xml b/idp-war/pom.xml
index 4632346dd..fd5980825 100644
--- a/idp-war/pom.xml
+++ b/idp-war/pom.xml
@@ -234,6 +234,10 @@
             <groupId>${shib-shared.groupId}</groupId>
             <artifactId>shib-security</artifactId>
         </dependency>
+        <dependency>
+            <groupId>${shib-shared.groupId}</groupId>
+            <artifactId>shib-security-spring</artifactId>
+        </dependency>
         <dependency>
             <groupId>${shib-shared.groupId}</groupId>
             <artifactId>shib-service</artifactId>

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