[java-identity-provider] branch main updated: JSSH-71 Remove the impact of the DestructableComponent Interface
Codeberg
noreply at shibboleth.net
Sun Jul 26 14:52:48 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/68e97c6e1549393c5d34f474ae9e1fdad3bcb67e
The following commit(s) were added to refs/heads/main by this push:
new 68e97c6e1 JSSH-71 Remove the impact of the DestructableComponent Interface
68e97c6e1 is described below
commit 68e97c6e1549393c5d34f474ae9e1fdad3bcb67e
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sun Jul 26 15:53:23 2026 +0100
JSSH-71 Remove the impact of the DestructableComponent Interface
https://shibboleth.atlassian.net/browse/JSSH-71
Remove default-destroy-method from all (non-testbed) test files
---
idp-cas-impl/src/test/resources/spring/test-flow-beans.xml | 3 +--
.../META-INF/net/shibboleth/idp/flows/resolveAndFilter/beans.xml | 2 +-
idp-conf-impl/src/test/resources/c14n/webflows/beans.xml | 2 +-
.../src/test/resources/exception/flows/test-exception-beans.xml | 2 +-
idp-conf-impl/src/test/resources/flow-load-test/flows/import-beans.xml | 2 +-
.../src/test/resources/flow-load-test/flows/test-flow-loads-beans.xml | 2 +-
.../resources/flows/test/client-storage/client-storage-test-beans.xml | 3 +--
.../src/test/resources/intercept/flows/test-intercept-beans.xml | 2 +-
idp-conf-impl/src/test/resources/mapping/configs/override.xml | 2 +-
9 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/idp-cas-impl/src/test/resources/spring/test-flow-beans.xml b/idp-cas-impl/src/test/resources/spring/test-flow-beans.xml
index bd6aec5ad..b8bac735a 100644
--- a/idp-cas-impl/src/test/resources/spring/test-flow-beans.xml
+++ b/idp-cas-impl/src/test/resources/spring/test-flow-beans.xml
@@ -9,8 +9,7 @@
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 destroy-method="" class="net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor" />
<bean destroy-method="" class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
diff --git a/idp-conf-impl/src/test/resources/META-INF/net/shibboleth/idp/flows/resolveAndFilter/beans.xml b/idp-conf-impl/src/test/resources/META-INF/net/shibboleth/idp/flows/resolveAndFilter/beans.xml
index b095221ea..94dc175e2 100644
--- a/idp-conf-impl/src/test/resources/META-INF/net/shibboleth/idp/flows/resolveAndFilter/beans.xml
+++ b/idp-conf-impl/src/test/resources/META-INF/net/shibboleth/idp/flows/resolveAndFilter/beans.xml
@@ -6,7 +6,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
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">
<!-- Beans from the standard flows -->
diff --git a/idp-conf-impl/src/test/resources/c14n/webflows/beans.xml b/idp-conf-impl/src/test/resources/c14n/webflows/beans.xml
index f15cfed3b..eba0b0158 100644
--- a/idp-conf-impl/src/test/resources/c14n/webflows/beans.xml
+++ b/idp-conf-impl/src/test/resources/c14n/webflows/beans.xml
@@ -6,7 +6,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
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 class="net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor" />
diff --git a/idp-conf-impl/src/test/resources/exception/flows/test-exception-beans.xml b/idp-conf-impl/src/test/resources/exception/flows/test-exception-beans.xml
index 3df7b72fd..97589871b 100644
--- a/idp-conf-impl/src/test/resources/exception/flows/test-exception-beans.xml
+++ b/idp-conf-impl/src/test/resources/exception/flows/test-exception-beans.xml
@@ -6,7 +6,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
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="InitializeProfileRequestContext"
class="net.shibboleth.idp.profile.impl.InitializeProfileRequestContext"
diff --git a/idp-conf-impl/src/test/resources/flow-load-test/flows/import-beans.xml b/idp-conf-impl/src/test/resources/flow-load-test/flows/import-beans.xml
index 59f12cf08..e4a28da03 100644
--- a/idp-conf-impl/src/test/resources/flow-load-test/flows/import-beans.xml
+++ b/idp-conf-impl/src/test/resources/flow-load-test/flows/import-beans.xml
@@ -6,7 +6,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
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">
<!-- ensure this bean gets imported and loaded -->
<bean id="LoadThisBean" class="net.shibboleth.idp.test.flows.load.LoadThisBean"
diff --git a/idp-conf-impl/src/test/resources/flow-load-test/flows/test-flow-loads-beans.xml b/idp-conf-impl/src/test/resources/flow-load-test/flows/test-flow-loads-beans.xml
index cf16be551..0718d1c5a 100644
--- a/idp-conf-impl/src/test/resources/flow-load-test/flows/test-flow-loads-beans.xml
+++ b/idp-conf-impl/src/test/resources/flow-load-test/flows/test-flow-loads-beans.xml
@@ -6,7 +6,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
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">
<!-- Do something meaningful to make sure beans are wiring properly -->
<bean id="InitializeProfileRequestContext"
diff --git a/idp-conf-impl/src/test/resources/flows/test/client-storage/client-storage-test-beans.xml b/idp-conf-impl/src/test/resources/flows/test/client-storage/client-storage-test-beans.xml
index 9be93cf53..d2e4da52d 100644
--- a/idp-conf-impl/src/test/resources/flows/test/client-storage/client-storage-test-beans.xml
+++ b/idp-conf-impl/src/test/resources/flows/test/client-storage/client-storage-test-beans.xml
@@ -6,8 +6,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
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"
- default-init-method="initialize"
- default-destroy-method="destroy">
+ default-init-method="initialize">
<bean id="InitializeProfileRequestContext"
class="net.shibboleth.idp.profile.impl.InitializeProfileRequestContext" scope="prototype"
diff --git a/idp-conf-impl/src/test/resources/intercept/flows/test-intercept-beans.xml b/idp-conf-impl/src/test/resources/intercept/flows/test-intercept-beans.xml
index 9571da5cd..0a8d69b88 100644
--- a/idp-conf-impl/src/test/resources/intercept/flows/test-intercept-beans.xml
+++ b/idp-conf-impl/src/test/resources/intercept/flows/test-intercept-beans.xml
@@ -6,7 +6,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
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="InitializeProfileRequestContext"
class="net.shibboleth.idp.profile.impl.InitializeProfileRequestContext"
diff --git a/idp-conf-impl/src/test/resources/mapping/configs/override.xml b/idp-conf-impl/src/test/resources/mapping/configs/override.xml
index 2c0a499e8..64e3cd441 100644
--- a/idp-conf-impl/src/test/resources/mapping/configs/override.xml
+++ b/idp-conf-impl/src/test/resources/mapping/configs/override.xml
@@ -6,7 +6,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
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">
<util:list id="shibboleth.AttributeResolverResources">
<value>classpath:/mapping/configs/attribute-resolver.xml</value>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list