[java-identity-provider] branch main updated: IDP-2463 IDP Update is re-enabling plugin modules

[Codeberg]

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/69601bbabb5802ade428d9e5c45e9d99ad59551f

The following commit(s) were added to refs/heads/main by this push:
     new 69601bbab IDP-2463 IDP Update is re-enabling plugin modules
69601bbab is described below

commit 69601bbabb5802ade428d9e5c45e9d99ad59551f
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Thu Jun 18 18:52:42 2026 +0100

    IDP-2463 IDP Update is re-enabling plugin modules
    
    https://shibboleth.atlassian.net/browse/IDP-2463
    
    Always consult the plugin classpath for the list of enabled modules
---
 .../java/net/shibboleth/idp/installer/impl/CurrentInstallState.java     | 2 +-
 .../src/main/java/net/shibboleth/idp/installer/impl/V5Install.java      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/impl/CurrentInstallState.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/impl/CurrentInstallState.java
index e0b971ec0..e485a1d0c 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/impl/CurrentInstallState.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/impl/CurrentInstallState.java
@@ -136,7 +136,7 @@ public final class CurrentInstallState extends AbstractInitializableComponent {
         assert td != null;
         final ModuleContext moduleContext = new ModuleContext(td);
         enabledModules = new HashSet<>();
-        final Iterator<IdPModule> modules = ServiceLoader.load(IdPModule.class).iterator();
+        final Iterator<IdPModule> modules = ServiceLoader.load(IdPModule.class, getInstalledPluginsLoader()).iterator();
         while (modules.hasNext()) {
             final IdPModule module = modules.next();
             if (module.isEnabled(moduleContext)) {
diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/impl/V5Install.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/impl/V5Install.java
index 800c840af..f2ded2f1b 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/impl/V5Install.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/impl/V5Install.java
@@ -428,7 +428,7 @@ public class V5Install {
      */
     protected void enableModules() throws BuildException {
         final ModuleContext moduleContext = ensureModuleContext();
-        final Iterator<IdPModule> modules = ServiceLoader.load(IdPModule.class).iterator();
+        final Iterator<IdPModule> modules = ServiceLoader.load(IdPModule.class, currentState.getInstalledPluginsLoader()).iterator();
 
         while (modules.hasNext()) {
             try {

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