[java-oidc-common] branch main updated: Bump plugin version and module ID

[Henri Mikkonen]

This is an automated email from the git hooks/post-receive script.

hjmikkon pushed a commit to branch main
in repository java-oidc-common.

View the commit online:
http://git.shibboleth.net/view/?p=java-oidc-common.git;a=commit;h=1a77213e80a33c97ee302f704ea26aa52ef1c8e5

The following commit(s) were added to refs/heads/main by this push:
     new 1a77213  Bump plugin version and module ID
1a77213 is described below

commit 1a77213e80a33c97ee302f704ea26aa52ef1c8e5
Author: Henri Mikkonen <henri.mikkonen at iki.fi>
AuthorDate: Fri Jan 12 09:37:04 2024 +0200

    Bump plugin version and module ID
    
    - plugin.version to 3.1.0
    - module ID to idp.oidc.common.5
      - The previous module ID (idp.oidc.common.4) was also kept for providing compatibility
      - The module classes (OIDCCommonModule4 and OIDCCommonModule5) contain the same trailing number as the module ID
---
 .../{OIDCCommonModule.java => OIDCCommonModule4.java}      |  7 +++----
 .../{OIDCCommonModule.java => OIDCCommonModule5.java}      |  7 +++----
 .../java/net/shibboleth/oidc/common/OIDCCommonPlugin.java  | 14 ++++++--------
 .../META-INF/services/net.shibboleth.idp.module.IdPModule  |  3 ++-
 .../resources/net/shibboleth/oidc/common/module.properties |  9 ++++++++-
 .../resources/net/shibboleth/oidc/common/plugin.properties |  2 +-
 6 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/oidc-common-plugin/src/main/java/net/shibboleth/oidc/common/OIDCCommonModule.java b/oidc-common-plugin/src/main/java/net/shibboleth/oidc/common/OIDCCommonModule4.java
similarity index 84%
copy from oidc-common-plugin/src/main/java/net/shibboleth/oidc/common/OIDCCommonModule.java
copy to oidc-common-plugin/src/main/java/net/shibboleth/oidc/common/OIDCCommonModule4.java
index 850f683..a9b4cdf 100644
--- a/oidc-common-plugin/src/main/java/net/shibboleth/oidc/common/OIDCCommonModule.java
+++ b/oidc-common-plugin/src/main/java/net/shibboleth/oidc/common/OIDCCommonModule4.java
@@ -20,7 +20,7 @@ import net.shibboleth.idp.module.impl.PluginIdPModule;
 import net.shibboleth.profile.module.ModuleException;
 
 /** OIDC Common module implementation.*/
