[java-oidc-common] branch main updated: Unlock parent POM, full dependency cleanup.
Scott Cantor
cantor.2 at osu.edu
Wed Sep 27 16:21:08 UTC 2023
This is an automated email from the git hooks/post-receive script.
scantor 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=3eafe98b55c186b4ac3d430506b77cd9c4b855e4
The following commit(s) were added to refs/heads/main by this push:
new 3eafe98 Unlock parent POM, full dependency cleanup.
3eafe98 is described below
commit 3eafe98b55c186b4ac3d430506b77cd9c4b855e4
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Sep 27 12:21:04 2023 -0400
Unlock parent POM, full dependency cleanup.
---
oidc-common-attribute-api/pom.xml | 7 +-
oidc-common-attribute-impl/pom.xml | 55 ++++++++----
oidc-common-crypto-api/pom.xml | 61 +++++++++++--
oidc-common-crypto-impl/pom.xml | 93 +++++++++++++------
oidc-common-metadata-api/pom.xml | 23 ++---
oidc-common-metadata-impl/pom.xml | 178 +++++++++++++++++++++++++++----------
oidc-common-plugin/pom.xml | 5 ++
oidc-common-profile-api/pom.xml | 56 +++++++++---
oidc-common-profile-impl/pom.xml | 85 +++++++++++++++---
oidc-common-saml-api/pom.xml | 10 +++
oidc-common-saml-impl/pom.xml | 15 +++-
pom.xml | 18 ++--
12 files changed, 464 insertions(+), 142 deletions(-)
diff --git a/oidc-common-attribute-api/pom.xml b/oidc-common-attribute-api/pom.xml
index 917c047..e2f0042 100644
--- a/oidc-common-attribute-api/pom.xml
+++ b/oidc-common-attribute-api/pom.xml
@@ -20,7 +20,7 @@
<dependencies>
<dependency>
- <groupId>${shib-shared.groupId}</groupId>
+ <groupId>${shib-attribute.groupId}</groupId>
<artifactId>shib-attribute-api</artifactId>
<scope>provided</scope>
</dependency>
@@ -29,6 +29,11 @@
<artifactId>opensaml-profile-api</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-support</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>com.nimbusds</groupId>
<artifactId>oauth2-oidc-sdk</artifactId>
diff --git a/oidc-common-attribute-impl/pom.xml b/oidc-common-attribute-impl/pom.xml
index 8dd5777..f8f4f65 100644
--- a/oidc-common-attribute-impl/pom.xml
+++ b/oidc-common-attribute-impl/pom.xml
@@ -20,30 +20,66 @@
</properties>
<dependencies>
+ <!-- Provided Dependencies -->
<dependency>
<groupId>${oidc-common.groupId}</groupId>
<artifactId>oidc-common-attribute-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${shib-shared.groupId}</groupId>
+ <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-attribute-resolver-spring</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-core-api</artifactId>
+ <version>${opensaml.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-profile-api</artifactId>
+ <version>${opensaml.version}</version>
+ </dependency>
<dependency>
<groupId>${shib-shared.groupId}</groupId>
<artifactId>shib-spring</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>net.shibboleth</groupId>
- <artifactId>shib-attribute-resolver-spring</artifactId>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-support</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-beans</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.nimbusds</groupId>
+ <artifactId>oauth2-oidc-sdk</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.minidev</groupId>
+ <artifactId>json-smart</artifactId>
<scope>provided</scope>
</dependency>
<!-- Test Dependencies -->
<dependency>
- <groupId>net.shibboleth</groupId>
+ <groupId>${shib-attribute.groupId}</groupId>
<artifactId>shib-attribute-resolver-spring</artifactId>
<version>${shib-attribute.version}</version>
<type>test-jar</type>
@@ -52,7 +88,6 @@
<dependency>
<groupId>${opensaml.groupId}</groupId>
<artifactId>opensaml-testing</artifactId>
- <version>${opensaml.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -60,16 +95,6 @@
<artifactId>shib-testing</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>${idp.groupId}</groupId>
- <artifactId>idp-testing</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${spring.groupId}</groupId>
- <artifactId>spring-test</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
diff --git a/oidc-common-crypto-api/pom.xml b/oidc-common-crypto-api/pom.xml
index c40aada..dc80857 100644
--- a/oidc-common-crypto-api/pom.xml
+++ b/oidc-common-crypto-api/pom.xml
@@ -19,9 +19,35 @@
</properties>
<dependencies>
+ <!-- Compile Dependencies -->
+ <dependency>
+ <groupId>com.nimbusds</groupId>
+ <artifactId>oauth2-oidc-sdk</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.nimbusds</groupId>
+ <artifactId>nimbus-jose-jwt</artifactId>
+ </dependency>
+
+ <!-- Provided Dependencies -->
+ <dependency>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-core-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-messaging-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-profile-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-saml-api</artifactId>
+ <artifactId>opensaml-security-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -35,9 +61,9 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>com.nimbusds</groupId>
- <artifactId>oauth2-oidc-sdk</artifactId>
- <scope>compile</scope>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-xmlsec-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>${shib-shared.groupId}</groupId>
@@ -45,9 +71,29 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>com.nimbusds</groupId>
- <artifactId>nimbus-jose-jwt</artifactId>
- <scope>compile</scope>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-support</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-beans</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${httpclient.groupId}</groupId>
+ <artifactId>${httpclient.artifactId}</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${httpclient.httpcore.groupId}</groupId>
+ <artifactId>${httpclient.httpcore.artifactId}</artifactId>
+ <scope>provided</scope>
</dependency>
<!-- Test Dependencies -->
@@ -59,7 +105,6 @@
<dependency>
<groupId>${slf4j.groupId}</groupId>
<artifactId>jcl-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
diff --git a/oidc-common-crypto-impl/pom.xml b/oidc-common-crypto-impl/pom.xml
index 156026e..d091ac6 100644
--- a/oidc-common-crypto-impl/pom.xml
+++ b/oidc-common-crypto-impl/pom.xml
@@ -19,16 +19,13 @@
</properties>
<dependencies>
- <dependency>
- <groupId>${shib-shared.groupId}</groupId>
- <artifactId>shib-profile-api</artifactId>
- <scope>provided</scope>
- </dependency>
+ <!-- Compile Dependencies -->
<dependency>
<groupId>com.nimbusds</groupId>
<artifactId>nimbus-jose-jwt</artifactId>
- <scope>compile</scope>
</dependency>
+
+ <!-- Provided Dependencies -->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>oidc-common-profile-api</artifactId>
@@ -49,9 +46,39 @@
<artifactId>oidc-common-metadata-api</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>${idp.groupId}</groupId>
+ <artifactId>idp-authn-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${idp.groupId}</groupId>
+ <artifactId>idp-profile-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${shib-profile.groupId}</groupId>
+ <artifactId>shib-profile-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-core-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-messaging-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-profile-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-saml-api</artifactId>
+ <artifactId>opensaml-security-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -61,47 +88,59 @@
</dependency>
<dependency>
<groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-xmlsec-impl</artifactId>
+ <artifactId>opensaml-storage-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${idp.groupId}</groupId>
- <artifactId>idp-authn-api</artifactId>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-xmlsec-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${shib-shared.groupId}</groupId>
- <artifactId>shib-spring</artifactId>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-xmlsec-impl</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>jakarta.servlet</groupId>
- <artifactId>jakarta.servlet-api</artifactId>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-support</artifactId>
<scope>provided</scope>
</dependency>
-
- <!-- Test scope -->
<dependency>
<groupId>${spring.groupId}</groupId>
- <artifactId>spring-test</artifactId>
- <scope>test</scope>
+ <artifactId>spring-core</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-testing</artifactId>
- <version>${opensaml.version}</version>
- <scope>test</scope>
+ <groupId>${spring-webflow.groupId}</groupId>
+ <artifactId>spring-webflow</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-testing</artifactId>
- <version>${opensaml.version}</version>
- <scope>test</scope>
+ <groupId>${httpclient.groupId}</groupId>
+ <artifactId>${httpclient.artifactId}</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${httpclient.httpcore.groupId}</groupId>
+ <artifactId>${httpclient.httpcore.artifactId}</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.nimbusds</groupId>
+ <artifactId>oauth2-oidc-sdk</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <scope>provided</scope>
</dependency>
+
+ <!-- Test scope -->
<dependency>
<groupId>${opensaml.groupId}</groupId>
<artifactId>opensaml-storage-impl</artifactId>
- <version>${opensaml.version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/oidc-common-metadata-api/pom.xml b/oidc-common-metadata-api/pom.xml
index 5e896ea..ff334e2 100644
--- a/oidc-common-metadata-api/pom.xml
+++ b/oidc-common-metadata-api/pom.xml
@@ -19,28 +19,31 @@
</properties>
<dependencies>
+ <!-- Compile Dependencies -->
<dependency>
- <groupId>${shib-shared.groupId}</groupId>
- <artifactId>shib-service</artifactId>
- <scope>provided</scope>
+ <groupId>com.nimbusds</groupId>
+ <artifactId>oauth2-oidc-sdk</artifactId>
</dependency>
+
+ <!-- Provided Dependencies -->
<dependency>
- <groupId>${idp.groupId}</groupId>
- <artifactId>idp-core</artifactId>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-messaging-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-profile-api</artifactId>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-service</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>com.nimbusds</groupId>
- <artifactId>oauth2-oidc-sdk</artifactId>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-support</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
+ <artifactId>jackson-annotations</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/oidc-common-metadata-impl/pom.xml b/oidc-common-metadata-impl/pom.xml
index 647466f..14fdaf5 100644
--- a/oidc-common-metadata-impl/pom.xml
+++ b/oidc-common-metadata-impl/pom.xml
@@ -20,30 +20,31 @@
</properties>
<dependencies>
-
+ <!-- Compile Dependencies -->
<dependency>
<groupId>com.nimbusds</groupId>
<artifactId>nimbus-jose-jwt</artifactId>
<scope>compile</scope>
</dependency>
+ <!-- Provided Dependencies -->
<dependency>
- <groupId>${shib-shared.groupId}</groupId>
- <artifactId>shib-spring</artifactId>
+ <groupId>${oidc-common.groupId}</groupId>
+ <artifactId>oidc-common-crypto-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${shib-shared.groupId}</groupId>
- <artifactId>shib-velocity-spring</artifactId>
+ <groupId>${oidc-common.groupId}</groupId>
+ <artifactId>oidc-common-profile-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${shib-shared.groupId}</groupId>
- <artifactId>shib-support</artifactId>
+ <groupId>${oidc-common.groupId}</groupId>
+ <artifactId>oidc-common-metadata-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${idp.groupId}</groupId>
- <artifactId>idp-profile-api</artifactId>
+ <groupId>${oidc-common.groupId}</groupId>
+ <artifactId>oidc-common-saml-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -52,58 +53,58 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-profile-api</artifactId>
+ <groupId>${shib-profile.groupId}</groupId>
+ <artifactId>shib-profile-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${idp.groupId}</groupId>
- <artifactId>idp-core</artifactId>
+ <groupId>${shib-attribute.groupId}</groupId>
+ <artifactId>shib-attribute-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${oidc-common.groupId}</groupId>
- <artifactId>oidc-common-crypto-api</artifactId>
+ <groupId>${shib-attribute.groupId}</groupId>
+ <artifactId>shib-attribute-resolver-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${oidc-common.groupId}</groupId>
- <artifactId>oidc-common-crypto-impl</artifactId>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-core-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${oidc-common.groupId}</groupId>
- <artifactId>oidc-common-profile-api</artifactId>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-messaging-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${oidc-common.groupId}</groupId>
- <artifactId>oidc-common-metadata-api</artifactId>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-profile-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${oidc-common.groupId}</groupId>
- <artifactId>oidc-common-saml-api</artifactId>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-saml-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${shib-shared.groupId}</groupId>
- <artifactId>shib-attribute-api</artifactId>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-security-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${shib-shared.groupId}</groupId>
- <artifactId>shib-attribute-resolver-api</artifactId>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-storage-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-storage-api</artifactId>
+ <artifactId>opensaml-saml-impl</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-saml-impl</artifactId>
+ <artifactId>opensaml-xmlsec-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -111,6 +112,86 @@
<artifactId>opensaml-xmlsec-impl</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-networking</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-service</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <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-beans</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-context</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>${httpclient.groupId}</groupId>
+ <artifactId>${httpclient.artifactId}</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${httpclient.httpcore.groupId}</groupId>
+ <artifactId>${httpclient.httpcore.artifactId}</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>io.dropwizard.metrics</groupId>
+ <artifactId>metrics-core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.minidev</groupId>
+ <artifactId>json-smart</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.nimbusds</groupId>
+ <artifactId>oauth2-oidc-sdk</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
@@ -128,46 +209,49 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${idp.groupId}</groupId>
- <artifactId>idp-saml-api</artifactId>
+ <groupId>${shib-attribute.groupId}</groupId>
+ <artifactId>shib-attribute-resolver-spring</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-storage-impl</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-storage-impl</artifactId>
- <version>${opensaml.version}</version>
+ <artifactId>opensaml-testing</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>net.shibboleth</groupId>
- <artifactId>shib-attribute-resolver-spring</artifactId>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-testing</artifactId>
<scope>test</scope>
</dependency>
- <!-- Needed for Nimbus use in tests. -->
<dependency>
- <groupId>com.sun.mail</groupId>
- <artifactId>jakarta.mail</artifactId>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-velocity-spring</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-testing</artifactId>
- <version>${opensaml.version}</version>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${shib-shared.groupId}</groupId>
- <artifactId>shib-testing</artifactId>
+ <groupId>org.hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${spring.groupId}</groupId>
- <artifactId>spring-test</artifactId>
+ <groupId>com.unboundid</groupId>
+ <artifactId>unboundid-ldapsdk</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <!-- Needed for Nimbus use in tests. -->
+ <dependency>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>jakarta.mail</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/oidc-common-plugin/pom.xml b/oidc-common-plugin/pom.xml
index e9b0b8c..6157aa4 100644
--- a/oidc-common-plugin/pom.xml
+++ b/oidc-common-plugin/pom.xml
@@ -29,6 +29,11 @@
<artifactId>idp-admin-impl</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>${shib-profile.groupId}</groupId>
+ <artifactId>shib-profile-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/oidc-common-profile-api/pom.xml b/oidc-common-profile-api/pom.xml
index b702345..274a6b4 100644
--- a/oidc-common-profile-api/pom.xml
+++ b/oidc-common-profile-api/pom.xml
@@ -18,24 +18,21 @@
</properties>
<dependencies>
- <dependency>
- <groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-security-api</artifactId>
- <scope>provided</scope>
- </dependency>
+ <!-- Compile Dependencies -->
<dependency>
<groupId>${oidc-common.groupId}</groupId>
<artifactId>oidc-common-crypto-api</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>${idp.groupId}</groupId>
- <artifactId>idp-core</artifactId>
- <scope>provided</scope>
+ <groupId>com.nimbusds</groupId>
+ <artifactId>nimbus-jose-jwt</artifactId>
+ <scope>compile</scope>
</dependency>
+ <!-- Provided Dependencies -->
<dependency>
- <groupId>${idp.groupId}</groupId>
- <artifactId>idp-profile-api</artifactId>
+ <groupId>${oidc-common.groupId}</groupId>
+ <artifactId>oidc-common-metadata-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -49,8 +46,33 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${oidc-common.groupId}</groupId>
- <artifactId>oidc-common-metadata-api</artifactId>
+ <groupId>${shib-profile.groupId}</groupId>
+ <artifactId>shib-profile-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-messaging-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-profile-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-security-api</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-beans</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -58,6 +80,16 @@
<artifactId>oauth2-oidc-sdk</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>net.minidev</groupId>
+ <artifactId>json-smart</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.nimbusds</groupId>
+ <artifactId>content-type</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
diff --git a/oidc-common-profile-impl/pom.xml b/oidc-common-profile-impl/pom.xml
index b1661e3..56b6676 100644
--- a/oidc-common-profile-impl/pom.xml
+++ b/oidc-common-profile-impl/pom.xml
@@ -18,6 +18,13 @@
</properties>
<dependencies>
+ <!-- Compile Dependencies -->
+ <dependency>
+ <groupId>com.nimbusds</groupId>
+ <artifactId>nimbus-jose-jwt</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <!-- Provided Dependencies -->
<dependency>
<groupId>${oidc-common.groupId}</groupId>
<artifactId>oidc-common-profile-api</artifactId>
@@ -30,29 +37,74 @@
<groupId>${oidc-common.groupId}</groupId>
<artifactId>oidc-common-metadata-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>${idp.groupId}</groupId>
+ <artifactId>idp-profile-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <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>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-messaging-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-profile-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-saml-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-security-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-xmlsec-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>${shib-shared.groupId}</groupId>
<artifactId>shib-networking</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${idp.groupId}</groupId>
- <artifactId>idp-core</artifactId>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-support</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${idp.groupId}</groupId>
- <artifactId>idp-profile-api</artifactId>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${idp.groupId}</groupId>
- <artifactId>idp-authn-api</artifactId>
+ <groupId>${spring-webflow.groupId}</groupId>
+ <artifactId>spring-webflow</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>jakarta.servlet</groupId>
- <artifactId>jakarta.servlet-api</artifactId>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity-engine-core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.minidev</groupId>
+ <artifactId>json-smart</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -60,16 +112,21 @@
<artifactId>oauth2-oidc-sdk</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
<!-- Test Dependencies -->
<dependency>
- <groupId>${spring.groupId}</groupId>
- <artifactId>spring-test</artifactId>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-spring</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-spring</artifactId>
+ <groupId>${idp.groupId}</groupId>
+ <artifactId>idp-testing</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -78,8 +135,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${idp.groupId}</groupId>
- <artifactId>idp-testing</artifactId>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-test</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/oidc-common-saml-api/pom.xml b/oidc-common-saml-api/pom.xml
index cf3b9ea..7ad549b 100644
--- a/oidc-common-saml-api/pom.xml
+++ b/oidc-common-saml-api/pom.xml
@@ -19,11 +19,21 @@
</properties>
<dependencies>
+ <dependency>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-core-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>${opensaml.groupId}</groupId>
<artifactId>opensaml-saml-api</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-support</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/oidc-common-saml-impl/pom.xml b/oidc-common-saml-impl/pom.xml
index c9b01cc..03da527 100644
--- a/oidc-common-saml-impl/pom.xml
+++ b/oidc-common-saml-impl/pom.xml
@@ -19,26 +19,37 @@
</properties>
<dependencies>
+ <!-- Provided Dependencies -->
<dependency>
<groupId>${oidc-common.groupId}</groupId>
<artifactId>oidc-common-saml-api</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-core-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>${opensaml.groupId}</groupId>
<artifactId>opensaml-saml-api</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-support</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Test Dependencies -->
<dependency>
<groupId>${opensaml.groupId}</groupId>
<artifactId>opensaml-testing</artifactId>
- <version>${opensaml.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${opensaml.groupId}</groupId>
<artifactId>opensaml-saml-impl</artifactId>
- <version>${opensaml.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/pom.xml b/pom.xml
index 559c263..c6e05c0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>net.shibboleth</groupId>
<artifactId>parent</artifactId>
- <version>17.0.1</version>
+ <version>17.0.2-SNAPSHOT</version>
</parent>
<groupId>net.shibboleth.oidc</groupId>
<artifactId>oidc-common-parent</artifactId>
@@ -17,13 +17,14 @@
<properties>
<shib-shared.groupId>net.shibboleth</shib-shared.groupId>
<shib-shared.version>9.0.0</shib-shared.version>
- <!-- TODO: remove once parent is unlocked -->
- <java-shib-shared.version>9.0.0</java-shib-shared.version>
<oidc-common.groupId>net.shibboleth.oidc</oidc-common.groupId>
<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>
@@ -71,6 +72,11 @@
<artifactId>slf4j-api</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
@@ -212,21 +218,21 @@
</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>
<dependency>
- <groupId>${shib-shared.groupId}</groupId>
+ <groupId>${shib-attribute.groupId}</groupId>
<artifactId>shib-attribute-bom</artifactId>
<version>${shib-attribute.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
- <groupId>${shib-shared.groupId}</groupId>
+ <groupId>${shib-metadata.groupId}</groupId>
<artifactId>shib-metadata-bom</artifactId>
<version>${shib-metadata.version}</version>
<type>pom</type>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list