[java-identity-provider] branch main updated: JSSH-71 Remove the impact of the DestructableComponent Interface
Codeberg
noreply at shibboleth.net
Mon Jul 27 13:06:36 UTC 2026
This is an automated email from the git hooks/post-receive script.
codeberg pushed a commit to branch main
in repository java-identity-provider.
View the commit online:
https://codeberg.org/Shibboleth/java-identity-provider/commit/60600ed6fd4174b524576dfeed08365f25b49927
The following commit(s) were added to refs/heads/main by this push:
new 60600ed6f JSSH-71 Remove the impact of the DestructableComponent Interface
60600ed6f is described below
commit 60600ed6fd4174b524576dfeed08365f25b49927
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Mon Jul 27 14:07:34 2026 +0100
JSSH-71 Remove the impact of the DestructableComponent Interface
https://shibboleth.atlassian.net/browse/JSSH-71
Remove default-destroy-method testbed test configuration.
---
.../test/resources/net/shibboleth/idp/module/conf/access-control.xml | 3 +--
.../resources/net/shibboleth/idp/module/conf/attribute-registry.xml | 3 +--
.../net/shibboleth/idp/module/conf/attributes/default-rules.xml | 3 +--
.../net/shibboleth/idp/module/conf/attributes/oidc-claim-rules.xml | 3 +--
.../net/shibboleth/idp/module/conf/authn/password-authn-config.xml | 3 +--
.../src/test/resources/net/shibboleth/idp/module/conf/credentials.xml | 3 +--
.../src/test/resources/net/shibboleth/idp/module/conf/global.xml | 3 +--
.../net/shibboleth/idp/module/conf/intercept/profile-intercept.xml | 3 +--
.../src/test/resources/net/shibboleth/idp/module/conf/mvc-beans.xml | 3 +--
.../net/shibboleth/idp/module/conf/oidc-clientinfo-resolvers.xml | 1 -
.../test/resources/net/shibboleth/idp/module/conf/oidc-credentials.xml | 2 +-
.../test/resources/net/shibboleth/idp/module/conf/relying-party.xml | 3 +--
idp-conf-impl/src/test/resources/test/override-beans.xml | 2 +-
idp-conf-impl/src/test/resources/test/test-beans.xml | 2 +-
idp-conf-impl/src/test/resources/test/test-cas-beans.xml | 2 +-
idp-conf-impl/src/test/resources/test/test-cas-error-beans.xml | 2 +-
idp-conf-impl/src/test/resources/test/test-relying-party-cas.xml | 2 +-
17 files changed, 16 insertions(+), 27 deletions(-)
diff --git a/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/access-control.xml b/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/access-control.xml
index c20cfc00a..4fa75b8da 100644
--- a/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/access-control.xml
+++ b/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/access-control.xml
@@ -9,8 +9,7 @@
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
- default-init-method="initialize"
- default-destroy-method="destroy">
+ default-init-method="initialize">
<!--
Map of access control policies used to limit access to administrative functions.
diff --git a/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/attribute-registry.xml b/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/attribute-registry.xml
index 026da9ce1..ae017c639 100644
--- a/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/attribute-registry.xml
+++ b/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/attribute-registry.xml
@@ -9,8 +9,7 @@
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
- default-init-method="initialize"
- default-destroy-method="destroy">
+ default-init-method="initialize">
<!--
The system comes preconfigured to load rules directly from resource files
diff --git a/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/attributes/default-rules.xml b/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/attributes/default-rules.xml
index e012a3a4f..a27663203 100644
--- a/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/attributes/default-rules.xml
+++ b/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/attributes/default-rules.xml
@@ -9,8 +9,7 @@
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
- default-init-method="initialize"
- default-destroy-method="destroy">
+ default-init-method="initialize">
<!-- Default Attribute transcoding rules. -->
diff --git a/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/attributes/oidc-claim-rules.xml b/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/attributes/oidc-claim-rules.xml
index 9de853b27..127e4c2f1 100644
--- a/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/attributes/oidc-claim-rules.xml
+++ b/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/attributes/oidc-claim-rules.xml
@@ -9,8 +9,7 @@
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
- default-init-method="initialize"
- default-destroy-method="destroy">
+ default-init-method="initialize">
<!-- https://openid.net/specs/openid-connect-core-1_0.html#StandardClaims -->
diff --git a/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/authn/password-authn-config.xml b/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/authn/password-authn-config.xml
index 32ddfe457..e2db2b93b 100644
--- a/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/authn/password-authn-config.xml
+++ b/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/authn/password-authn-config.xml
@@ -9,8 +9,7 @@
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
- default-init-method="initialize"
- default-destroy-method="destroy">
+ default-init-method="initialize">
<!-- Ordered list of CredentialValidators to apply to a request. -->
<util:list id="shibboleth.authn.Password.Validators">
diff --git a/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/credentials.xml b/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/credentials.xml
index 3bedfdb3c..0f2ab62e1 100644
--- a/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/credentials.xml
+++ b/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/credentials.xml
@@ -9,8 +9,7 @@
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
- default-init-method="initialize"
- default-destroy-method="destroy">
+ default-init-method="initialize">
<!--
This defines the signing and encryption key and certificate pairs referenced by your relying-party.xml
diff --git a/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/global.xml b/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/global.xml
index 63a458396..4054b9f92 100644
--- a/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/global.xml
+++ b/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/global.xml
@@ -11,8 +11,7 @@
http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
- default-init-method="initialize"
- default-destroy-method="destroy">
+ default-init-method="initialize">
<!-- Use this file to define any custom beans needed globally. -->
diff --git a/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/intercept/profile-intercept.xml b/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/intercept/profile-intercept.xml
index 5c0217b0e..b92359a19 100644
--- a/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/intercept/profile-intercept.xml
+++ b/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/intercept/profile-intercept.xml
@@ -9,8 +9,7 @@
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
- default-init-method="initialize"
- default-destroy-method="destroy">
+ default-init-method="initialize">
<!-- The tests rely on this bean being available. -->
diff --git a/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/mvc-beans.xml b/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/mvc-beans.xml
index 60d5a7114..f31da31ea 100644
--- a/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/mvc-beans.xml
+++ b/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/mvc-beans.xml
@@ -11,8 +11,7 @@
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
- default-init-method="initialize"
- default-destroy-method="destroy">
+ default-init-method="initialize">
<mvc:interceptors>
<bean id="localeChangeInterceptor" class="org.springframework.web.servlet.i18n.LocaleChangeInterceptor">
diff --git a/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/oidc-clientinfo-resolvers.xml b/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/oidc-clientinfo-resolvers.xml
index ec066f823..fb109f325 100644
--- a/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/oidc-clientinfo-resolvers.xml
+++ b/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/oidc-clientinfo-resolvers.xml
@@ -10,7 +10,6 @@
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
default-init-method="initialize"
- default-destroy-method="destroy"
default-lazy-init="true">
<!--
diff --git a/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/oidc-credentials.xml b/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/oidc-credentials.xml
index b08896ca1..3a5e86093 100644
--- a/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/oidc-credentials.xml
+++ b/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/oidc-credentials.xml
@@ -7,7 +7,7 @@
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
- default-init-method="initialize" default-destroy-method="destroy">
+ default-init-method="initialize">
<!--
This file contains default OIDC signing credentials. This file should be imported into credentials.xml.
diff --git a/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/relying-party.xml b/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/relying-party.xml
index cc7bc4b70..37fb0599a 100644
--- a/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/relying-party.xml
+++ b/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/relying-party.xml
@@ -9,8 +9,7 @@
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
- default-init-method="initialize"
- default-destroy-method="destroy">
+ default-init-method="initialize">
<!--
Unverified RP configuration, defaults to no support for any profiles. Add <ref> elements to the list
diff --git a/idp-conf-impl/src/test/resources/test/override-beans.xml b/idp-conf-impl/src/test/resources/test/override-beans.xml
index 1eeb1e09a..4017c7840 100644
--- a/idp-conf-impl/src/test/resources/test/override-beans.xml
+++ b/idp-conf-impl/src/test/resources/test/override-beans.xml
@@ -7,7 +7,7 @@
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
- default-init-method="initialize" default-destroy-method="destroy">
+ default-init-method="initialize">
<!-- Override beans from conf/subject-c14n.xml. -->
diff --git a/idp-conf-impl/src/test/resources/test/test-beans.xml b/idp-conf-impl/src/test/resources/test/test-beans.xml
index fb0e7a8ea..c68a33c4d 100644
--- a/idp-conf-impl/src/test/resources/test/test-beans.xml
+++ b/idp-conf-impl/src/test/resources/test/test-beans.xml
@@ -7,7 +7,7 @@
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
- default-init-method="initialize" default-destroy-method="destroy">
+ default-init-method="initialize">
<bean id="test.sp.X509Certificate" class="net.shibboleth.shared.spring.security.factory.X509CertificateFactoryBean"
p:resource="classpath:/credentials/sp.crt" />
diff --git a/idp-conf-impl/src/test/resources/test/test-cas-beans.xml b/idp-conf-impl/src/test/resources/test/test-cas-beans.xml
index 78624a4d7..4bdd53e63 100644
--- a/idp-conf-impl/src/test/resources/test/test-cas-beans.xml
+++ b/idp-conf-impl/src/test/resources/test/test-cas-beans.xml
@@ -7,7 +7,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
- default-init-method="initialize" default-destroy-method="destroy">
+ default-init-method="initialize">
<bean id="shibboleth.SessionManager" class="net.shibboleth.idp.session.impl.StorageBackedSessionManager"
depends-on="shibboleth.OpenSAMLConfig"
diff --git a/idp-conf-impl/src/test/resources/test/test-cas-error-beans.xml b/idp-conf-impl/src/test/resources/test/test-cas-error-beans.xml
index 34a5b2ce7..cebef5911 100644
--- a/idp-conf-impl/src/test/resources/test/test-cas-error-beans.xml
+++ b/idp-conf-impl/src/test/resources/test/test-cas-error-beans.xml
@@ -5,7 +5,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"
- default-init-method="initialize" default-destroy-method="destroy">
+ default-init-method="initialize">
<bean id="throwingTicketService" class="net.shibboleth.idp.test.flows.cas.ThrowingTicketService" />
diff --git a/idp-conf-impl/src/test/resources/test/test-relying-party-cas.xml b/idp-conf-impl/src/test/resources/test/test-relying-party-cas.xml
index a0dcfc40c..aaf270020 100644
--- a/idp-conf-impl/src/test/resources/test/test-relying-party-cas.xml
+++ b/idp-conf-impl/src/test/resources/test/test-relying-party-cas.xml
@@ -7,7 +7,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
- default-init-method="initialize" default-destroy-method="destroy">
+ default-init-method="initialize">
<bean id="shibboleth.UnverifiedRelyingParty" parent="RelyingParty">
<property name="profileConfigurations">
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list