-public class OIDCCommonModule extends PluginIdPModule {
+public class OIDCCommonModule4 extends PluginIdPModule {
 
     /**
      * Constructor.
@@ -28,9 +28,8 @@ public class OIDCCommonModule extends PluginIdPModule {
      * @throws IOException if the property file cannot be loaded
      * @throws ModuleException if other errors occur
      */
-    public OIDCCommonModule() throws IOException, ModuleException {
-        super(OIDCCommonModule.class);
+    public OIDCCommonModule4() throws IOException, ModuleException {
+        super(OIDCCommonModule4.class);
     }
-    
 
 }
diff --git a/oidc-common-plugin/src/main/java/net/shibboleth/oidc/common/OIDCCommonModule.java b/oidc-common-plugin/src/main/java/net/shibboleth/oidc/common/OIDCCommonModule5.java
similarity index 84%
rename from oidc-common-plugin/src/main/java/net/shibboleth/oidc/common/OIDCCommonModule.java
rename to oidc-common-plugin/src/main/java/net/shibboleth/oidc/common/OIDCCommonModule5.java
index 850f683..e6ba40b 100644
--- a/oidc-common-plugin/src/main/java/net/shibboleth/oidc/common/OIDCCommonModule.java
+++ b/oidc-common-plugin/src/main/java/net/shibboleth/oidc/common/OIDCCommonModule5.java
@@ -20,7 +20,7 @@ import net.shibboleth.idp.module.impl.PluginIdPModule;
 import net.shibboleth.profile.module.ModuleException;
 
 /** OIDC Common module implementation.*/
-public class OIDCCommonModule extends PluginIdPModule {
+public class OIDCCommonModule5 extends PluginIdPModule {
 
     /**
      * Constructor.
@@ -28,9 +28,8 @@ public class OIDCCommonModule extends PluginIdPModule {
      * @throws IOException if the property file cannot be loaded
      * @throws ModuleException if other errors occur
      */
-    public OIDCCommonModule() throws IOException, ModuleException {
-        super(OIDCCommonModule.class);
+    public OIDCCommonModule5() throws IOException, ModuleException {
+        super(OIDCCommonModule5.class);
     }
-    
 
 }
diff --git a/oidc-common-plugin/src/main/java/net/shibboleth/oidc/common/OIDCCommonPlugin.java b/oidc-common-plugin/src/main/java/net/shibboleth/oidc/common/OIDCCommonPlugin.java
index 967cbb3..04b55ec 100644
--- a/oidc-common-plugin/src/main/java/net/shibboleth/oidc/common/OIDCCommonPlugin.java
+++ b/oidc-common-plugin/src/main/java/net/shibboleth/oidc/common/OIDCCommonPlugin.java
@@ -15,17 +15,16 @@
 package net.shibboleth.oidc.common;
 
 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 Common plugin implementation.*/
 public class OIDCCommonPlugin extends FirstPartyIdPPlugin{
-    
-    
+
     /**
      * Constructor.
      * 
@@ -35,9 +34,10 @@ public class OIDCCommonPlugin extends FirstPartyIdPPlugin{
     public OIDCCommonPlugin() throws IOException, PluginException{
         super(OIDCCommonPlugin.class);
         try {
-            final IdPModule module = new OIDCCommonModule();
-            setEnableOnInstall(Collections.singleton(module));
-            setDisableOnRemoval(Collections.singleton(module));
+            final IdPModule module4 = new OIDCCommonModule4();
+            final IdPModule module5 = new OIDCCommonModule5();
+            setEnableOnInstall(CollectionSupport.setOf(module4, module5));
+            setDisableOnRemoval(CollectionSupport.setOf(module4, module5));
         } catch (final IOException e) {
             throw e;
         } catch (final ModuleException e) {
@@ -45,6 +45,4 @@ public class OIDCCommonPlugin extends FirstPartyIdPPlugin{
         }
     }
 
-
-
 }
diff --git a/oidc-common-plugin/src/main/resources/META-INF/services/net.shibboleth.idp.module.IdPModule b/oidc-common-plugin/src/main/resources/META-INF/services/net.shibboleth.idp.module.IdPModule
index d912a48..940a5cf 100644
--- a/oidc-common-plugin/src/main/resources/META-INF/services/net.shibboleth.idp.module.IdPModule
+++ b/oidc-common-plugin/src/main/resources/META-INF/services/net.shibboleth.idp.module.IdPModule
@@ -1 +1,2 @@
-net.shibboleth.oidc.common.OIDCCommonModule
+net.shibboleth.oidc.common.OIDCCommonModule4
+net.shibboleth.oidc.common.OIDCCommonModule5
diff --git a/oidc-common-plugin/src/main/resources/net/shibboleth/oidc/common/module.properties b/oidc-common-plugin/src/main/resources/net/shibboleth/oidc/common/module.properties
index f83dfa5..1f26b06 100644
--- a/oidc-common-plugin/src/main/resources/net/shibboleth/oidc/common/module.properties
+++ b/oidc-common-plugin/src/main/resources/net/shibboleth/oidc/common/module.properties
@@ -1,7 +1,8 @@
 # Properties defining this module.
 
 # Class to Module ID mappings
-net.shibboleth.oidc.common.OIDCCommonModule = idp.oidc.common.4
+net.shibboleth.oidc.common.OIDCCommonModule4 = idp.oidc.common.4
+net.shibboleth.oidc.common.OIDCCommonModule5 = idp.oidc.common.5
 
 # Module Owner
 idp.oidc.common.4.plugin = net.shibboleth.oidc.common
@@ -10,3 +11,9 @@ idp.oidc.common.4.name = Module to provide common OIDC processing
 idp.oidc.common.4.desc = Module that provides common OIDC processing functions for other plugins to use
 idp.oidc.common.4.url = /OIDCCommon
 
+idp.oidc.common.5.plugin = net.shibboleth.oidc.common
+
+idp.oidc.common.5.name = Module to provide common OIDC processing
+idp.oidc.common.5.desc = Module that provides common OIDC processing functions for other plugins to use
+idp.oidc.common.5.url = /OIDCCommon
+
diff --git a/oidc-common-plugin/src/main/resources/net/shibboleth/oidc/common/plugin.properties b/oidc-common-plugin/src/main/resources/net/shibboleth/oidc/common/plugin.properties
index 60adb7c..c2c11c1 100644
--- a/oidc-common-plugin/src/main/resources/net/shibboleth/oidc/common/plugin.properties
+++ b/oidc-common-plugin/src/main/resources/net/shibboleth/oidc/common/plugin.properties
@@ -2,7 +2,7 @@
 
 plugin.id = net.shibboleth.oidc.common
 # Only used when package manifest is not available
-plugin.version = 3.0.1
+plugin.version = 3.1.0
 
 # No prereqs
 #plugin.modules.required =

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