[java-idp-plugin-oidc-config] branch main updated: JOIDCCONF-7 - Add OIDC.SSO.MDDriven profile bean
Henri Mikkonen
henri.mikkonen at iki.fi
Tue Jun 17 12:13:07 UTC 2025
This is an automated email from the git hooks/post-receive script.
hjmikkon pushed a commit to branch main
in repository java-idp-plugin-oidc-config.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-plugin-oidc-config.git;a=commit;h=c427b0774b0520daa7e3b15ff25a7ec88af53831
The following commit(s) were added to refs/heads/main by this push:
new c427b07 JOIDCCONF-7 - Add OIDC.SSO.MDDriven profile bean
c427b07 is described below
commit c427b0774b0520daa7e3b15ff25a7ec88af53831
Author: Henri Mikkonen <henri.mikkonen at iki.fi>
AuthorDate: Tue Jun 17 15:12:48 2025 +0300
JOIDCCONF-7 - Add OIDC.SSO.MDDriven profile bean
https://shibboleth.atlassian.net/browse/JOIDCCONF-7
Removed the module IDs idp.oidc.config.2, idp.oidc.config.3 and idp.oidc.config.4
---
.../idp/plugin/oidc/config/OIDCConfigModule2.java | 36 ----------------------
.../idp/plugin/oidc/config/OIDCConfigModule3.java | 36 ----------------------
.../idp/plugin/oidc/config/OIDCConfigModule4.java | 36 ----------------------
.../idp/plugin/oidc/config/OIDCConfigPlugin.java | 7 ++---
.../services/net.shibboleth.idp.module.IdPModule | 3 --
.../idp/plugin/oidc/config/module.properties | 21 -------------
6 files changed, 2 insertions(+), 137 deletions(-)
diff --git a/oidc-config-impl/src/main/java/net/shibboleth/idp/plugin/oidc/config/OIDCConfigModule2.java b/oidc-config-impl/src/main/java/net/shibboleth/idp/plugin/oidc/config/OIDCConfigModule2.java
deleted file mode 100644
index d24b10e..0000000
--- a/oidc-config-impl/src/main/java/net/shibboleth/idp/plugin/oidc/config/OIDCConfigModule2.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.plugin.oidc.config;
-
-import java.io.IOException;
-
-import net.shibboleth.idp.module.impl.PluginIdPModule;
-import net.shibboleth.profile.module.ModuleException;
-
-/** OIDC/OAuth shared configuration module.*/
-public class OIDCConfigModule2 extends PluginIdPModule {
-
- /**
- * Constructor.
- *
- * @throws IOException if the property file cannot be loaded
- * @throws ModuleException if other errors occur
- */
- public OIDCConfigModule2() throws IOException, ModuleException {
- super(OIDCConfigModule2.class);
- }
-
-
-}
diff --git a/oidc-config-impl/src/main/java/net/shibboleth/idp/plugin/oidc/config/OIDCConfigModule3.java b/oidc-config-impl/src/main/java/net/shibboleth/idp/plugin/oidc/config/OIDCConfigModule3.java
deleted file mode 100644
index cc669a2..0000000
--- a/oidc-config-impl/src/main/java/net/shibboleth/idp/plugin/oidc/config/OIDCConfigModule3.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.plugin.oidc.config;
-
-import java.io.IOException;
-
-import net.shibboleth.idp.module.impl.PluginIdPModule;
-import net.shibboleth.profile.module.ModuleException;
-
-/** OIDC/OAuth shared configuration module.*/
-public class OIDCConfigModule3 extends PluginIdPModule {
-
- /**
- * Constructor.
- *
- * @throws IOException if the property file cannot be loaded
- * @throws ModuleException if other errors occur
- */
- public OIDCConfigModule3() throws IOException, ModuleException {
- super(OIDCConfigModule3.class);
- }
-
-
-}
diff --git a/oidc-config-impl/src/main/java/net/shibboleth/idp/plugin/oidc/config/OIDCConfigModule4.java b/oidc-config-impl/src/main/java/net/shibboleth/idp/plugin/oidc/config/OIDCConfigModule4.java
deleted file mode 100644
index 19d5be8..0000000
--- a/oidc-config-impl/src/main/java/net/shibboleth/idp/plugin/oidc/config/OIDCConfigModule4.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.plugin.oidc.config;
-
-import java.io.IOException;
-
-import net.shibboleth.idp.module.impl.PluginIdPModule;
-import net.shibboleth.profile.module.ModuleException;
-
-/** OIDC/OAuth shared configuration module.*/
-public class OIDCConfigModule4 extends PluginIdPModule {
-
- /**
- * Constructor.
- *
- * @throws IOException if the property file cannot be loaded
- * @throws ModuleException if other errors occur
- */
- public OIDCConfigModule4() throws IOException, ModuleException {
- super(OIDCConfigModule4.class);
- }
-
-
-}
diff --git a/oidc-config-impl/src/main/java/net/shibboleth/idp/plugin/oidc/config/OIDCConfigPlugin.java b/oidc-config-impl/src/main/java/net/shibboleth/idp/plugin/oidc/config/OIDCConfigPlugin.java
index 7ed0bc5..8425af3 100644
--- a/oidc-config-impl/src/main/java/net/shibboleth/idp/plugin/oidc/config/OIDCConfigPlugin.java
+++ b/oidc-config-impl/src/main/java/net/shibboleth/idp/plugin/oidc/config/OIDCConfigPlugin.java
@@ -35,12 +35,9 @@ public class OIDCConfigPlugin extends FirstPartyIdPPlugin{
public OIDCConfigPlugin() throws IOException, PluginException{
super(OIDCConfigPlugin.class);
try {
- final IdPModule module2 = new OIDCConfigModule2();
- final IdPModule module3 = new OIDCConfigModule3();
- final IdPModule module4 = new OIDCConfigModule4();
final IdPModule module5 = new OIDCConfigModule5();
- setEnableOnInstall(CollectionSupport.setOf(module2, module3, module4, module5));
- setDisableOnRemoval(CollectionSupport.setOf(module2, module3, module4, module5));
+ setEnableOnInstall(CollectionSupport.setOf(module5));
+ setDisableOnRemoval(CollectionSupport.setOf(module5));
} catch (final IOException e) {
throw e;
} catch (final ModuleException e) {
diff --git a/oidc-config-impl/src/main/resources/META-INF/services/net.shibboleth.idp.module.IdPModule b/oidc-config-impl/src/main/resources/META-INF/services/net.shibboleth.idp.module.IdPModule
index 26c42ce..9c44261 100644
--- a/oidc-config-impl/src/main/resources/META-INF/services/net.shibboleth.idp.module.IdPModule
+++ b/oidc-config-impl/src/main/resources/META-INF/services/net.shibboleth.idp.module.IdPModule
@@ -1,4 +1 @@
-net.shibboleth.idp.plugin.oidc.config.OIDCConfigModule2
-net.shibboleth.idp.plugin.oidc.config.OIDCConfigModule3
-net.shibboleth.idp.plugin.oidc.config.OIDCConfigModule4
net.shibboleth.idp.plugin.oidc.config.OIDCConfigModule5
\ No newline at end of file
diff --git a/oidc-config-impl/src/main/resources/net/shibboleth/idp/plugin/oidc/config/module.properties b/oidc-config-impl/src/main/resources/net/shibboleth/idp/plugin/oidc/config/module.properties
index 413ff01..ebaf730 100644
--- a/oidc-config-impl/src/main/resources/net/shibboleth/idp/plugin/oidc/config/module.properties
+++ b/oidc-config-impl/src/main/resources/net/shibboleth/idp/plugin/oidc/config/module.properties
@@ -1,30 +1,9 @@
# Properties defining this module.
# Class to Module ID mappings
-net.shibboleth.idp.plugin.oidc.config.OIDCConfigModule2 = idp.oidc.config.2
-net.shibboleth.idp.plugin.oidc.config.OIDCConfigModule3 = idp.oidc.config.3
-net.shibboleth.idp.plugin.oidc.config.OIDCConfigModule4 = idp.oidc.config.4
net.shibboleth.idp.plugin.oidc.config.OIDCConfigModule5 = idp.oidc.config.5
# Module Owner
-idp.oidc.config.2.plugin = net.shibboleth.idp.plugin.oidc.config
-
-idp.oidc.config.2.name = OIDC/OAuth configuration for the IdP
-idp.oidc.config.2.desc = Module to provide shared OIDC/OAuth configuration for IdP plugins to use
-idp.oidc.config.2.url = /OIDCConfig
-
-idp.oidc.config.3.plugin = net.shibboleth.idp.plugin.oidc.config
-
-idp.oidc.config.3.name = OIDC/OAuth configuration for the IdP
-idp.oidc.config.3.desc = Module to provide shared OIDC/OAuth configuration for IdP plugins to use
-idp.oidc.config.3.url = /OIDCConfig
-
-idp.oidc.config.4.plugin = net.shibboleth.idp.plugin.oidc.config
-
-idp.oidc.config.4.name = OIDC/OAuth configuration for the IdP
-idp.oidc.config.4.desc = Module to provide shared OIDC/OAuth configuration for IdP plugins to use
-idp.oidc.config.4.url = /OIDCConfig
-
idp.oidc.config.5.plugin = net.shibboleth.idp.plugin.oidc.config
idp.oidc.config.5.name = OIDC/OAuth configuration for the IdP
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list