[java-idp-plugin-oidc-rp] branch main updated: Unlock parent POM and clean up dependencies.
Scott Cantor
cantor.2 at osu.edu
Wed Sep 27 17:37:17 UTC 2023
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-idp-plugin-oidc-rp.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-plugin-oidc-rp.git;a=commit;h=d1d3a9777048e982443597d5a0beb1df3239ae5b
The following commit(s) were added to refs/heads/main by this push:
new d1d3a97 Unlock parent POM and clean up dependencies.
d1d3a97 is described below
commit d1d3a9777048e982443597d5a0beb1df3239ae5b
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Sep 27 13:37:13 2023 -0400
Unlock parent POM and clean up dependencies.
---
idp-oidc-rp-api/pom.xml | 58 ++++-----
idp-oidc-rp-impl/pom.xml | 299 +++++++++++++++++++++++++----------------------
pom.xml | 7 +-
3 files changed, 187 insertions(+), 177 deletions(-)
diff --git a/idp-oidc-rp-api/pom.xml b/idp-oidc-rp-api/pom.xml
index 8515d3d..01b9205 100644
--- a/idp-oidc-rp-api/pom.xml
+++ b/idp-oidc-rp-api/pom.xml
@@ -22,23 +22,28 @@
<dependencies>
<!-- Provided dependencies -->
<dependency>
- <groupId>net.minidev</groupId>
- <artifactId>json-smart</artifactId>
- <scope>provided</scope>
+ <groupId>${oidc-common.groupId}</groupId>
+ <artifactId>oidc-common-crypto-api</artifactId>
+ <scope>provided</scope>
</dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
+ <dependency>
+ <groupId>${oidc-common.groupId}</groupId>
+ <artifactId>oidc-common-profile-api</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
+ <dependency>
+ <groupId>${oidc-common.groupId}</groupId>
+ <artifactId>oidc-common-metadata-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${oidc-common.groupId}</groupId>
- <artifactId>oidc-common-crypto-api</artifactId>
+ <groupId>${idp.groupId}</groupId>
+ <artifactId>idp-authn-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${shib-profile.groupId}</groupId>
+ <artifactId>shib-profile-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -46,11 +51,6 @@
<artifactId>opensaml-messaging-api</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>${opensaml.groupId}</groupId>
<artifactId>opensaml-security-api</artifactId>
@@ -64,11 +64,6 @@
<dependency>
<groupId>${shib-shared.groupId}</groupId>
<artifactId>shib-support</artifactId>
- </dependency>
- <dependency>
- <groupId>${shib-profile.groupId}</groupId>
- <artifactId>shib-profile-api</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>com.nimbusds</groupId>
@@ -81,18 +76,23 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${idp.groupId}</groupId>
- <artifactId>idp-authn-api</artifactId>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
<scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.minidev</groupId>
+ <artifactId>json-smart</artifactId>
+ <scope>provided</scope>
</dependency>
- <dependency>
- <groupId>${oidc-common.groupId}</groupId>
- <artifactId>oidc-common-profile-api</artifactId>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>${oidc-common.groupId}</groupId>
- <artifactId>oidc-common-metadata-api</artifactId>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/idp-oidc-rp-impl/pom.xml b/idp-oidc-rp-impl/pom.xml
index e3a4968..7b56ac8 100644
--- a/idp-oidc-rp-impl/pom.xml
+++ b/idp-oidc-rp-impl/pom.xml
@@ -31,95 +31,130 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-xmlsec-impl</artifactId>
+ <groupId>${oidc-common.groupId}</groupId>
+ <artifactId>oidc-common-crypto-impl</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>com.nimbusds</groupId>
- <artifactId>oauth2-oidc-sdk</artifactId>
+ <groupId>${oidc-common.groupId}</groupId>
+ <artifactId>oidc-common-crypto-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${oidc-common.groupId}</groupId>
+ <artifactId>oidc-common-metadata-impl</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-storage-api</artifactId>
+ <groupId>${oidc-common.groupId}</groupId>
+ <artifactId>oidc-common-metadata-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
+ <groupId>${oidc-common.groupId}</groupId>
+ <artifactId>oidc-common-attribute-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
+ <groupId>${oidc-common.groupId}</groupId>
+ <artifactId>oidc-common-attribute-impl</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>${slf4j.groupId}</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
+ <dependency>
+ <groupId>${oidc-common.groupId}</groupId>
+ <artifactId>oidc-common-profile-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
+ <groupId>${oidc-common.groupId}</groupId>
+ <artifactId>oidc-common-profile-impl</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
+ <groupId>${idp.groupId}</groupId>
+ <artifactId>idp-admin-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${oidc-common.groupId}</groupId>
- <artifactId>oidc-common-crypto-impl</artifactId>
+ <groupId>${idp.groupId}</groupId>
+ <artifactId>idp-admin-impl</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${oidc-common.groupId}</groupId>
- <artifactId>oidc-common-crypto-api</artifactId>
+ <groupId>${idp.groupId}</groupId>
+ <artifactId>idp-authn-api</artifactId>
<scope>provided</scope>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>${idp.groupId}</groupId>
+ <artifactId>idp-authn-impl</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
- <groupId>${oidc-common.groupId}</groupId>
- <artifactId>oidc-common-metadata-impl</artifactId>
+ <groupId>${idp.groupId}</groupId>
+ <artifactId>idp-profile-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${oidc-common.groupId}</groupId>
- <artifactId>oidc-common-metadata-api</artifactId>
+ <groupId>${idp.groupId}</groupId>
+ <artifactId>idp-profile-impl</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${oidc-common.groupId}</groupId>
- <artifactId>oidc-common-attribute-api</artifactId>
+ <groupId>${idp.groupId}</groupId>
+ <artifactId>idp-saml-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-xmlsec-api</artifactId>
+ <groupId>${idp.groupId}</groupId>
+ <artifactId>idp-session-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${oidc-common.groupId}</groupId>
- <artifactId>oidc-common-attribute-impl</artifactId>
+ <groupId>${idp.groupId}</groupId>
+ <artifactId>idp-ui</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${shib-profile.groupId}</groupId>
+ <artifactId>shib-profile-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${shib-profile.groupId}</groupId>
+ <artifactId>shib-profile-impl</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${shib-profile.groupId}</groupId>
+ <artifactId>shib-saml-profile-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${shib-attribute.groupId}</groupId>
+ <artifactId>shib-attribute-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${shib-attribute.groupId}</groupId>
+ <artifactId>shib-attribute-impl</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-messaging-api</artifactId>
+ <artifactId>opensaml-core-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${spring.groupId}</groupId>
- <artifactId>spring-web</artifactId>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-profile-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-storage-impl</artifactId>
+ <artifactId>opensaml-messaging-api</artifactId>
<scope>provided</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>${opensaml.groupId}</groupId>
<artifactId>opensaml-saml-api</artifactId>
@@ -132,107 +167,117 @@
</dependency>
<dependency>
<groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-core-api</artifactId>
+ <artifactId>opensaml-storage-impl</artifactId>
<scope>provided</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-profile-api</artifactId>
+ <artifactId>opensaml-xmlsec-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-xmlsec-impl</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${oidc-common.groupId}</groupId>
- <artifactId>oidc-common-profile-api</artifactId>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-spring</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${spring.groupId}</groupId>
- <artifactId>spring-context</artifactId>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-service</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>${shib-shared.groupId}</groupId>
- <artifactId>shib-attribute-filter-api</artifactId>
+ <artifactId>shib-networking</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${oidc-common.groupId}</groupId>
- <artifactId>oidc-common-profile-impl</artifactId>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-support</artifactId>
<scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>net.minidev</groupId>
- <artifactId>json-smart</artifactId>
- <scope>provided</scope>
- </dependency>
+ </dependency>
<dependency>
- <groupId>${spring.groupId}</groupId>
- <artifactId>spring-core</artifactId>
- <scope>provided</scope>
+ <groupId>com.nimbusds</groupId>
+ <artifactId>oauth2-oidc-sdk</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>com.nimbusds</groupId>
- <artifactId>nimbus-jose-jwt</artifactId>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-storage-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>com.nimbusds</groupId>
- <artifactId>content-type</artifactId>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>jakarta.servlet</groupId>
- <artifactId>jakarta.servlet-api</artifactId>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${idp.groupId}</groupId>
- <artifactId>idp-session-api</artifactId>
+ <groupId>${slf4j.groupId}</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${idp.groupId}</groupId>
- <artifactId>idp-ui</artifactId>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${idp.groupId}</groupId>
- <artifactId>idp-admin-api</artifactId>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${idp.groupId}</groupId>
- <artifactId>idp-profile-impl</artifactId>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-web</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>${idp.groupId}</groupId>
- <artifactId>idp-authn-api</artifactId>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${idp.groupId}</groupId>
- <artifactId>idp-authn-impl</artifactId>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-context</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${idp.groupId}</groupId>
- <artifactId>idp-admin-impl</artifactId>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-attribute-filter-api</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>${idp.groupId}</groupId>
- <artifactId>idp-profile-api</artifactId>
+ <dependency>
+ <groupId>net.minidev</groupId>
+ <artifactId>json-smart</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.nimbusds</groupId>
+ <artifactId>nimbus-jose-jwt</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>${idp.groupId}</groupId>
- <artifactId>idp-saml-api</artifactId>
+ <dependency>
+ <groupId>com.nimbusds</groupId>
+ <artifactId>content-type</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -250,52 +295,39 @@
<artifactId>spring-webflow</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>${shib-shared.groupId}</groupId>
- <artifactId>shib-support</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>${shib-profile.groupId}</groupId>
- <artifactId>shib-profile-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>${shib-attribute.groupId}</groupId>
- <artifactId>shib-attribute-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>${shib-attribute.groupId}</groupId>
- <artifactId>shib-attribute-impl</artifactId>
+ <dependency>
+ <groupId>${spring-webflow.groupId}</groupId>
+ <artifactId>spring-binding</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${shib-profile.groupId}</groupId>
- <artifactId>shib-profile-impl</artifactId>
+ <groupId>${httpclient.groupId}</groupId>
+ <artifactId>${httpclient.artifactId}</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${shib-shared.groupId}</groupId>
- <artifactId>shib-spring</artifactId>
+ <groupId>${httpclient.httpcore.groupId}</groupId>
+ <artifactId>${httpclient.httpcore.artifactId}</artifactId>
<scope>provided</scope>
</dependency>
+ <!-- Test dependencies -->
<dependency>
- <groupId>${shib-shared.groupId}</groupId>
- <artifactId>shib-service</artifactId>
- <scope>provided</scope>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>idp-plugin-oidc-rp-api</artifactId>
+ <scope>test</scope>
+ <type>test-jar</type>
</dependency>
<dependency>
- <groupId>${shib-profile.groupId}</groupId>
- <artifactId>shib-saml-profile-api</artifactId>
- <scope>provided</scope>
+ <groupId>${oidc-common.groupId}</groupId>
+ <artifactId>oidc-common-crypto-impl</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>${shib-shared.groupId}</groupId>
- <artifactId>shib-networking</artifactId>
- <scope>provided</scope>
+ <groupId>${idp.groupId}</groupId>
+ <artifactId>idp-conf-impl</artifactId>
+ <scope>test</scope>
</dependency>
- <!-- Test dependencies -->
<dependency>
<groupId>${idp.groupId}</groupId>
<artifactId>idp-testing</artifactId>
@@ -303,31 +335,20 @@
</dependency>
<dependency>
<groupId>${shib-shared.groupId}</groupId>
- <artifactId>shib-security</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${spring.groupId}</groupId>
- <artifactId>spring-test</artifactId>
+ <artifactId>shib-profile-testing</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${idp.groupId}</groupId>
- <artifactId>idp-conf-impl</artifactId>
+ <groupId>${shib-attribute.groupId}</groupId>
+ <artifactId>shib-attribute-filter-impl</artifactId>
<scope>test</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>${shib-shared.groupId}</groupId>
<artifactId>shib-attribute-filter-spring</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${oidc-common.groupId}</groupId>
- <artifactId>oidc-common-crypto-impl</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>${opensaml.groupId}</groupId>
<artifactId>opensaml-messaging-impl</artifactId>
<scope>test</scope>
@@ -339,14 +360,8 @@
</dependency>
<dependency>
<groupId>${shib-shared.groupId}</groupId>
- <artifactId>shib-profile-testing</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>idp-plugin-oidc-rp-api</artifactId>
+ <artifactId>shib-security</artifactId>
<scope>test</scope>
- <type>test-jar</type>
</dependency>
<dependency>
<groupId>${shib-shared.groupId}</groupId>
@@ -354,10 +369,10 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${shib-attribute.groupId}</groupId>
- <artifactId>shib-attribute-filter-impl</artifactId>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-test</artifactId>
<scope>test</scope>
- </dependency>
+ </dependency>
<!-- Spring webflow tests require Junit4, runs in TestNG bridge -->
<dependency>
<groupId>junit</groupId>
diff --git a/pom.xml b/pom.xml
index 8e833a0..c94164e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>net.shibboleth</groupId>
<artifactId>parent</artifactId>
- <version>17.0.1</version>
+ <version>17.0.2-SNAPSHOT</version>
</parent>
<groupId>net.shibboleth.idp.plugin.authn</groupId>
<artifactId>idp-plugin-oidc-rp-parent</artifactId>
@@ -35,11 +35,6 @@
<shib-metadata.groupId>net.shibboleth</shib-metadata.groupId>
<shib-metadata.version>5.0.0</shib-metadata.version>
<checkstyle.configLocation>${project.basedir}/resources/checkstyle/checkstyle.xml</checkstyle.configLocation>
-
- <!-- Remove when parent is unlocked -->
- <java-shib-shared.version>9.0.0</java-shib-shared.version>
- <!-- TODO: Remove once in project parent: Base URL for all our deployed javadocs. -->
- <javadoc.url>https://shibboleth.net/api</javadoc.url>
</properties>
<distributionManagement>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list