[java-identity-provider] branch main updated: Relocation entries for SpEL 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=6d747c810c908a1d2a725402ef5eb26e0d49dc89

The following commit(s) were added to refs/heads/main by this push:
     new 6d747c810 Relocation entries for SpEL classes.
6d747c810 is described below

commit 6d747c810c908a1d2a725402ef5eb26e0d49dc89
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Sep 14 12:55:35 2022 -0400

    Relocation entries for SpEL classes.
---
 .../main/resources/net/shibboleth/idp/conf/audit-system.xml |  2 +-
 .../resources/net/shibboleth/idp/conf/global-system.xml     | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/audit-system.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/audit-system.xml
index ff0243112..517ca3088 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/audit-system.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/audit-system.xml
@@ -957,7 +957,7 @@
                     </key>
                     <bean parent="shibboleth.Functions.Compose">
                         <constructor-arg name="g">
-                            <bean class="net.shibboleth.shared.spring.expression.SpringExpressionFunction"
+                            <bean parent="shibboleth.Functions.Expression"
                                 p:inputType="org.opensaml.messaging.context.MessageContext" p:outputType="java.net.URI" p:hideExceptions="true"
                                 c:_0="#input != null ? T(org.opensaml.saml.common.binding.SAMLBindingSupport).getEndpointURL(#input) : null" />
                         </constructor-arg>
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/global-system.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/global-system.xml
index fd7678bc3..d79914827 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/global-system.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/global-system.xml
@@ -61,6 +61,19 @@
                     value="net.shibboleth.shared.spring.httpclient.resource.HTTPResource" />
                 <entry key="net.shibboleth.ext.spring.resource.FileBackedHTTPResource"
                     value="net.shibboleth.shared.spring.httpclient.resource.FileBackedHTTPResource" />
+                    
+                <entry key="net.shibboleth.ext.spring.util.SpringExpressionBiConsumer"
+                    value="net.shibboleth.shared.spring.expression.SpringExpressionBiConsumer" />
+                <entry key="net.shibboleth.ext.spring.util.SpringExpressionBiFunction"
+                    value="net.shibboleth.shared.spring.expression.SpringExpressionBiFunction" />
+                <entry key="net.shibboleth.ext.spring.util.SpringExpressionBiPredicate"
+                    value="net.shibboleth.shared.spring.expression.SpringExpressionBiPredicate" />
+                <entry key="net.shibboleth.ext.spring.util.SpringExpressionConsumer"
+                    value="net.shibboleth.shared.spring.expression.SpringExpressionConsumer" />
+                <entry key="net.shibboleth.ext.spring.util.SpringExpressionFunction"
+                    value="net.shibboleth.shared.spring.expression.SpringExpressionFunction" />
+                <entry key="net.shibboleth.ext.spring.util.SpringExpressionPredicate"
+                    value="net.shibboleth.shared.spring.expression.SpringExpressionPredicate" />
             </map>
         </property>
     </bean>

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