[java-oidfed-common] branch main updated: Include the default configuration property values into oidfed.properties

[Codeberg]

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

codeberg pushed a commit to branch main
in repository java-oidfed-common.

View the commit online:
https://codeberg.org/Shibboleth/java-oidfed-common/commit/fe0a7227c9fe5c88f48551e74059f644e9e38ef1

The following commit(s) were added to refs/heads/main by this push:
     new fe0a722  Include the default configuration property values into oidfed.properties
fe0a722 is described below

commit fe0a7227c9fe5c88f48551e74059f644e9e38ef1
Author: Henri Mikkonen <henri.mikkonen at iki.fi>
AuthorDate: Thu Oct 8 14:52:37 2026 +0300

    Include the default configuration property values into oidfed.properties
---
 .../main/resources/META-INF/net.shibboleth.idp/postconfig.xml |  4 ++--
 .../entity-configuration/entity-configuration-beans.xml       |  2 +-
 .../idp/flows/oidfed/resolve-entity/resolve-entity-beans.xml  |  6 +++---
 .../net/shibboleth/oidfed/conf/oidfed/oidfed.properties       | 11 +++++------
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/oidfed-common-conf-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml b/oidfed-common-conf-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml
index f33fc94..768bdd4 100644
--- a/oidfed-common-conf-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml
+++ b/oidfed-common-conf-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml
@@ -600,7 +600,7 @@
     <bean id="shibboleth.oidfed.TrustMarkStatusMetadataCache" parent="shibboleth.oidfed.CacheBuilder">
         <constructor-arg>
             <bean p:cacheId="DefaultTrustMarkStatusMetadataCache" parent="shibboleth.oidfed.TrustMarkStatusMetadataCacheBuilderSpec"
-                p:cleanupTaskInterval="%{idp.oidfed.cache.trustMarkStatus.cleanupTaskInterval:PT30S}"/>
+                p:cleanupTaskInterval="%{idp.oidfed.cache.trustMarkStatus.cleanupTaskInterval:PT5M}"/>
         </constructor-arg>
     </bean>
 
@@ -736,7 +736,7 @@
     <bean id="shibboleth.oidfed.TrustMarkMetadataCache" parent="shibboleth.oidfed.CacheBuilder">
         <constructor-arg>
             <bean p:cacheId="DefaultTrustMarkMetadataCache" parent="shibboleth.oidfed.TrustMarkMetadataCacheBuilderSpec"
-                p:cleanupTaskInterval="%{idp.oidfed.cache.trustMark.cleanupTaskInterval:PT30S}"/>
+                p:cleanupTaskInterval="%{idp.oidfed.cache.trustMark.cleanupTaskInterval:PT5M}"/>
         </constructor-arg>
     </bean>
 
diff --git a/oidfed-common-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidfed/entity-configuration/entity-configuration-beans.xml b/oidfed-common-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidfed/entity-configuration/entity-configuration-beans.xml
index c270b83..6ad7a89 100644
--- a/oidfed-common-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidfed/entity-configuration/entity-configuration-beans.xml
+++ b/oidfed-common-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidfed/entity-configuration/entity-configuration-beans.xml
@@ -20,7 +20,7 @@
     <bean id="shibboleth.oidfed.EntityConfigurationResponseMetadataCache" parent="shibboleth.oidfed.CacheBuilder">
         <constructor-arg>
             <bean p:cacheId="DefaultEntityConfigurationResponseMetadataCache" parent="shibboleth.oidfed.EntityConfigurationResponseMetadataCacheBuilderSpec"
-                p:cleanupTaskInterval="%{idp.oidfed.entityConfiguration.cleanupTaskInterval:PT5M}"/>
+                p:cleanupTaskInterval="%{idp.oidfed.entityConfiguration.cleanupTaskInterval:PT30S}"/>
         </constructor-arg>
     </bean>
 
diff --git a/oidfed-common-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidfed/resolve-entity/resolve-entity-beans.xml b/oidfed-common-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidfed/resolve-entity/resolve-entity-beans.xml
index 8ed1b1a..de1898e 100644
--- a/oidfed-common-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidfed/resolve-entity/resolve-entity-beans.xml
+++ b/oidfed-common-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidfed/resolve-entity/resolve-entity-beans.xml
@@ -106,8 +106,8 @@
 
     <bean id="shibboleth.oidfed.ResolveEntityResponseMetadataCacheBuilderSpec"
         class="net.shibboleth.oidc.metadata.cache.impl.DynamicMetadataCacheBuilderSpec"
