[java-idp-oidc] branch main updated: Unlock parent POM and clean up dependencies.
Scott Cantor
cantor.2 at osu.edu
Wed Sep 27 19:52:37 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-oidc.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-oidc.git;a=commit;h=2e3d7ce29c96fdc99b7c917aaca58a9823d9aa9f
The following commit(s) were added to refs/heads/main by this push:
new 2e3d7ce2 Unlock parent POM and clean up dependencies.
2e3d7ce2 is described below
commit 2e3d7ce29c96fdc99b7c917aaca58a9823d9aa9f
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Sep 27 15:52:34 2023 -0400
Unlock parent POM and clean up dependencies.
---
idp-oidc-extension-api/pom.xml | 90 +++++++----
idp-oidc-extension-impl/pom.xml | 350 ++++++++++++++++++++++++++++------------
pom.xml | 51 +++---
3 files changed, 333 insertions(+), 158 deletions(-)
diff --git a/idp-oidc-extension-api/pom.xml b/idp-oidc-extension-api/pom.xml
index 107f91be..aade0e5e 100644
--- a/idp-oidc-extension-api/pom.xml
+++ b/idp-oidc-extension-api/pom.xml
@@ -24,28 +24,28 @@
<!-- Provided dependencies. -->
<dependency>
- <groupId>${shib-shared.groupId}</groupId>
- <artifactId>shib-spring</artifactId>
+ <groupId>${oidc-common.groupId}</groupId>
+ <artifactId>oidc-common-metadata-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-saml-api</artifactId>
+ <groupId>${oidc-common.groupId}</groupId>
+ <artifactId>oidc-common-crypto-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>${idp.groupId}</groupId>
- <artifactId>idp-profile-api</artifactId>
+ <artifactId>idp-admin-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>${idp.groupId}</groupId>
- <artifactId>idp-admin-api</artifactId>
+ <artifactId>idp-authn-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>${idp.groupId}</groupId>
- <artifactId>idp-authn-api</artifactId>
+ <artifactId>idp-profile-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -54,28 +54,66 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${shib-shared.groupId}</groupId>
+ <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-resolver-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-security-api</artifactId>
- <scope>provided</scope>
+ <artifactId>opensaml-messaging-api</artifactId>
</dependency>
<dependency>
<groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-xmlsec-api</artifactId>
+ <artifactId>opensaml-profile-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-security</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${oidc-common.groupId}</groupId>
- <artifactId>oidc-common-metadata-api</artifactId>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-service</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${oidc-common.groupId}</groupId>
- <artifactId>oidc-common-crypto-api</artifactId>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-spring</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-support</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${spring-webflow.groupId}</groupId>
+ <artifactId>spring-webflow</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.nimbusds</groupId>
+ <artifactId>nimbus-jose-jwt</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -84,18 +122,18 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>jakarta.mail</groupId>
- <artifactId>jakarta.mail-api</artifactId>
+ <groupId>net.minidev</groupId>
+ <artifactId>json-smart</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
+ <groupId>com.nimbusds</groupId>
+ <artifactId>content-type</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.datatype</groupId>
- <artifactId>jackson-datatype-jsr310</artifactId>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
<scope>provided</scope>
</dependency>
@@ -115,16 +153,6 @@
<artifactId>idp-testing</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-storage-impl</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${spring.groupId}</groupId>
- <artifactId>spring-test</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
diff --git a/idp-oidc-extension-impl/pom.xml b/idp-oidc-extension-impl/pom.xml
index 6f3ccb29..92b151af 100644
--- a/idp-oidc-extension-impl/pom.xml
+++ b/idp-oidc-extension-impl/pom.xml
@@ -27,24 +27,55 @@
</dependency>
<!-- provided dependencies -->
- <dependency>
- <groupId>net.minidev</groupId>
- <artifactId>json-smart</artifactId>
- <scope>provided</scope>
+ <dependency>
+ <groupId>${oidc-common.groupId}</groupId>
+ <artifactId>oidc-common-attribute-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>com.nimbusds</groupId>
- <artifactId>lang-tag</artifactId>
- <scope>provided</scope>
+ <groupId>${oidc-common.groupId}</groupId>
+ <artifactId>oidc-common-attribute-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>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
+ <groupId>${oidc-common.groupId}</groupId>
+ <artifactId>oidc-common-crypto-impl</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <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-metadata-impl</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${oidc-common.groupId}</groupId>
+ <artifactId>oidc-common-profile-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${oidc-common.groupId}</groupId>
+ <artifactId>oidc-common-profile-impl</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <!-- Needed to allow module/plugin derivation. -->
+ <dependency>
+ <groupId>${idp.groupId}</groupId>
+ <artifactId>idp-admin-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${idp.groupId}</groupId>
+ <artifactId>idp-admin-impl</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -57,6 +88,16 @@
<artifactId>idp-authn-impl</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>${idp.groupId}</groupId>
+ <artifactId>idp-consent-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${idp.groupId}</groupId>
+ <artifactId>idp-cli</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>${idp.groupId}</groupId>
<artifactId>idp-profile-api</artifactId>
@@ -64,57 +105,92 @@
</dependency>
<dependency>
<groupId>${idp.groupId}</groupId>
- <artifactId>idp-spring</artifactId>
+ <artifactId>idp-profile-impl</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>${idp.groupId}</groupId>
- <artifactId>idp-cli</artifactId>
+ <artifactId>idp-session-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${shib-shared.groupId}</groupId>
- <artifactId>shib-support</artifactId>
+ <groupId>${shib-profile.groupId}</groupId>
+ <artifactId>shib-profile-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${shib-shared.groupId}</groupId>
- <artifactId>shib-spring</artifactId>
+ <groupId>${shib-profile.groupId}</groupId>
+ <artifactId>shib-saml-profile-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${shib-shared.groupId}</groupId>
- <artifactId>shib-security-spring</artifactId>
+ <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>${shib-attribute.groupId}</groupId>
+ <artifactId>shib-saml-attribute-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${shib-attribute.groupId}</groupId>
+ <artifactId>shib-saml-attribute-impl</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${shib-attribute.groupId}</groupId>
+ <artifactId>shib-attribute-filter-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${shib-attribute.groupId}</groupId>
+ <artifactId>shib-attribute-filter-impl</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${shib-shared.groupId}</groupId>
- <artifactId>shib-networking-spring</artifactId>
+ <groupId>${shib-attribute.groupId}</groupId>
+ <artifactId>shib-attribute-filter-spring</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${shib-shared.groupId}</groupId>
- <artifactId>shib-cli</artifactId>
+ <groupId>${shib-attribute.groupId}</groupId>
+ <artifactId>shib-attribute-resolver-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${shib-shared.groupId}</groupId>
- <artifactId>shib-attribute-resolver-spring</artifactId>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-core-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${shib-shared.groupId}</groupId>
- <artifactId>shib-saml-profile-api</artifactId>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-messaging-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${shib-shared.groupId}</groupId>
- <artifactId>shib-profile-api</artifactId>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-profile-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${shib-shared.groupId}</groupId>
- <artifactId>shib-profile-impl</artifactId>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-saml-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-saml-impl</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-security-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -123,109 +199,113 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${shib-shared.groupId}</groupId>
- <artifactId>shib-attribute-filter-spring</artifactId>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-xmlsec-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>${shib-shared.groupId}</groupId>
- <artifactId>shib-attribute-filter-impl</artifactId>
+ <artifactId>shib-networking</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${idp.groupId}</groupId>
- <artifactId>idp-consent-impl</artifactId>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-security</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${idp.groupId}</groupId>
- <artifactId>idp-ui</artifactId>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-service</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${idp.groupId}</groupId>
- <artifactId>idp-installer</artifactId>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-support</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${oidc-common.groupId}</groupId>
- <artifactId>oidc-common-attribute-api</artifactId>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-spring</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${oidc-common.groupId}</groupId>
- <artifactId>oidc-common-attribute-impl</artifactId>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-beans</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${oidc-common.groupId}</groupId>
- <artifactId>oidc-common-crypto-api</artifactId>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-context</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${oidc-common.groupId}</groupId>
- <artifactId>oidc-common-crypto-impl</artifactId>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${oidc-common.groupId}</groupId>
- <artifactId>oidc-common-metadata-api</artifactId>
+ <groupId>${spring-webflow.groupId}</groupId>
+ <artifactId>spring-webflow</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${oidc-common.groupId}</groupId>
- <artifactId>oidc-common-metadata-impl</artifactId>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${oidc-common.groupId}</groupId>
- <artifactId>oidc-common-profile-api</artifactId>
+ <groupId>${httpclient.groupId}</groupId>
+ <artifactId>${httpclient.artifactId}</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${oidc-common.groupId}</groupId>
- <artifactId>oidc-common-profile-impl</artifactId>
+ <groupId>${httpclient.httpcore.groupId}</groupId>
+ <artifactId>${httpclient.httpcore.artifactId}</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${oidc-common.groupId}</groupId>
- <artifactId>oidc-common-saml-api</artifactId>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${slf4j.groupId}</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-profile-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.minidev</groupId>
+ <artifactId>json-smart</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>${shib-shared.groupId}</groupId>
- <artifactId>shib-attribute-filter-api</artifactId>
- <scope>provided</scope>
- </dependency>
+ <groupId>com.nimbusds</groupId>
+ <artifactId>lang-tag</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
- <groupId>jakarta.servlet</groupId>
- <artifactId>jakarta.servlet-api</artifactId>
+ <groupId>com.nimbusds</groupId>
+ <artifactId>oauth2-oidc-sdk</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${idp.groupId}</groupId>
- <artifactId>idp-admin-api</artifactId>
+ <groupId>com.nimbusds</groupId>
+ <artifactId>nimbus-jose-jwt</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>net.shibboleth.idp.plugin.config.oidc</groupId>
- <artifactId>idp-plugin-oidc-config-impl</artifactId>
+ <groupId>com.github.jasminb</groupId>
+ <artifactId>jsonapi-converter</artifactId>
<scope>provided</scope>
</dependency>
- <!-- Needed to allow module/plugin derivation. -->
<dependency>
- <groupId>${idp.groupId}</groupId>
- <artifactId>idp-admin-impl</artifactId>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -233,32 +313,60 @@
<artifactId>jcommander</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity-engine-core</artifactId>
+ </dependency>
<!-- Test Dependencies -->
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
+ <groupId>net.shibboleth.idp.plugin.config.oidc</groupId>
+ <artifactId>idp-plugin-oidc-config-impl</artifactId>
<scope>test</scope>
</dependency>
- <!-- Needed for Nimbus use in tests. -->
<dependency>
- <groupId>com.sun.mail</groupId>
- <artifactId>jakarta.mail</artifactId>
+ <groupId>net.shibboleth.idp.plugin.oidc</groupId>
+ <artifactId>idp-plugin-oidc-op-api</artifactId>
+ <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.codehaus.janino</groupId>
- <artifactId>janino</artifactId>
+ <groupId>${oidc-common.groupId}</groupId>
+ <artifactId>oidc-common-crypto-impl</artifactId>
+ <version>${oidc-common.version}</version>
+ <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
+ <groupId>${oidc-common.groupId}</groupId>
+ <artifactId>oidc-common-saml-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-testing</artifactId>
+ <groupId>${oidc-common.groupId}</groupId>
+ <artifactId>oidc-common-saml-impl</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${idp.groupId}</groupId>
+ <artifactId>idp-consent-impl</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${idp.groupId}</groupId>
+ <artifactId>idp-installer</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${idp.groupId}</groupId>
+ <artifactId>idp-session-impl</artifactId>
<scope>test</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>${idp.groupId}</groupId>
+ <artifactId>idp-cas-impl</artifactId>
+ <scope>test</scope>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>${idp.groupId}</groupId>
@@ -272,6 +380,16 @@
<artifactId>idp-schema</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>${idp.groupId}</groupId>
+ <artifactId>idp-spring</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${idp.groupId}</groupId>
+ <artifactId>idp-ui</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>${idp.groupId}</groupId>
<artifactId>idp-testing</artifactId>
@@ -290,8 +408,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${shib-shared.groupId}</groupId>
- <artifactId>shib-testing</artifactId>
+ <groupId>${shib-profile.groupId}</groupId>
+ <artifactId>shib-profile-impl</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -301,6 +419,11 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>${shib-attribute.groupId}</groupId>
+ <artifactId>shib-attribute-resolver-spring</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>${opensaml.groupId}</groupId>
<artifactId>opensaml-profile-impl</artifactId>
@@ -318,16 +441,28 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>net.shibboleth.idp.plugin.oidc</groupId>
- <artifactId>idp-plugin-oidc-op-api</artifactId>
- <type>test-jar</type>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-testing</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${oidc-common.groupId}</groupId>
- <artifactId>oidc-common-crypto-impl</artifactId>
- <version>${oidc-common.version}</version>
- <type>test-jar</type>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-cli</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-networking-spring</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-security-spring</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-testing</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -341,21 +476,30 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${oidc-common.groupId}</groupId>
- <artifactId>oidc-common-saml-impl</artifactId>
+ <groupId>${slf4j.groupId}</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${idp.groupId}</groupId>
- <artifactId>idp-session-impl</artifactId>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
<scope>test</scope>
- <optional>true</optional>
</dependency>
+ <!-- Needed for Nimbus use in tests. -->
<dependency>
- <groupId>${idp.groupId}</groupId>
- <artifactId>idp-cas-impl</artifactId>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>jakarta.mail</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.janino</groupId>
+ <artifactId>janino</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
<scope>test</scope>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>org.hsqldb</groupId>
diff --git a/pom.xml b/pom.xml
index d4dfe686..9fbbf415 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.oidc</groupId>
<artifactId>idp-plugin-oidc-op-parent</artifactId>
@@ -15,13 +15,15 @@
<properties>
<shib-shared.groupId>net.shibboleth</shib-shared.groupId>
<shib-shared.version>9.0.0</shib-shared.version>
- <java-shib-shared.version>9.0.0</java-shib-shared.version>
<oidc-common.groupId>net.shibboleth.oidc</oidc-common.groupId>
<oidc-common.version>3.0.1-SNAPSHOT</oidc-common.version>
<idp.groupId>net.shibboleth.idp</idp.groupId>
<idp.version>5.0.0</idp.version>
+ <shib-profile.groupId>net.shibboleth</shib-profile.groupId>
<shib-profile.version>5.0.0</shib-profile.version>
+ <shib-attribute.groupId>net.shibboleth</shib-attribute.groupId>
<shib-attribute.version>5.0.0</shib-attribute.version>
+ <shib-metadata.groupId>net.shibboleth</shib-metadata.groupId>
<shib-metadata.version>5.0.0</shib-metadata.version>
<opensaml.groupId>org.opensaml</opensaml.groupId>
<opensaml.version>5.0.0</opensaml.version>
@@ -34,9 +36,6 @@
<oidc.config.version>2.0.0</oidc.config.version>
<commons.io.version>2.6</commons.io.version>
<checkstyle.configLocation>${project.basedir}/resources/checkstyle.xml</checkstyle.configLocation>
-
- <!-- TODO: Remove once in project parent: Base URL for all our deployed javadocs. -->
- <javadoc.url>https://shibboleth.net/api</javadoc.url>
</properties>
<description>
@@ -83,6 +82,11 @@
<artifactId>slf4j-api</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
@@ -106,32 +110,39 @@
</dependency>
<!-- Import Dependencies: Shib-Metadata/Attribute/Profile -->
<dependency>
- <groupId>${shib-shared.groupId}</groupId>
+ <groupId>${shib-profile.groupId}</groupId>
<artifactId>shib-profile-bom</artifactId>
<version>${shib-profile.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
- <!-- Import Dependencies: OpenSAML -->
<dependency>
- <groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-bom</artifactId>
- <version>${opensaml.version}</version>
+ <groupId>${shib-attribute.groupId}</groupId>
+ <artifactId>shib-attribute-bom</artifactId>
+ <version>${shib-attribute.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
- <!-- Import Dependencies: Shib-Shared -->
<dependency>
- <groupId>${shib-shared.groupId}</groupId>
- <artifactId>shib-attribute-bom</artifactId>
- <version>${shib-attribute.version}</version>
+ <groupId>${shib-metadata.groupId}</groupId>
+ <artifactId>shib-metadata-bom</artifactId>
+ <version>${shib-metadata.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
+ <!-- Import Dependencies: OpenSAML -->
+ <dependency>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-bom</artifactId>
+ <version>${opensaml.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <!-- Import Dependencies: Shared -->
<dependency>
<groupId>${shib-shared.groupId}</groupId>
- <artifactId>shib-metadata-bom</artifactId>
- <version>${shib-metadata.version}</version>
+ <artifactId>shib-shared-bom</artifactId>
+ <version>${shib-shared.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -153,14 +164,6 @@
<groupId>net.shibboleth.idp.plugin.oidc</groupId>
<version>${project.version}</version>
<artifactId>idp-plugin-oidc-op-api</artifactId>
- </dependency>
- <!-- Test bom dependencies -->
- <dependency>
- <groupId>${shib-shared.groupId}</groupId>
- <artifactId>shib-shared-bom</artifactId>
- <version>${shib-shared.version}</version>
- <type>pom</type>
- <scope>import</scope>
</dependency>
<!-- Other Test Dependencies -->
<dependency>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list