[java-shib-shared] branch main updated: Update test for Spring Framework 6.1-M4

[Ian Young]

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

iay pushed a commit to branch main
in repository java-shib-shared.

View the commit online:
http://git.shibboleth.net/view/?p=java-shib-shared.git;a=commit;h=235ff4ca7874c216ea19c55092e3080f801e4a29

The following commit(s) were added to refs/heads/main by this push:
     new 235ff4ca Update test for Spring Framework 6.1-M4
235ff4ca is described below

commit 235ff4ca7874c216ea19c55092e3080f801e4a29
Author: Ian Young <ian at iay.org.uk>
AuthorDate: Thu Aug 17 14:57:48 2023 +0100

    Update test for Spring Framework 6.1-M4
    
    Spring Framework will no longer convert from a
    singleton String all the way to a List<Resource>;
    make the List part explicit.
    
    https://github.com/spring-projects/spring-framework/issues/24845
---
 .../net/shibboleth/shared/spring/service/ReloadableBeans1.xml     | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/shib-service/src/test/resources/net/shibboleth/shared/spring/service/ReloadableBeans1.xml b/shib-service/src/test/resources/net/shibboleth/shared/spring/service/ReloadableBeans1.xml
index f7aac823..27ebbc2e 100644
--- a/shib-service/src/test/resources/net/shibboleth/shared/spring/service/ReloadableBeans1.xml
+++ b/shib-service/src/test/resources/net/shibboleth/shared/spring/service/ReloadableBeans1.xml
@@ -26,8 +26,7 @@
     -->
     <beans profile="default">
         <bean id="reloadableBeanService" class="net.shibboleth.shared.spring.service.ReloadableSpringService"
-                p:beanProfiles="reloadable"
-                p:serviceConfigurations="classpath:/net/shibboleth/shared/spring/service/ReloadableBeans1.xml">
+                p:beanProfiles="reloadable">
             <constructor-arg name="claz" value="org.springframework.context.ApplicationContext" />
             <constructor-arg name="strategy">
                 <bean class="net.shibboleth.shared.spring.service.ApplicationContextServiceStrategy" />
@@ -35,6 +34,11 @@
             <property name="beanFactoryPostProcessors">
                 <bean class="net.shibboleth.shared.service.reloadable.NonReloadableExcluder" />
             </property>
+            <property name="serviceConfigurations">
+                <list>
+                    <value>classpath:/net/shibboleth/shared/spring/service/ReloadableBeans1.xml</value>
+                </list>
+            </property>
         </bean>
 
 	    <bean class="org.springframework.beans.factory.config.CustomScopeConfigurer">

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