[java-idp-plugin-oidc-config] branch main updated: Bump version to 2.0.0-SNAPSHOT and port to V5 codebase
Henri Mikkonen
henri.mikkonen at iki.fi
Wed Jun 21 13:39:14 UTC 2023
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=c5b6c9cf9a9e58d1d8316b00fe40a85bc11ed5f8
The following commit(s) were added to refs/heads/main by this push:
new c5b6c9c Bump version to 2.0.0-SNAPSHOT and port to V5 codebase
c5b6c9c is described below
commit c5b6c9cf9a9e58d1d8316b00fe40a85bc11ed5f8
Author: Henri Mikkonen <henri.mikkonen at iki.fi>
AuthorDate: Wed Jun 21 16:38:49 2023 +0300
Bump version to 2.0.0-SNAPSHOT and port to V5 codebase
- plugin.version to 2.0.0 and module ID to idp.oidc.config.2
- require java-oidc-common 3.0.0 (idp.oidc.common.4)
---
oidc-config-dist/pom.xml | 37 +++++++++---------
oidc-config-impl/pom.xml | 44 ++++++++++++----------
.../idp/plugin/oidc/config/OIDCConfigModule.java | 2 +-
.../idp/plugin/oidc/config/OIDCConfigPlugin.java | 4 +-
.../idp/service/relying-party/postconfig.xml | 28 +++++++-------
.../idp/plugin/oidc/config/module.properties | 10 ++---
.../idp/plugin/oidc/config/plugin.properties | 4 +-
pom.xml | 20 ++++------
8 files changed, 76 insertions(+), 73 deletions(-)
diff --git a/oidc-config-dist/pom.xml b/oidc-config-dist/pom.xml
index 3a4a676..7f40a1c 100644
--- a/oidc-config-dist/pom.xml
+++ b/oidc-config-dist/pom.xml
@@ -1,24 +1,25 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>net.shibboleth.idp.plugin.config.oidc</groupId>
- <artifactId>idp-plugin-oidc-config-parent</artifactId>
- <version>1.0.2-SNAPSHOT</version>
- </parent>
-
- <artifactId>idp-plugin-oidc-config-dist</artifactId>
- <name>Shibboleth IdP :: Plugins :: OIDC/OAuth Shared Configuration :: Distribution</name>
- <description>Distribution of the OIDC/OAuth shared configuration plugin</description>
- <packaging>pom</packaging>
-
- <properties>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>net.shibboleth.idp.plugin.config.oidc</groupId>
+ <artifactId>idp-plugin-oidc-config-parent</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>idp-plugin-oidc-config-dist</artifactId>
+ <name>Shibboleth IdP :: Plugins :: OIDC/OAuth Shared Configuration :: Distribution</name>
+ <description>Distribution of the OIDC/OAuth shared configuration plugin</description>
+ <packaging>pom</packaging>
+
+ <properties>
<checkstyle.configLocation>${project.basedir}/../checkstyle.xml</checkstyle.configLocation>
- <dist.finalName>shibboleth-idp-plugin-oidc-config-${project.version}</dist.finalName>
+ <dist.finalName>shibboleth-idp-plugin-oidc-config-${project.version}</dist.finalName>
<dist.assemblyDirectory>${project.build.directory}/${dist.finalName}</dist.assemblyDirectory>
</properties>
-
- <build>
+
+ <build>
<plugins>
<!-- Copy src/main/resources to assembly directory. -->
<plugin>
diff --git a/oidc-config-impl/pom.xml b/oidc-config-impl/pom.xml
index 2c83148..3e4462c 100644
--- a/oidc-config-impl/pom.xml
+++ b/oidc-config-impl/pom.xml
@@ -1,21 +1,22 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>net.shibboleth.idp.plugin.config.oidc</groupId>
- <artifactId>idp-plugin-oidc-config-parent</artifactId>
- <version>1.0.2-SNAPSHOT</version>
- </parent>
-
- <artifactId>idp-plugin-oidc-config-impl</artifactId>
- <name>Shibboleth IdP :: Plugins :: OIDC/OAuth Shared Configuration :: Implementation</name>
- <description>Implemtation of the OIDC/OAuth shared configuration plugin. Containing the shared configuration</description>
-
- <properties>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>net.shibboleth.idp.plugin.config.oidc</groupId>
+ <artifactId>idp-plugin-oidc-config-parent</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>idp-plugin-oidc-config-impl</artifactId>
+ <name>Shibboleth IdP :: Plugins :: OIDC/OAuth Shared Configuration :: Implementation</name>
+ <description>Implemtation of the OIDC/OAuth shared configuration plugin. Containing the shared configuration</description>
+
+ <properties>
<automatic.module.name>net.shibboleth.idp.plugin.oidc.config</automatic.module.name>
<checkstyle.configLocation>${project.basedir}/../checkstyle.xml</checkstyle.configLocation>
- </properties>
-
- <dependencies>
+ </properties>
+
+ <dependencies>
<!-- Needed for module/plugin impls. -->
<dependency>
<groupId>${idp.groupId}</groupId>
@@ -27,7 +28,12 @@
<artifactId>idp-admin-impl</artifactId>
<scope>provided</scope>
</dependency>
- </dependencies>
+ <dependency>
+ <groupId>${slf4j.groupId}</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
<build>
<plugins>
@@ -35,7 +41,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
- <archive>
+ <archive>
<manifestSections>
<manifestSection>
<name>net/shibboleth/oidc/common/</name>
@@ -51,5 +57,5 @@
</plugin>
</plugins>
</build>
-
+
</project>
\ No newline at end of file
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/OIDCConfigModule.java
index 8557b47..d1fe91c 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/OIDCConfigModule.java
@@ -19,8 +19,8 @@ package net.shibboleth.idp.plugin.oidc.config;
import java.io.IOException;
-import net.shibboleth.idp.module.ModuleException;
import net.shibboleth.idp.module.impl.PluginIdPModule;
+import net.shibboleth.profile.module.ModuleException;
/** OIDC/OAuth shared configuration module.*/
public class OIDCConfigModule extends PluginIdPModule {
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 3367e2d..66dbdee 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
@@ -21,9 +21,9 @@ import java.io.IOException;
import java.util.Collections;
import net.shibboleth.idp.module.IdPModule;
-import net.shibboleth.idp.module.ModuleException;
-import net.shibboleth.idp.plugin.PluginException;
import net.shibboleth.idp.plugin.impl.FirstPartyIdPPlugin;
+import net.shibboleth.profile.module.ModuleException;
+import net.shibboleth.profile.plugin.PluginException;
/** OIDC/OAuth shared configuration plugin.*/
public class OIDCConfigPlugin extends FirstPartyIdPPlugin{
diff --git a/oidc-config-impl/src/main/resources/META-INF/net/shibboleth/idp/service/relying-party/postconfig.xml b/oidc-config-impl/src/main/resources/META-INF/net/shibboleth/idp/service/relying-party/postconfig.xml
index 59189b2..070389f 100644
--- a/oidc-config-impl/src/main/resources/META-INF/net/shibboleth/idp/service/relying-party/postconfig.xml
+++ b/oidc-config-impl/src/main/resources/META-INF/net/shibboleth/idp/service/relying-party/postconfig.xml
@@ -248,13 +248,13 @@
<!-- Used by the OP -->
<bean id="ClientInformationCredentialResolver"
class="net.shibboleth.oidc.security.credential.impl.ClientInformationCredentialResolver"
- p:remoteJwkSetCache-ref="shibboleth.oidc.RemoteJwkSetCache"
- p:keyFetchInterval="%{idp.oidc.provider.keyfetch.interval:PT30M}"/>
+ c:remoteJwkSetCache-ref="shibboleth.oidc.RemoteJwkSetCache"
+ c:keyFetchInterval="%{idp.oidc.provider.keyfetch.interval:PT30M}"/>
<!-- Used by the RP -->
<bean id="OIDCProviderMetadataCredentialResolver"
class="net.shibboleth.oidc.security.credential.impl.ProviderMetadataCredentialResolver"
- p:remoteJwkSetCache-ref="shibboleth.oidc.RemoteJwkSetCache"
- p:keyFetchInterval="%{idp.oidc.provider.keyfetch.interval:PT30M}" />
+ c:remoteJwkSetCache-ref="shibboleth.oidc.RemoteJwkSetCache"
+ c:keyFetchInterval="%{idp.oidc.provider.keyfetch.interval:PT30M}" />
<bean id="ClientSecretCriterionCredentialResolver"
class="net.shibboleth.oidc.security.credential.impl.ClientSecretCriterionCredentialResolver"/>
</list>
@@ -268,8 +268,8 @@
<!-- Used by the OP -->
<bean id="ClientInformationCredentialResolver"
class="net.shibboleth.oidc.security.credential.impl.ClientInformationCredentialResolver"
- p:remoteJwkSetCache-ref="shibboleth.oidc.RemoteJwkSetCache"
- p:keyFetchInterval="%{idp.oidc.provider.keyfetch.interval:PT30M}"/>
+ c:remoteJwkSetCache-ref="shibboleth.oidc.RemoteJwkSetCache"
+ c:keyFetchInterval="%{idp.oidc.provider.keyfetch.interval:PT30M}"/>
<!-- Used by the RP -->
<bean id="ClientSecretCriterionCredentialResolver"
class="net.shibboleth.oidc.security.credential.impl.ClientSecretCriterionCredentialResolver"/>
@@ -300,8 +300,8 @@
<!-- Used by the OP -->
<bean id="ClientInformationCredentialResolver"
class="net.shibboleth.oidc.security.credential.impl.ClientInformationCredentialResolver"
- p:remoteJwkSetCache-ref="shibboleth.oidc.RemoteJwkSetCache"
- p:keyFetchInterval="%{idp.oidc.provider.keyfetch.interval:PT30M}"/>
+ c:remoteJwkSetCache-ref="shibboleth.oidc.RemoteJwkSetCache"
+ c:keyFetchInterval="%{idp.oidc.provider.keyfetch.interval:PT30M}"/>
<!-- Used by the RP -->
<bean id="CriterionCredentialResolver"
class="net.shibboleth.oidc.security.credential.impl.ClientSecretCriterionCredentialResolver"/>
@@ -316,8 +316,8 @@
<!-- Used by the OP -->
<bean id="ClientInformationCredentialResolver"
class="net.shibboleth.oidc.security.credential.impl.ClientInformationCredentialResolver"
- p:remoteJwkSetCache-ref="shibboleth.oidc.RemoteJwkSetCache"
- p:keyFetchInterval="%{idp.oidc.provider.keyfetch.interval:PT30M}"/>
+ c:remoteJwkSetCache-ref="shibboleth.oidc.RemoteJwkSetCache"
+ c:keyFetchInterval="%{idp.oidc.provider.keyfetch.interval:PT30M}"/>
<!-- Used by the RP -->
<bean id="CriterionCredentialResolver"
class="net.shibboleth.oidc.security.credential.impl.ClientSecretCriterionCredentialResolver"/>
@@ -347,13 +347,13 @@
<!-- Used by the OP -->
<bean id="ClientInformationCredentialResolver"
class="net.shibboleth.oidc.security.credential.impl.ClientInformationCredentialResolver"
- p:remoteJwkSetCache-ref="shibboleth.oidc.RemoteJwkSetCache"
- p:keyFetchInterval="%{idp.oidc.provider.keyfetch.interval:PT30M}"/>
+ c:remoteJwkSetCache-ref="shibboleth.oidc.RemoteJwkSetCache"
+ c:keyFetchInterval="%{idp.oidc.provider.keyfetch.interval:PT30M}"/>
<!-- Used by the RP -->
<bean id="OIDCProviderMetadataCredentialResolver"
class="net.shibboleth.oidc.security.credential.impl.ProviderMetadataCredentialResolver"
- p:remoteJwkSetCache-ref="shibboleth.oidc.RemoteJwkSetCache"
- p:keyFetchInterval="%{idp.oidc.provider.keyfetch.interval:PT30M}"/>
+ c:remoteJwkSetCache-ref="shibboleth.oidc.RemoteJwkSetCache"
+ c:keyFetchInterval="%{idp.oidc.provider.keyfetch.interval:PT30M}"/>
<bean id="CriterionCredentialResolver"
class="net.shibboleth.oidc.security.credential.impl.ClientSecretCriterionCredentialResolver"/>
</list>
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 6216888..81b421b 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,12 +1,12 @@
# Properties defining this module.
# Class to Module ID mappings
-net.shibboleth.idp.plugin.oidc.config.OIDCConfigModule = idp.oidc.config.1
+net.shibboleth.idp.plugin.oidc.config.OIDCConfigModule = idp.oidc.config.2
# Module Owner
-idp.oidc.config.1.plugin = net.shibboleth.idp.plugin.oidc.config
+idp.oidc.config.2.plugin = net.shibboleth.idp.plugin.oidc.config
-idp.oidc.config.1.name = OIDC/OAuth configuration for the IdP
-idp.oidc.config.1.desc = Module to provide shared OIDC/OAuth configuration for IdP plugins to use
-idp.oidc.config.1.url = /OIDCConfig
+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
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 cccf57c..83ee233 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 = 1.0.1
+plugin.version = 2.0.0
-plugin.modules.required = idp.oidc.common.3
+plugin.modules.required = idp.oidc.common.4
diff --git a/pom.xml b/pom.xml
index 2fa6f40..139fc65 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,28 +1,24 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>net.shibboleth</groupId>
<artifactId>parent</artifactId>
- <version>11.3.5</version>
+ <version>17.0.0-SNAPSHOT</version>
</parent>
<groupId>net.shibboleth.idp.plugin.config.oidc</groupId>
<artifactId>idp-plugin-oidc-config-parent</artifactId>
- <version>1.0.2-SNAPSHOT</version>
+ <version>2.0.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>
<properties>
<idp.groupId>net.shibboleth.idp</idp.groupId>
- <idp.version>4.3.0</idp.version>
- <!--
- REMOVE this enforcer-data override once the parent is up to date with an enforcer-data that contains
- net.shibboleth.idp.plugin.config.oidc. See https://shibboleth.atlassian.net/browse/JMVN-52
- -->
- <maven-dist-enforcer-data.version>1.0.13</maven-dist-enforcer-data.version>
- <checkstyle.configLocation>${project.basedir}/checkstyle.xml</checkstyle.configLocation>
+ <idp.version>5.0.0-SNAPSHOT</idp.version>
+ <checkstyle.configLocation>${project.basedir}/checkstyle.xml</checkstyle.configLocation>
</properties>
<repositories>
@@ -47,7 +43,7 @@
<developerConnection>${shibboleth.scm.developerConnection}java-idp-plugin-oidc-config</developerConnection>
<url>${shibboleth.scm.url}java-idp-plugin-oidc-config.git</url>
</scm>
-
+
<distributionManagement>
<site>
<id>site</id>
@@ -71,7 +67,7 @@
<module>oidc-config-impl</module>
<module>oidc-config-dist</module>
</modules>
-
+
<build>
<plugins>
<plugin>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list