[java-identity-provider] branch main updated: Update dependencies after running analyze.
Scott Cantor
cantor.2 at osu.edu
Thu Sep 8 14:56:47 UTC 2022
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=0bcc0975d16db1ed19373261fb09353cfd8d6fba
The following commit(s) were added to refs/heads/main by this push:
new 0bcc0975d Update dependencies after running analyze.
0bcc0975d is described below
commit 0bcc0975d16db1ed19373261fb09353cfd8d6fba
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Sep 8 10:56:44 2022 -0400
Update dependencies after running analyze.
---
idp-admin-api/pom.xml | 29 ++++++++-----
idp-admin-impl/pom.xml | 48 +++++++--------------
idp-authn-api/pom.xml | 10 ++++-
idp-authn-impl/pom.xml | 20 ++++++---
idp-cas-api/pom.xml | 5 +--
idp-cas-impl/pom.xml | 73 ++++++++++++++++++--------------
idp-consent-impl/pom.xml | 29 +++++--------
idp-core/pom.xml | 76 +++++++++++++++++----------------
idp-installer/pom.xml | 108 +++++++++++++++++++----------------------------
idp-profile-api/pom.xml | 23 +++++++---
idp-profile-impl/pom.xml | 25 ++++-------
idp-saml-api/pom.xml | 60 +++++++++++++-------------
idp-saml-impl/pom.xml | 65 ++++++++++++----------------
idp-session-api/pom.xml | 11 +++++
idp-session-impl/pom.xml | 26 ++++++++++--
idp-spring/pom.xml | 22 ----------
idp-ui/pom.xml | 22 +++++++---
17 files changed, 325 insertions(+), 327 deletions(-)
diff --git a/idp-admin-api/pom.xml b/idp-admin-api/pom.xml
index 296701e1e..f3db0f991 100644
--- a/idp-admin-api/pom.xml
+++ b/idp-admin-api/pom.xml
@@ -37,16 +37,6 @@
<artifactId>idp-authn-api</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <scope>compile</scope><!-- normally runtime -->
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-core</artifactId>
- <scope>compile</scope><!-- normally runtime -->
- </dependency>
<dependency>
<groupId>${opensaml.groupId}</groupId>
@@ -60,12 +50,31 @@
<groupId>${opensaml.groupId}</groupId>
<artifactId>opensaml-saml-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-security-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-networking</artifactId>
+ </dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ </dependency>
+
<dependency>
<groupId>${spring.groupId}</groupId>
<artifactId>spring-core</artifactId>
diff --git a/idp-admin-impl/pom.xml b/idp-admin-impl/pom.xml
index bde6f26e1..76d19083d 100644
--- a/idp-admin-impl/pom.xml
+++ b/idp-admin-impl/pom.xml
@@ -27,6 +27,11 @@
<artifactId>idp-admin-api</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>idp-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>idp-profile-api</artifactId>
@@ -51,6 +56,10 @@
<artifactId>opensaml-storage-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-security</artifactId>
+ </dependency>
<dependency>
<groupId>${shib-shared.groupId}</groupId>
<artifactId>shib-spring</artifactId>
@@ -61,11 +70,6 @@
<artifactId>guava</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- </dependency>
-
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
@@ -136,33 +140,6 @@
</dependency>
<!-- Runtime Dependencies -->
- <!--
- These are strictly correct due to the embedded flows,
- but primarily present for Eclipse class lookup.
- -->
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>idp-authn-impl</artifactId>
- <version>${project.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>idp-profile-impl</artifactId>
- <version>${project.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>idp-saml-impl</artifactId>
- <version>${project.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-profile-impl</artifactId>
- <scope>runtime</scope>
- </dependency>
<dependency>
<groupId>${opensaml.groupId}</groupId>
<artifactId>opensaml-storage-impl</artifactId>
@@ -178,6 +155,7 @@
<scope>test</scope>
</dependency>
+ <!-- Needed for XMLObject providers. -->
<dependency>
<groupId>net.shibboleth</groupId>
<artifactId>shib-metadata-impl</artifactId>
@@ -191,6 +169,12 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>${spring.groupId}</groupId>
<artifactId>spring-test</artifactId>
diff --git a/idp-authn-api/pom.xml b/idp-authn-api/pom.xml
index c1beb136f..00c54115c 100644
--- a/idp-authn-api/pom.xml
+++ b/idp-authn-api/pom.xml
@@ -50,6 +50,10 @@
<artifactId>opensaml-messaging-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-security</artifactId>
+ </dependency>
<dependency>
<groupId>${shib-shared.groupId}</groupId>
<artifactId>shib-velocity</artifactId>
@@ -72,6 +76,10 @@
<groupId>${spring.groupId}</groupId>
<artifactId>spring-beans</artifactId>
</dependency>
+ <dependency>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-core</artifactId>
+ </dependency>
<dependency>
<groupId>${spring-webflow.groupId}</groupId>
<artifactId>spring-webflow</artifactId>
@@ -92,7 +100,7 @@
<artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
- <!-- This one is required even tho dependency:analyze says not -->
+ <!-- Required despite dependency:analyze. -->
<dependency>
<groupId>jakarta.json</groupId>
<artifactId>jakarta.json-api</artifactId>
diff --git a/idp-authn-impl/pom.xml b/idp-authn-impl/pom.xml
index d1a9ce6c0..3d531b198 100644
--- a/idp-authn-impl/pom.xml
+++ b/idp-authn-impl/pom.xml
@@ -90,6 +90,14 @@
<artifactId>opensaml-storage-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-networking</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-service</artifactId>
+ </dependency>
<dependency>
<groupId>${shib-shared.groupId}</groupId>
<artifactId>shib-spring</artifactId>
@@ -238,7 +246,8 @@
<scope>test</scope>
<type>test-jar</type>
</dependency>
-
+
+ <!-- Required despite dependency:analyze. -->
<dependency>
<groupId>net.shibboleth</groupId>
<artifactId>shib-attribute-resolver-spring</artifactId>
@@ -268,22 +277,21 @@
<dependency>
<groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-saml-impl</artifactId>
+ <artifactId>opensaml-security-impl</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-security-impl</artifactId>
+ <artifactId>opensaml-storage-impl</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-storage-impl</artifactId>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-security</artifactId>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>${shib-shared.groupId}</groupId>
<artifactId>shib-testing</artifactId>
diff --git a/idp-cas-api/pom.xml b/idp-cas-api/pom.xml
index 773a67c41..76d3202a7 100644
--- a/idp-cas-api/pom.xml
+++ b/idp-cas-api/pom.xml
@@ -58,12 +58,11 @@
<dependency>
<groupId>${shib-shared.groupId}</groupId>
- <artifactId>shib-service</artifactId>
+ <artifactId>shib-security</artifactId>
</dependency>
-
<dependency>
<groupId>${shib-shared.groupId}</groupId>
- <artifactId>shib-spring</artifactId>
+ <artifactId>shib-service</artifactId>
</dependency>
<dependency>
diff --git a/idp-cas-impl/pom.xml b/idp-cas-impl/pom.xml
index 1105406b2..350b4cde3 100644
--- a/idp-cas-impl/pom.xml
+++ b/idp-cas-impl/pom.xml
@@ -33,21 +33,11 @@
<artifactId>idp-cas-api</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>idp-core</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>idp-profile-api</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>idp-saml-api</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>idp-session-api</artifactId>
@@ -97,12 +87,22 @@
</dependency>
<dependency>
- <groupId>${spring.groupId}</groupId>
- <artifactId>spring-beans</artifactId>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-security</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-service</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
</dependency>
+
<dependency>
<groupId>${spring.groupId}</groupId>
- <artifactId>spring-core</artifactId>
+ <artifactId>spring-beans</artifactId>
</dependency>
<dependency>
<groupId>${spring.groupId}</groupId>
@@ -113,10 +113,6 @@
<artifactId>spring-webflow</artifactId>
</dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- </dependency>
<dependency>
<groupId>${httpclient.groupId}</groupId>
<artifactId>httpclient</artifactId>
@@ -125,19 +121,6 @@
<groupId>${httpclient.groupId}</groupId>
<artifactId>httpcore</artifactId>
</dependency>
- <dependency>
- <groupId>${shib-shared.groupId}</groupId>
- <artifactId>shib-spring</artifactId>
- </dependency>
- <dependency>
- <groupId>org.cryptacular</groupId>
- <artifactId>cryptacular</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
<!-- Provided Dependencies -->
<dependency>
@@ -159,19 +142,31 @@
</dependency>
<!-- Test Dependencies -->
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>idp-core</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <!-- Required despite dependency:analyze. -->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>idp-profile-impl</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>idp-saml-api</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>idp-session-impl</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>net.shibboleth</groupId>
<artifactId>shib-attribute-impl</artifactId>
@@ -204,6 +199,11 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-spring</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>${shib-shared.groupId}</groupId>
<artifactId>shib-testing</artifactId>
@@ -216,6 +216,12 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>${jetty.groupId}</groupId>
<artifactId>jetty-server</artifactId>
@@ -229,6 +235,11 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-core</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>${spring.groupId}</groupId>
<artifactId>spring-test</artifactId>
diff --git a/idp-consent-impl/pom.xml b/idp-consent-impl/pom.xml
index 6b10c0904..043a0b084 100644
--- a/idp-consent-impl/pom.xml
+++ b/idp-consent-impl/pom.xml
@@ -32,11 +32,6 @@
<artifactId>idp-profile-api</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>idp-saml-api</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>net.shibboleth</groupId>
@@ -47,6 +42,10 @@
<groupId>${opensaml.groupId}</groupId>
<artifactId>opensaml-core</artifactId>
</dependency>
+ <dependency>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-messaging-api</artifactId>
+ </dependency>
<dependency>
<groupId>${opensaml.groupId}</groupId>
<artifactId>opensaml-profile-api</artifactId>
@@ -64,11 +63,16 @@
<groupId>${shib-shared.groupId}</groupId>
<artifactId>shib-service</artifactId>
</dependency>
+ <dependency>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-spring</artifactId>
+ </dependency>
<dependency>
- <groupId>org.cryptacular</groupId>
- <artifactId>cryptacular</artifactId>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
</dependency>
+
<dependency>
<groupId>${spring.groupId}</groupId>
<artifactId>spring-context</artifactId>
@@ -91,11 +95,6 @@
</dependency>
<!-- Runtime Dependencies -->
- <dependency>
- <groupId>org.glassfish</groupId>
- <artifactId>jakarta.json</artifactId>
- <scope>runtime</scope>
- </dependency>
<!-- Test Dependencies -->
<dependency>
@@ -105,12 +104,6 @@
<scope>test</scope>
<type>test-jar</type>
</dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>idp-profile-impl</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>${opensaml.groupId}</groupId>
diff --git a/idp-core/pom.xml b/idp-core/pom.xml
index cf811755e..9db62fd68 100644
--- a/idp-core/pom.xml
+++ b/idp-core/pom.xml
@@ -22,31 +22,6 @@
<dependencies>
<!-- Compile Dependencies -->
- <dependency>
- <groupId>${spring.groupId}</groupId>
- <artifactId>spring-core</artifactId>
- </dependency>
- <dependency>
- <groupId>${spring.groupId}</groupId>
- <artifactId>spring-context</artifactId>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.datatype</groupId>
- <artifactId>jackson-datatype-jsr310</artifactId>
- </dependency>
- <dependency>
- <groupId>io.dropwizard.metrics</groupId>
- <artifactId>metrics-core</artifactId>
- </dependency>
- <dependency>
- <groupId>io.dropwizard.metrics</groupId>
- <artifactId>metrics-json</artifactId>
- </dependency>
-
<dependency>
<groupId>${opensaml.groupId}</groupId>
<artifactId>opensaml-core</artifactId>
@@ -60,6 +35,16 @@
<artifactId>opensaml-xmlsec-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-security</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-spring</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
@@ -70,36 +55,55 @@
</dependency>
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-beans</artifactId>
</dependency>
-
<dependency>
- <groupId>${shib-shared.groupId}</groupId>
- <artifactId>shib-security</artifactId>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-core</artifactId>
</dependency>
-
<dependency>
- <groupId>${shib-shared.groupId}</groupId>
- <artifactId>shib-spring</artifactId>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-context</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.datatype</groupId>
+ <artifactId>jackson-datatype-jsr310</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.dropwizard.metrics</groupId>
+ <artifactId>metrics-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.dropwizard.metrics</groupId>
+ <artifactId>metrics-json</artifactId>
+ </dependency>
+
<!-- Provided Dependencies -->
<dependency>
<groupId>com.beust</groupId>
<artifactId>jcommander</artifactId>
- <scope>provided</scope>
+ <scope>provided</scope>
</dependency>
<!-- Runtime Dependencies -->
<!-- Test Dependencies -->
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<scope>test</scope>
</dependency>
-
</dependencies>
diff --git a/idp-installer/pom.xml b/idp-installer/pom.xml
index 2bf0a191b..3abf8c2ce 100644
--- a/idp-installer/pom.xml
+++ b/idp-installer/pom.xml
@@ -44,59 +44,27 @@
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>${shib-shared.groupId}</groupId>
- <artifactId>shib-spring</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>com.beust</groupId>
- <artifactId>jcommander</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-core</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-xmlsec-api</artifactId>
+ <artifactId>opensaml-security-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant-launcher</artifactId>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-networking</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${spring.groupId}</groupId>
- <artifactId>spring-context</artifactId>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-security</artifactId>
<scope>provided</scope>
</dependency>
-
+
<dependency>
- <groupId>${spring.groupId}</groupId>
- <artifactId>spring-core</artifactId>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-spring</artifactId>
<scope>provided</scope>
</dependency>
@@ -129,47 +97,57 @@
<scope>provided</scope>
</dependency>
- <!-- Test Dependencies -->
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>idp-conf</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-core</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>idp-conf-impl</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
+ <groupId>com.beust</groupId>
+ <artifactId>jcommander</artifactId>
+ <scope>provided</scope>
</dependency>
+
<dependency>
- <groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-core</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-saml-impl</artifactId>
- <scope>test</scope>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-launcher</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-beans</artifactId>
+ <scope>provided</scope>
</dependency>
+
<dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcpkix-jdk15on</artifactId>
- <scope>test</scope>
+ <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>
+
+ <!-- Test Dependencies -->
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>idp-admin-impl</artifactId>
+ <artifactId>idp-conf</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
-
<dependency>
- <groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-invoker</artifactId>
- <version>3.1.0</version>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>idp-conf-impl</artifactId>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/idp-profile-api/pom.xml b/idp-profile-api/pom.xml
index 5b1138547..54f0bb220 100644
--- a/idp-profile-api/pom.xml
+++ b/idp-profile-api/pom.xml
@@ -52,11 +52,29 @@
<artifactId>opensaml-messaging-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-security</artifactId>
+ </dependency>
<dependency>
<groupId>${shib-shared.groupId}</groupId>
<artifactId>shib-spring</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>io.dropwizard.metrics</groupId>
+ <artifactId>metrics-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-beans</artifactId>
+ </dependency>
<dependency>
<groupId>${spring.groupId}</groupId>
<artifactId>spring-context</artifactId>
@@ -74,11 +92,6 @@
<artifactId>spring-webflow</artifactId>
</dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
-
<!-- Provided Dependencies -->
<dependency>
<groupId>jakarta.servlet</groupId>
diff --git a/idp-profile-impl/pom.xml b/idp-profile-impl/pom.xml
index e028bb6db..7e95505ef 100644
--- a/idp-profile-impl/pom.xml
+++ b/idp-profile-impl/pom.xml
@@ -71,6 +71,14 @@
<artifactId>opensaml-storage-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-networking</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-service</artifactId>
+ </dependency>
<dependency>
<groupId>${shib-shared.groupId}</groupId>
<artifactId>shib-spring</artifactId>
@@ -143,12 +151,6 @@
<artifactId>shib-attribute-resolver-impl</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>net.shibboleth</groupId>
- <artifactId>shib-attribute-resolver-impl</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>${opensaml.groupId}</groupId>
@@ -163,17 +165,6 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-profile-impl</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-saml-impl</artifactId>
- <version>${opensaml.version}</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>${opensaml.groupId}</groupId>
<artifactId>opensaml-storage-impl</artifactId>
diff --git a/idp-saml-api/pom.xml b/idp-saml-api/pom.xml
index adc2ffe51..3c1d1c3b2 100644
--- a/idp-saml-api/pom.xml
+++ b/idp-saml-api/pom.xml
@@ -38,6 +38,11 @@
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>net.shibboleth</groupId>
+ <artifactId>shib-attribute-api</artifactId>
+ </dependency>
+
<dependency>
<groupId>${opensaml.groupId}</groupId>
<artifactId>opensaml-saml-api</artifactId>
@@ -56,16 +61,19 @@
</dependency>
<dependency>
<groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-security-api</artifactId>
+ <artifactId>opensaml-soap-api</artifactId>
</dependency>
+
<dependency>
- <groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-soap-api</artifactId>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-spring</artifactId>
</dependency>
+
<dependency>
- <groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-xmlsec-api</artifactId>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
</dependency>
+
<dependency>
<groupId>${spring.groupId}</groupId>
<artifactId>spring-beans</artifactId>
@@ -78,20 +86,7 @@
<groupId>${spring.groupId}</groupId>
<artifactId>spring-core</artifactId>
</dependency>
- <dependency>
- <groupId>${spring-webflow.groupId}</groupId>
- <artifactId>spring-webflow</artifactId>
- </dependency>
- <dependency>
- <groupId>${shib-shared.groupId}</groupId>
- <artifactId>shib-spring</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
<!-- Provided Dependencies -->
<!-- Runtime Dependencies -->
@@ -105,23 +100,12 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>net.shibboleth</groupId>
- <artifactId>shib-attribute-impl</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>net.shibboleth</groupId>
<artifactId>shib-saml-attribute-impl</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>net.shibboleth</groupId>
- <artifactId>shib-metadata-api</artifactId>
- <scope>test</scope>
- </dependency>
-
<dependency>
<groupId>${opensaml.groupId}</groupId>
<artifactId>opensaml-core</artifactId>
@@ -134,13 +118,18 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
- <!-- Needed despite what dependency:analyze says -->
<dependency>
<groupId>${opensaml.groupId}</groupId>
<artifactId>opensaml-saml-impl</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-service</artifactId>
+ <scope>test</scope>
+ </dependency>
+
<!-- Needed despite what dependency:analyze says -->
<dependency>
<groupId>jakarta.servlet</groupId>
@@ -148,11 +137,20 @@
<scope>test</scope>
</dependency>
+ <!-- Needed despite what dependency:analyze says -->
<dependency>
<groupId>${spring.groupId}</groupId>
<artifactId>spring-test</artifactId>
- <scope>test</scope>
+ <scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>${spring-webflow.groupId}</groupId>
+ <artifactId>spring-webflow</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- Needed despite what dependency:analyze says -->
<dependency>
<groupId>org.xmlunit</groupId>
<artifactId>xmlunit-core</artifactId>
diff --git a/idp-saml-impl/pom.xml b/idp-saml-impl/pom.xml
index bcd7f53a6..c64bce956 100644
--- a/idp-saml-impl/pom.xml
+++ b/idp-saml-impl/pom.xml
@@ -22,11 +22,6 @@
<dependencies>
<!-- Compile Dependencies -->
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>idp-core</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>idp-saml-api</artifactId>
@@ -69,11 +64,6 @@
<artifactId>shib-saml-attribute-impl</artifactId>
</dependency>
- <dependency>
- <groupId>net.shibboleth</groupId>
- <artifactId>shib-metadata-api</artifactId>
- </dependency>
-
<dependency>
<groupId>${opensaml.groupId}</groupId>
<artifactId>opensaml-core</artifactId>
@@ -113,7 +103,20 @@
<dependency>
<groupId>${shib-shared.groupId}</groupId>
- <artifactId>shib-spring</artifactId>
+ <artifactId>shib-networking</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-security</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-service</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
</dependency>
<dependency>
@@ -122,11 +125,11 @@
</dependency>
<dependency>
<groupId>${spring.groupId}</groupId>
- <artifactId>spring-context</artifactId>
+ <artifactId>spring-core</artifactId>
</dependency>
<dependency>
<groupId>${spring.groupId}</groupId>
- <artifactId>spring-core</artifactId>
+ <artifactId>spring-context</artifactId>
</dependency>
<dependency>
<groupId>${spring.groupId}</groupId>
@@ -137,16 +140,6 @@
<artifactId>spring-webflow</artifactId>
</dependency>
- <dependency>
- <groupId>io.dropwizard.metrics</groupId>
- <artifactId>metrics-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
-
<!-- Provided Dependencies -->
<dependency>
<groupId>jakarta.json</groupId>
@@ -209,34 +202,29 @@
</dependency>
<dependency>
- <groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-core</artifactId>
- <type>test-jar</type>
+ <groupId>net.shibboleth</groupId>
+ <artifactId>shib-attribute-resolver-api</artifactId>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-profile-api</artifactId>
+ <artifactId>opensaml-core</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-saml-api</artifactId>
+ <artifactId>opensaml-profile-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-soap-impl</artifactId>
+ <artifactId>opensaml-saml-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-xmlsec-impl</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>${opensaml.groupId}</groupId>
<artifactId>opensaml-storage-impl</artifactId>
@@ -245,16 +233,15 @@
<dependency>
<groupId>${shib-shared.groupId}</groupId>
- <artifactId>shib-testing</artifactId>
+ <artifactId>shib-spring</artifactId>
<scope>test</scope>
</dependency>
-
<dependency>
- <groupId>org.hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-testing</artifactId>
<scope>test</scope>
</dependency>
-
+
<dependency>
<groupId>org.xmlunit</groupId>
<artifactId>xmlunit-core</artifactId>
diff --git a/idp-session-api/pom.xml b/idp-session-api/pom.xml
index 1d20e5f57..2c097e2f4 100644
--- a/idp-session-api/pom.xml
+++ b/idp-session-api/pom.xml
@@ -41,10 +41,21 @@
<artifactId>opensaml-messaging-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-networking</artifactId>
+ </dependency>
+
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-beans</artifactId>
+ </dependency>
+
<!-- Provided Dependencies -->
<dependency>
<groupId>jakarta.json</groupId>
diff --git a/idp-session-impl/pom.xml b/idp-session-impl/pom.xml
index 9ca582cf9..e93c99c02 100644
--- a/idp-session-impl/pom.xml
+++ b/idp-session-impl/pom.xml
@@ -60,19 +60,37 @@
<artifactId>opensaml-storage-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-networking</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-security</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-spring</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</dependency>
<dependency>
- <groupId>${spring-webflow.groupId}</groupId>
- <artifactId>spring-webflow</artifactId>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-beans</artifactId>
</dependency>
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
+ <groupId>${spring-webflow.groupId}</groupId>
+ <artifactId>spring-webflow</artifactId>
</dependency>
<!-- Provided Dependencies -->
diff --git a/idp-spring/pom.xml b/idp-spring/pom.xml
index b7e688bb6..01669377a 100644
--- a/idp-spring/pom.xml
+++ b/idp-spring/pom.xml
@@ -52,11 +52,6 @@
<groupId>${spring-webflow.groupId}</groupId>
<artifactId>spring-webflow</artifactId>
</dependency>
-
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
<!-- Provided Dependencies -->
<dependency>
@@ -75,29 +70,12 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-core</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-core</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>${opensaml.groupId}</groupId>
<artifactId>opensaml-profile-api</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>${spring.groupId}</groupId>
- <artifactId>spring-test</artifactId>
- <scope>test</scope>
- </dependency>
-
</dependencies>
<profiles>
diff --git a/idp-ui/pom.xml b/idp-ui/pom.xml
index 594221e7a..283350297 100644
--- a/idp-ui/pom.xml
+++ b/idp-ui/pom.xml
@@ -64,20 +64,21 @@
<groupId>${opensaml.groupId}</groupId>
<artifactId>opensaml-saml-api</artifactId>
</dependency>
-
+
<dependency>
- <groupId>${spring.groupId}</groupId>
- <artifactId>spring-core</artifactId>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-security</artifactId>
</dependency>
+ <dependency>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-spring</artifactId>
+ </dependency>
+
<dependency>
<groupId>${spring-webflow.groupId}</groupId>
<artifactId>spring-webflow</artifactId>
</dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
<!-- Provided Dependencies -->
<dependency>
<groupId>jakarta.servlet.jsp</groupId>
@@ -99,12 +100,19 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
+
+ <!-- Needed for XMLObject providers. -->
<dependency>
<groupId>${opensaml.groupId}</groupId>
<artifactId>opensaml-saml-impl</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-core</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>${spring.groupId}</groupId>
<artifactId>spring-test</artifactId>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list