[java-oidc-common] 01/02: Bump version to 3.2.0-SNAPSHOT and module ID to idp.oidc.common.6
Henri Mikkonen
henri.mikkonen at iki.fi
Wed Apr 24 07:32:19 UTC 2024
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=cf0d3e68f0e0e96f9b3e1c339fda42ae3e54b1cd
commit cf0d3e68f0e0e96f9b3e1c339fda42ae3e54b1cd
Author: Henri Mikkonen <henri.mikkonen at iki.fi>
AuthorDate: Wed Apr 24 09:36:47 2024 +0300
Bump version to 3.2.0-SNAPSHOT and module ID to idp.oidc.common.6
The previous module IDs (idp.oidc.common.4 and .5) were also kept for providing compatibility
---
oidc-common-attribute-api/pom.xml | 2 +-
oidc-common-attribute-impl/pom.xml | 2 +-
oidc-common-bom/pom.xml | 2 +-
oidc-common-crypto-api/pom.xml | 2 +-
oidc-common-crypto-impl/pom.xml | 2 +-
oidc-common-dist/pom.xml | 2 +-
oidc-common-metadata-api/pom.xml | 2 +-
oidc-common-metadata-impl/pom.xml | 2 +-
oidc-common-plugin/pom.xml | 2 +-
.../shibboleth/oidc/common/OIDCCommonModule6.java | 35 ++++++++++++++++++++++
.../shibboleth/oidc/common/OIDCCommonPlugin.java | 5 ++--
.../services/net.shibboleth.idp.module.IdPModule | 1 +
.../net/shibboleth/oidc/common/module.properties | 7 +++++
.../net/shibboleth/oidc/common/plugin.properties | 2 +-
oidc-common-profile-api/pom.xml | 2 +-
oidc-common-profile-impl/pom.xml | 2 +-
oidc-common-saml-api/pom.xml | 2 +-
oidc-common-saml-impl/pom.xml | 2 +-
pom.xml | 2 +-
19 files changed, 61 insertions(+), 17 deletions(-)
diff --git a/oidc-common-attribute-api/pom.xml b/oidc-common-attribute-api/pom.xml
index b843372..3730af4 100644
--- a/oidc-common-attribute-api/pom.xml
+++ b/oidc-common-attribute-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>net.shibboleth.oidc</groupId>
<artifactId>oidc-common-parent</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</parent>
<artifactId>oidc-common-attribute-api</artifactId>
diff --git a/oidc-common-attribute-impl/pom.xml b/oidc-common-attribute-impl/pom.xml
index 3eb8e48..b7098b3 100644
--- a/oidc-common-attribute-impl/pom.xml
+++ b/oidc-common-attribute-impl/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>net.shibboleth.oidc</groupId>
<artifactId>oidc-common-parent</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</parent>
<artifactId>oidc-common-attribute-impl</artifactId>
diff --git a/oidc-common-bom/pom.xml b/oidc-common-bom/pom.xml
index d2febaa..f3173f8 100644
--- a/oidc-common-bom/pom.xml
+++ b/oidc-common-bom/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>net.shibboleth.oidc</groupId>
<artifactId>oidc-common-parent</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</parent>
<packaging>pom</packaging>
diff --git a/oidc-common-crypto-api/pom.xml b/oidc-common-crypto-api/pom.xml
index aef70e9..95b702d 100644
--- a/oidc-common-crypto-api/pom.xml
+++ b/oidc-common-crypto-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>net.shibboleth.oidc</groupId>
<artifactId>oidc-common-parent</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</parent>
<artifactId>oidc-common-crypto-api</artifactId>
diff --git a/oidc-common-crypto-impl/pom.xml b/oidc-common-crypto-impl/pom.xml
index 134169f..1b66293 100644
--- a/oidc-common-crypto-impl/pom.xml
+++ b/oidc-common-crypto-impl/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>net.shibboleth.oidc</groupId>
<artifactId>oidc-common-parent</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</parent>
<artifactId>oidc-common-crypto-impl</artifactId>
diff --git a/oidc-common-dist/pom.xml b/oidc-common-dist/pom.xml
index 8a2e62b..50d560e 100644
--- a/oidc-common-dist/pom.xml
+++ b/oidc-common-dist/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>net.shibboleth.oidc</groupId>
<artifactId>oidc-common-parent</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</parent>
<artifactId>oidc-common-dist</artifactId>
diff --git a/oidc-common-metadata-api/pom.xml b/oidc-common-metadata-api/pom.xml
index c72eedf..9b6f730 100644
--- a/oidc-common-metadata-api/pom.xml
+++ b/oidc-common-metadata-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>net.shibboleth.oidc</groupId>
<artifactId>oidc-common-parent</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</parent>
<artifactId>oidc-common-metadata-api</artifactId>
diff --git a/oidc-common-metadata-impl/pom.xml b/oidc-common-metadata-impl/pom.xml
index d8bf044..e900731 100644
--- a/oidc-common-metadata-impl/pom.xml
+++ b/oidc-common-metadata-impl/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>net.shibboleth.oidc</groupId>
<artifactId>oidc-common-parent</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</parent>
<artifactId>oidc-common-metadata-impl</artifactId>
diff --git a/oidc-common-plugin/pom.xml b/oidc-common-plugin/pom.xml
index 29bfc3b..dce4431 100644
--- a/oidc-common-plugin/pom.xml
+++ b/oidc-common-plugin/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>net.shibboleth.oidc</groupId>
<artifactId>oidc-common-parent</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</parent>
<artifactId>oidc-common-plugin</artifactId>
diff --git a/oidc-common-plugin/src/main/java/net/shibboleth/oidc/common/OIDCCommonModule6.java b/oidc-common-plugin/src/main/java/net/shibboleth/oidc/common/OIDCCommonModule6.java
new file mode 100644
index 0000000..6c57d11
--- /dev/null
+++ b/oidc-common-plugin/src/main/java/net/shibboleth/oidc/common/OIDCCommonModule6.java
@@ -0,0 +1,35 @@
+/*
+ * 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.oidc.common;
+
+import java.io.IOException;
+
+import net.shibboleth.idp.module.impl.PluginIdPModule;
+import net.shibboleth.profile.module.ModuleException;
+
+/** OIDC Common module implementation.*/
+public class OIDCCommonModule6 extends PluginIdPModule {
+
+ /**
+ * Constructor.
+ *
+ * @throws IOException if the property file cannot be loaded
+ * @throws ModuleException if other errors occur
+ */
+ public OIDCCommonModule6() throws IOException, ModuleException {
+ super(OIDCCommonModule6.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 04b55ec..deb7de4 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
@@ -36,8 +36,9 @@ public class OIDCCommonPlugin extends FirstPartyIdPPlugin{
try {
final IdPModule module4 = new OIDCCommonModule4();
final IdPModule module5 = new OIDCCommonModule5();
- setEnableOnInstall(CollectionSupport.setOf(module4, module5));
- setDisableOnRemoval(CollectionSupport.setOf(module4, module5));
+ final IdPModule module6 = new OIDCCommonModule6();
+ setEnableOnInstall(CollectionSupport.setOf(module4, module5, module6));
+ setDisableOnRemoval(CollectionSupport.setOf(module4, module5, module6));
} catch (final IOException e) {
throw e;
} catch (final ModuleException e) {
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 940a5cf..f7bd066 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,2 +1,3 @@
net.shibboleth.oidc.common.OIDCCommonModule4
net.shibboleth.oidc.common.OIDCCommonModule5
+net.shibboleth.oidc.common.OIDCCommonModule6
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 105f544..deddaec 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
@@ -3,6 +3,7 @@
# Class to Module ID mappings
net.shibboleth.oidc.common.OIDCCommonModule4 = idp.oidc.common.4
net.shibboleth.oidc.common.OIDCCommonModule5 = idp.oidc.common.5
+net.shibboleth.oidc.common.OIDCCommonModule6 = idp.oidc.common.6
# Module Owner
idp.oidc.common.4.plugin = net.shibboleth.oidc.common
@@ -16,3 +17,9 @@ idp.oidc.common.5.plugin = net.shibboleth.oidc.common
idp.oidc.common.5.name = OIDC Common Library
idp.oidc.common.5.desc = Module that provides common OIDC processing functions for other plugins to use
idp.oidc.common.5.url = /OIDCCommon
+
+idp.oidc.common.6.plugin = net.shibboleth.oidc.common
+
+idp.oidc.common.6.name = OIDC Common Library
+idp.oidc.common.6.desc = Module that provides common OIDC processing functions for other plugins to use
+idp.oidc.common.6.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 bd9da94..2408dee 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.1.1
+plugin.version = 3.2.0
# No prereqs
#plugin.modules.required =
diff --git a/oidc-common-profile-api/pom.xml b/oidc-common-profile-api/pom.xml
index 1442251..a88b00a 100644
--- a/oidc-common-profile-api/pom.xml
+++ b/oidc-common-profile-api/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>net.shibboleth.oidc</groupId>
<artifactId>oidc-common-parent</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</parent>
<artifactId>oidc-common-profile-api</artifactId>
diff --git a/oidc-common-profile-impl/pom.xml b/oidc-common-profile-impl/pom.xml
index 07e7a8f..3ab42c7 100644
--- a/oidc-common-profile-impl/pom.xml
+++ b/oidc-common-profile-impl/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>net.shibboleth.oidc</groupId>
<artifactId>oidc-common-parent</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</parent>
<artifactId>oidc-common-profile-impl</artifactId>
diff --git a/oidc-common-saml-api/pom.xml b/oidc-common-saml-api/pom.xml
index f7ba852..315eaa9 100644
--- a/oidc-common-saml-api/pom.xml
+++ b/oidc-common-saml-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>net.shibboleth.oidc</groupId>
<artifactId>oidc-common-parent</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</parent>
<artifactId>oidc-common-saml-api</artifactId>
diff --git a/oidc-common-saml-impl/pom.xml b/oidc-common-saml-impl/pom.xml
index faa78ee..99e24a5 100644
--- a/oidc-common-saml-impl/pom.xml
+++ b/oidc-common-saml-impl/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>net.shibboleth.oidc</groupId>
<artifactId>oidc-common-parent</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</parent>
<artifactId>oidc-common-saml-impl</artifactId>
diff --git a/pom.xml b/pom.xml
index 389fb0b..7f60d69 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
<groupId>net.shibboleth.oidc</groupId>
<artifactId>oidc-common-parent</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
<name>Shibboleth IdP :: Plugins :: OIDC Common :: Parent</name>
<packaging>pom</packaging>
<description>A POM containing properties, dependencies, etc. that are common across all Shibboleth OIDC Java common libraries.</description>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list