[java-idp-plugin-oidc-config] 01/02: Bump version to 2.2.0-SNAPSHOT and module ID to idp.oidc.config.4
Henri Mikkonen
henri.mikkonen at iki.fi
Wed May 8 11:23:55 UTC 2024
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=f3014d442ba6c87ace76092ba03bcdddde1c8314
commit f3014d442ba6c87ace76092ba03bcdddde1c8314
Author: Henri Mikkonen <henri.mikkonen at iki.fi>
AuthorDate: Wed May 8 14:19:27 2024 +0300
Bump version to 2.2.0-SNAPSHOT and module ID to idp.oidc.config.4
- Require idp.oidc.common.6
- The previous module IDs (idp.oidc.config.2 and .3) were also kept for providing compatibility
---
oidc-config-dist/pom.xml | 2 +-
oidc-config-impl/pom.xml | 2 +-
.../idp/plugin/oidc/config/OIDCConfigModule4.java | 36 ++++++++++++++++++++++
.../idp/plugin/oidc/config/OIDCConfigPlugin.java | 5 +--
.../services/net.shibboleth.idp.module.IdPModule | 3 +-
.../idp/plugin/oidc/config/module.properties | 8 +++++
.../idp/plugin/oidc/config/plugin.properties | 4 +--
pom.xml | 2 +-
8 files changed, 54 insertions(+), 8 deletions(-)
diff --git a/oidc-config-dist/pom.xml b/oidc-config-dist/pom.xml
index e975f1d..682e2d3 100644
--- a/oidc-config-dist/pom.xml
+++ b/oidc-config-dist/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>net.shibboleth.idp.plugin.config.oidc</groupId>
<artifactId>idp-plugin-oidc-config-parent</artifactId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
</parent>
<artifactId>idp-plugin-oidc-config-dist</artifactId>
diff --git a/oidc-config-impl/pom.xml b/oidc-config-impl/pom.xml
index 5d46895..af3d1a4 100644
--- a/oidc-config-impl/pom.xml
+++ b/oidc-config-impl/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>net.shibboleth.idp.plugin.config.oidc</groupId>
<artifactId>idp-plugin-oidc-config-parent</artifactId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
</parent>
<artifactId>idp-plugin-oidc-config-impl</artifactId>
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
new file mode 100644
index 0000000..19d5be8
--- /dev/null
+++ b/oidc-config-impl/src/main/java/net/shibboleth/idp/plugin/oidc/config/OIDCConfigModule4.java
@@ -0,0 +1,36 @@
+/*
+ * 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 d9033a0..8d35ce4 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
@@ -37,8 +37,9 @@ public class OIDCConfigPlugin extends FirstPartyIdPPlugin{
try {
final IdPModule module2 = new OIDCConfigModule2();
final IdPModule module3 = new OIDCConfigModule3();
- setEnableOnInstall(CollectionSupport.setOf(module2, module3));
- setDisableOnRemoval(CollectionSupport.setOf(module2, module3));
+ final IdPModule module4 = new OIDCConfigModule4();
+ setEnableOnInstall(CollectionSupport.setOf(module2, module3, module4));
+ setDisableOnRemoval(CollectionSupport.setOf(module2, module3, module4));
} 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 06a4f7a..aa12ebf 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,2 +1,3 @@
net.shibboleth.idp.plugin.oidc.config.OIDCConfigModule2
-net.shibboleth.idp.plugin.oidc.config.OIDCConfigModule3
\ No newline at end of file
+net.shibboleth.idp.plugin.oidc.config.OIDCConfigModule3
+net.shibboleth.idp.plugin.oidc.config.OIDCConfigModule4
\ 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 831f3b1..68e5ef7 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
@@ -3,6 +3,7 @@
# 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
# Module Owner
idp.oidc.config.2.plugin = net.shibboleth.idp.plugin.oidc.config
@@ -16,3 +17,10 @@ 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
+
diff --git a/oidc-config-impl/src/main/resources/net/shibboleth/idp/plugin/oidc/config/plugin.properties b/oidc-config-impl/src/main/resources/net/shibboleth/idp/plugin/oidc/config/plugin.properties
index 0a09d7c..70230e5 100644
--- a/oidc-config-impl/src/main/resources/net/shibboleth/idp/plugin/oidc/config/plugin.properties
+++ b/oidc-config-impl/src/main/resources/net/shibboleth/idp/plugin/oidc/config/plugin.properties
@@ -2,6 +2,6 @@
plugin.id = net.shibboleth.idp.plugin.oidc.config
# Only used when package manifest is not available
-plugin.version = 2.1.1
+plugin.version = 2.2.0
-plugin.modules.required = idp.oidc.common.5
+plugin.modules.required = idp.oidc.common.6
diff --git a/pom.xml b/pom.xml
index 98c74dc..04ca48d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
<groupId>net.shibboleth.idp.plugin.config.oidc</groupId>
<artifactId>idp-plugin-oidc-config-parent</artifactId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<name>Shibboleth IdP :: Plugins :: OIDC/OAuth Shared Configuration</name>
<packaging>pom</packaging>
<description>Parent project for the Shibboleth Identity Provider OIDC/OAuth Shared Configuration</description>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list