[java-identity-provider] branch main updated: IDP-2372 - Upgrade to latest SNAPSHOT on legacy system cannot find bean

[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=032a158ec0d6ab61a2836444f100502054baffdf

The following commit(s) were added to refs/heads/main by this push:
     new 032a158ec IDP-2372 - Upgrade to latest SNAPSHOT on legacy system cannot find bean
032a158ec is described below

commit 032a158ec0d6ab61a2836444f100502054baffdf
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Mar 31 10:54:10 2025 -0400

    IDP-2372 - Upgrade to latest SNAPSHOT on legacy system cannot find bean
    
    https://shibboleth.atlassian.net/browse/IDP-2372
    
    Backstop activation conditions.
---
 .../main/resources/net/shibboleth/idp/conf/subject-c14n-system.xml  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/subject-c14n-system.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/subject-c14n-system.xml
index 710feb66b..704140208 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/subject-c14n-system.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/subject-c14n-system.xml
@@ -141,7 +141,7 @@
         p:transforms="#{getObject('shibboleth.NameTransforms')}" />
 
     <bean id="c14n/SAML2Transform" class="net.shibboleth.idp.saml.nameid.impl.NameIDCanonicalization"
-        p:activationCondition-ref="shibboleth.NameTransformPredicate"
+        p:activationCondition="#{getObject('shibboleth.NameTransformPredicate') ?: getObject('shibboleth.Conditions.FALSE')}"
         p:formats="#{getObject('shibboleth.NameTransformFormats')}"
         p:decoder="#{getObject('shibboleth.SAML2Transform.NameIDDecoder') ?: getObject('TransformingNameIDDecoder')}" />
 
@@ -152,7 +152,7 @@
         p:transforms="#{getObject('shibboleth.ProxyNameTransforms')}" />
 
     <bean id="c14n/SAML2ProxyTransform" class="net.shibboleth.idp.saml.nameid.impl.NameIDCanonicalization"
-        p:activationCondition-ref="shibboleth.ProxyNameTransformPredicate"
+        p:activationCondition="#{getObject('shibboleth.ProxyNameTransformPredicate') ?: getObject('shibboleth.Conditions.FALSE')}"
         p:formats="#{getObject('shibboleth.ProxyNameTransformFormats')}"
         p:decoder="#{getObject('shibboleth.SAML2ProxyTransform.NameIDDecoder') ?: getObject('ProxyTransformingNameIDDecoder')}" />
                
@@ -163,7 +163,7 @@
         p:transforms="#{getObject('shibboleth.NameTransforms')}" />
 
     <bean id="c14n/SAML1Transform" class="net.shibboleth.idp.saml.nameid.impl.NameIdentifierCanonicalization"
-        p:activationCondition-ref="shibboleth.NameTransformPredicate"
+        p:activationCondition="#{getObject('shibboleth.NameTransformPredicate') ?: getObject('shibboleth.Conditions.FALSE')}"
         p:formats="#{getObject('shibboleth.NameTransformFormats')}"
         p:decoder="#{getObject('shibboleth.SAML1Transform.NameIdentifierDecoder') ?: getObject('TransformingNameIdentifierDecoder')}" />
      

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