-        p:minCacheDuration="%{idp.oidfed.cache.resolveEntity.minRefreshDelay:PT1S}"
-        p:maxCacheDuration="%{idp.oidfed.cache.resolveEntity.maxRefreshDelay:PT30S}">
+        p:minCacheDuration="%{idp.oidfed.resolveEntity.minRefreshDelay:PT1M}"
+        p:maxCacheDuration="%{idp.oidfed.resolveEntity.maxRefreshDelay:PT30M}">
         <property name="criteriaToIdentifierStrategy">
             <bean parent="shibboleth.Functions.Expression"
                 c:expression="#input?.get(T(net.shibboleth.oidfed.metadata.cache.local.ResolveEntityRequestCriterion))?.getRequest().toString()"/>
@@ -251,7 +251,7 @@
     <bean id="BuildResolveResponse"
         class="net.shibboleth.oidfed.profile.impl.BuildResolveEntityResponse" scope="prototype"
         p:identifierGeneratorLookupStrategy-ref="shibboleth.oidfed.DefaultIdentifierGenerationStrategy"
-        p:objectMapper-ref="#{'%{idp.oidfed.logging.objectMapper:shibboleth.oidfed.JWTPayloadJSONObjectMapper}'.trim()}">
+        p:objectMapper-ref="#{'%{idp.oidfed.logging.objectMapper:shibboleth.oidfed.JSONObjectMapper}'.trim()}">
         <property name="subjectLookupStrategy">
             <bean parent="shibboleth.Functions.Expression"
                 c:expression="#input.ensureInboundMessageContext().getMessage().getSubject()" />
diff --git a/oidfed-common-impl/src/main/resources/net/shibboleth/oidfed/conf/oidfed/oidfed.properties b/oidfed-common-impl/src/main/resources/net/shibboleth/oidfed/conf/oidfed/oidfed.properties
index 8520e3f..b8084c0 100644
--- a/oidfed-common-impl/src/main/resources/net/shibboleth/oidfed/conf/oidfed/oidfed.properties
+++ b/oidfed-common-impl/src/main/resources/net/shibboleth/oidfed/conf/oidfed/oidfed.properties
@@ -5,8 +5,8 @@
 #idp.oidfed.entityConfiguration.lifetime = PT24H
 #idp.oidfed.entityConfiguration.trustAnchorHintsLookupStrategy = DefaultTrustAnchorHintsLookupStrategy
 #idp.oidfed.entityConfiguration.trustMarksLookupStrategy = DefaultTrustMarksLookupStrategy
-#idp.oidfed.entityConfiguration.minRefreshDelay = PT1S
-#idp.oidfed.entityConfiguration.maxRefreshDelay = PT30S
+#idp.oidfed.entityConfiguration.minRefreshDelay = PT5S
+#idp.oidfed.entityConfiguration.maxRefreshDelay = PT5M
 #idp.oidfed.entityConfiguration.cleanupTaskInterval = PT30S
 #idp.oidfed.entityConfiguration.EntityConfigurationMetadataSkeletonLookupStrategy = DefaultEntityConfigurationMetadataSkeletonLookupStrategy
 #idp.oidfed.entityConfiguration.MetadataDecoratorManager = shibboleth.oidfed.DefaultMetadataDecoratorManager
@@ -134,9 +134,6 @@
 # resolve-entity-beans
 #idp.oidfed.resolveEntity.authn.flows = OAuth2Client
 #idp.service.logging.oidfedresolve = OIDFED.ResolveEntity
-#idp.oidfed.cache.resolveEntity.minRefreshDelay = PT1S
-#idp.oidfed.cache.resolveEntity.maxRefreshDelay = PT30S
-#idp.oidfed.resolveEntity.LocalTrustAnchorsMetadataCache = shibboleth.oidfed.LocalTrustAnchorsMetadataCache
 #idp.oidfed.resolveEntity.MetadataPolicyOperators = shibboleth.oidfed.StandardMetadataPolicyOperators
 #idp.oidfed.resolveEntity.MetadataPolicyMergingStrategy = MetadataPolicyMergingStrategy
 #idp.oidfed.resolveEntity.LocalMetadataPolicyStrategy = DefaultLocalMetadataPolicyStrategy
@@ -149,5 +146,7 @@
 #idp.oidfed.resolveEntity.targetedEndpointAsJWTAudience = true
 #idp.oidfed.resolveEntity.requireSingleJWTAudience = true
 #idp.oidfed.resolveEntity.trustchain.resolver.useResolverApiCondition = shibboleth.Conditions.FALSE
-#idp.oidfed.resolveEntity.trustchain.resolver.fallbackToLocalCondition = shibboleth.Conditions.TRUE
+#idp.oidfed.resolveEntity.trustchain.resolver.fallbackToLocalCondition = shibboleth.Conditions.FALSE
 #idp.oidfed.resolveEntity.TrustedTrustMarkIssuersOnlyCondition = shibboleth.Conditions.TRUE
+#idp.oidfed.resolveEntity.minRefreshDelay = PT1M
+#idp.oidfed.resolveEntity.maxRefreshDelay = PT30M

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