[java-idp-plugin-oidc-config] 01/02: Bump POM version, plugin.version and module ID.
Henri Mikkonen
henri.mikkonen at iki.fi
Mon Mar 11 10:11:53 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=3b8baec806ffd6b0df1982ce1379c4ca966c4519
commit 3b8baec806ffd6b0df1982ce1379c4ca966c4519
Author: Henri Mikkonen <henri.mikkonen at iki.fi>
AuthorDate: Mon Mar 11 09:57:13 2024 +0200
Bump POM version, plugin.version and module ID.
- POM to 2.1.0-SNAPSHOT
- plugin.version to 2.1.0
- Require idp.oidc.common.5
- module ID to idp.oidc.config.3
- The previous module ID (idp.oidc.config.2) was also kept for providing compatibility
- The module classes (OIDCConfigModule2 and OIDCConfigModule3) contain the same trailing number as the module ID
---
oidc-config-dist/pom.xml | 2 +-
oidc-config-impl/pom.xml | 2 +-
.../config/{OIDCConfigModule.java => OIDCConfigModule2.java} | 6 +++---
.../config/{OIDCConfigModule.java => OIDCConfigModule3.java} | 6 +++---
.../net/shibboleth/idp/plugin/oidc/config/OIDCConfigPlugin.java | 9 +++++----
.../META-INF/services/net.shibboleth.idp.module.IdPModule | 3 ++-
.../net/shibboleth/idp/plugin/oidc/config/module.properties | 8 +++++++-
.../net/shibboleth/idp/plugin/oidc/config/plugin.properties | 4 ++--
pom.xml | 2 +-
9 files changed, 25 insertions(+), 17 deletions(-)
diff --git a/oidc-config-dist/pom.xml b/oidc-config-dist/pom.xml
index ab96a51..b17b9b6 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.0.1-SNAPSHOT</version>
+ <version>2.1.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 bb1932d..8613ba4 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.0.1-SNAPSHOT</version>
+ <version>2.1.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/OIDCConfigModule.java b/oidc-config-impl/src/main/java/net/shibboleth/idp/plugin/oidc/config/OIDCConfigModule2.java
similarity index 85%
copy from oidc-config-impl/src/main/java/net/shibboleth/idp/plugin/oidc/config/OIDCConfigModule.java
copy to oidc-config-impl/src/main/java/net/shibboleth/idp/plugin/oidc/config/OIDCConfigModule2.java
index 0f239e8..d24b10e 100644
--- a/oidc-config-impl/src/main/java/net/shibboleth/idp/plugin/oidc/config/OIDCConfigModule.java
+++ b/oidc-config-impl/src/main/java/net/shibboleth/idp/plugin/oidc/config/OIDCConfigModule2.java
@@ -20,7 +20,7 @@ import net.shibboleth.idp.module.impl.PluginIdPModule;
import net.shibboleth.profile.module.ModuleException;
/** OIDC/OAuth shared configuration module.*/
-public class OIDCConfigModule extends PluginIdPModule {
+public class OIDCConfigModule2 extends PluginIdPModule {
/**
* Constructor.
@@ -28,8 +28,8 @@ public class OIDCConfigModule extends PluginIdPModule {
* @throws IOException if the property file cannot be loaded
* @throws ModuleException if other errors occur
*/
- public OIDCConfigModule() throws IOException, ModuleException {
- super(OIDCConfigModule.class);
+ public OIDCConfigModule2() throws IOException, ModuleException {
+ super(OIDCConfigModule2.class);
}
diff --git a/oidc-config-impl/src/main/java/net/shibboleth/idp/plugin/oidc/config/OIDCConfigModule.java b/oidc-config-impl/src/main/java/net/shibboleth/idp/plugin/oidc/config/OIDCConfigModule3.java
similarity index 85%
rename from oidc-config-impl/src/main/java/net/shibboleth/idp/plugin/oidc/config/OIDCConfigModule.java
rename to oidc-config-impl/src/main/java/net/shibboleth/idp/plugin/oidc/config/OIDCConfigModule3.java
index 0f239e8..cc669a2 100644
--- a/oidc-config-impl/src/main/java/net/shibboleth/idp/plugin/oidc/config/OIDCConfigModule.java
+++ b/oidc-config-impl/src/main/java/net/shibboleth/idp/plugin/oidc/config/OIDCConfigModule3.java
@@ -20,7 +20,7 @@ import net.shibboleth.idp.module.impl.PluginIdPModule;
import net.shibboleth.profile.module.ModuleException;
/** OIDC/OAuth shared configuration module.*/
-public class OIDCConfigModule extends PluginIdPModule {
+public class OIDCConfigModule3 extends PluginIdPModule {
/**
* Constructor.
@@ -28,8 +28,8 @@ public class OIDCConfigModule extends PluginIdPModule {
* @throws IOException if the property file cannot be loaded
* @throws ModuleException if other errors occur
*/
- public OIDCConfigModule() throws IOException, ModuleException {
- super(OIDCConfigModule.class);
+ public OIDCConfigModule3() throws IOException, ModuleException {
+ super(OIDCConfigModule3.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 3778370..d9033a0 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
@@ -15,12 +15,12 @@
package net.shibboleth.idp.plugin.oidc.config;
import java.io.IOException;
-import java.util.Collections;
import net.shibboleth.idp.module.IdPModule;
import net.shibboleth.idp.plugin.impl.FirstPartyIdPPlugin;
import net.shibboleth.profile.module.ModuleException;
import net.shibboleth.profile.plugin.PluginException;
+import net.shibboleth.shared.collection.CollectionSupport;
/** OIDC/OAuth shared configuration plugin.*/
public class OIDCConfigPlugin extends FirstPartyIdPPlugin{
@@ -35,9 +35,10 @@ public class OIDCConfigPlugin extends FirstPartyIdPPlugin{
public OIDCConfigPlugin() throws IOException, PluginException{
super(OIDCConfigPlugin.class);
try {
- final IdPModule module = new OIDCConfigModule();
- setEnableOnInstall(Collections.singleton(module));
- setDisableOnRemoval(Collections.singleton(module));
+ final IdPModule module2 = new OIDCConfigModule2();
+ final IdPModule module3 = new OIDCConfigModule3();
+ setEnableOnInstall(CollectionSupport.setOf(module2, module3));
+ setDisableOnRemoval(CollectionSupport.setOf(module2, module3));
} 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 b9ad9b3..06a4f7a 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 +1,2 @@
-net.shibboleth.idp.plugin.oidc.config.OIDCConfigModule
+net.shibboleth.idp.plugin.oidc.config.OIDCConfigModule2
+net.shibboleth.idp.plugin.oidc.config.OIDCConfigModule3
\ 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 81b421b..831f3b1 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,7 +1,8 @@
# Properties defining this module.
# Class to Module ID mappings
-net.shibboleth.idp.plugin.oidc.config.OIDCConfigModule = idp.oidc.config.2
+net.shibboleth.idp.plugin.oidc.config.OIDCConfigModule2 = idp.oidc.config.2
+net.shibboleth.idp.plugin.oidc.config.OIDCConfigModule3 = idp.oidc.config.3
# Module Owner
idp.oidc.config.2.plugin = net.shibboleth.idp.plugin.oidc.config
@@ -10,3 +11,8 @@ 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
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 83ee233..1f083df 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.0.0
+plugin.version = 2.1.0
-plugin.modules.required = idp.oidc.common.4
+plugin.modules.required = idp.oidc.common.5
diff --git a/pom.xml b/pom.xml
index 0c2b799..ea14bf8 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.0.1-SNAPSHOT</version>
+ <version>2.1.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