[java-identity-provider] branch master updated: IDP-1620 Cleanup idp-parent pom. Phase 1
Rod Widdowson
rdw at steadingsoftware.com
Wed Jul 8 12:25:14 UTC 2020
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch master
in repository java-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=5bb654bd9e526fe533aad1db732da91101d0fc7c
The following commit(s) were added to refs/heads/master by this push:
new 5bb654bd9 IDP-1620 Cleanup idp-parent pom. Phase 1
5bb654bd9 is described below
commit 5bb654bd9e526fe533aad1db732da91101d0fc7c
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Jul 7 14:50:37 2020 +0100
IDP-1620 Cleanup idp-parent pom. Phase 1
https://issues.shibboleth.net/jira/browse/IDP-1620
* Remove all explicit dependencies
* Add relevant dependencies (the ones not in the parent) as Managed
* Fix any child poms (mostly by adding the servlet-api)
---
idp-admin-api/pom.xml | 6 +-
idp-admin-impl/pom.xml | 19 +++-
idp-attribute-filter-impl/pom.xml | 18 +++
idp-attribute-filter-spring/pom.xml | 13 +++
idp-attribute-impl/pom.xml | 1 -
idp-attribute-resolver-impl/pom.xml | 203 ++++++++++++++++++----------------
idp-attribute-resolver-spring/pom.xml | 16 ++-
idp-authn-api/pom.xml | 11 ++
idp-authn-impl/pom.xml | 18 +++
idp-cas-api/pom.xml | 1 -
idp-cas-impl/pom.xml | 14 ++-
idp-conf/pom.xml | 22 +++-
idp-consent-api/pom.xml | 3 +-
idp-consent-impl/pom.xml | 19 +++-
idp-core/pom.xml | 21 ++--
idp-distribution/pom.xml | 1 -
idp-installer/pom.xml | 1 -
idp-parent/pom.xml | 53 ++++-----
idp-profile-api/pom.xml | 10 ++
idp-profile-impl/pom.xml | 18 +++
idp-profile-spring/pom.xml | 22 +++-
idp-saml-api/pom.xml | 19 +++-
idp-saml-impl/pom.xml | 22 +++-
idp-schema/pom.xml | 3 +-
idp-session-api/pom.xml | 1 -
idp-session-impl/pom.xml | 6 +-
idp-ui/pom.xml | 7 +-
idp-war/pom.xml | 1 -
28 files changed, 381 insertions(+), 168 deletions(-)
diff --git a/idp-admin-api/pom.xml b/idp-admin-api/pom.xml
index cef2dcaf0..46e795af3 100644
--- a/idp-admin-api/pom.xml
+++ b/idp-admin-api/pom.xml
@@ -47,12 +47,16 @@
</dependency>
<!-- Provided Dependencies -->
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
<!-- Runtime Dependencies -->
<!-- Test Dependencies -->
- <!-- Managed Dependencies -->
</dependencies>
<scm>
diff --git a/idp-admin-impl/pom.xml b/idp-admin-impl/pom.xml
index 47efcf3aa..5799b6ffb 100644
--- a/idp-admin-impl/pom.xml
+++ b/idp-admin-impl/pom.xml
@@ -89,12 +89,17 @@
<artifactId>spring-webflow</artifactId>
</dependency>
- <dependency>
- <groupId>org.cryptacular</groupId>
- <artifactId>cryptacular</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.cryptacular</groupId>
+ <artifactId>cryptacular</artifactId>
+ </dependency>
<!-- Provided Dependencies -->
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
<!-- Runtime Dependencies -->
@@ -118,7 +123,11 @@
<scope>test</scope>
</dependency>
- <!-- Managed Dependencies -->
+ <dependency>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-test</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<scm>
diff --git a/idp-attribute-filter-impl/pom.xml b/idp-attribute-filter-impl/pom.xml
index 2f8a2b1bd..13afada64 100644
--- a/idp-attribute-filter-impl/pom.xml
+++ b/idp-attribute-filter-impl/pom.xml
@@ -157,6 +157,24 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>net.shibboleth.utilities</groupId>
+ <artifactId>java-support</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <scope>test</scope>
+ </dependency>
<!-- We need these even if mvn dependency:analyze says we don't - loaded by service interface -->
<dependency>
<groupId>org.graalvm.js</groupId>
diff --git a/idp-attribute-filter-spring/pom.xml b/idp-attribute-filter-spring/pom.xml
index ad36e77f0..eadd32c96 100644
--- a/idp-attribute-filter-spring/pom.xml
+++ b/idp-attribute-filter-spring/pom.xml
@@ -127,6 +127,19 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>net.shibboleth.utilities</groupId>
+ <artifactId>java-support</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
<!-- We need these even if mvn dependency:analyze says we don't - loaded by service interface -->
<dependency>
<groupId>org.graalvm.js</groupId>
diff --git a/idp-attribute-impl/pom.xml b/idp-attribute-impl/pom.xml
index 5e82b5566..1cbed22fb 100644
--- a/idp-attribute-impl/pom.xml
+++ b/idp-attribute-impl/pom.xml
@@ -58,7 +58,6 @@
<scope>test</scope>
</dependency>
- <!-- Managed Dependencies -->
</dependencies>
<scm>
diff --git a/idp-attribute-resolver-impl/pom.xml b/idp-attribute-resolver-impl/pom.xml
index 2573d0458..5dcbdcc98 100644
--- a/idp-attribute-resolver-impl/pom.xml
+++ b/idp-attribute-resolver-impl/pom.xml
@@ -20,23 +20,23 @@
<automatic.module.name>net.shibboleth.idp.attribute.resolver.impl</automatic.module.name>
</properties>
- <dependencies>
- <!-- Compile Dependencies -->
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>idp-attribute-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>idp-attribute-resolver-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>idp-attribute-impl</artifactId>
- <version>${project.version}</version>
- </dependency>
+ <dependencies>
+ <!-- Compile Dependencies -->
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>idp-attribute-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>idp-attribute-resolver-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>idp-attribute-impl</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>idp-authn-api</artifactId>
@@ -53,7 +53,7 @@
<version>${project.version}</version>
</dependency>
- <!-- We only need openSAML because of the legacy Contexts we need for scripting -->
+ <!-- We only need openSAML because of the legacy Contexts we need for scripting -->
<dependency>
<groupId>${opensaml.groupId}</groupId>
<artifactId>opensaml-core</artifactId>
@@ -80,35 +80,35 @@
<artifactId>spring-extensions</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity-engine-core</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.ldaptive</groupId>
- <artifactId>ldaptive</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity-engine-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.ldaptive</groupId>
+ <artifactId>ldaptive</artifactId>
+ </dependency>
<dependency>
<groupId>${spring.groupId}</groupId>
<artifactId>spring-core</artifactId>
</dependency>
- <!-- Provided Dependencies -->
+ <!-- Provided Dependencies -->
- <!-- Runtime Dependencies -->
- <!-- Test Dependencies -->
+ <!-- Runtime Dependencies -->
+ <!-- Test Dependencies -->
<dependency>
<groupId>${project.groupId}</groupId>
@@ -118,13 +118,13 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>idp-attribute-resolver-api</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>idp-attribute-resolver-api</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>idp-saml-impl</artifactId>
@@ -132,63 +132,70 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>idp-saml-impl</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>idp-saml-impl</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-core</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <!-- We need this even if mvn dependency:analyze says we don't - this
- provides the implementations of the SAML interfaces and by definition cannot
- be found via dependency analysis -->
- <groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-saml-impl</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-storage-impl</artifactId>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-core</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <!-- We need this even if mvn dependency:analyze says we don't - this
+ provides the implementations of the SAML interfaces and by definition cannot
+ be found via dependency analysis -->
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-saml-impl</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-storage-impl</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>net.shibboleth.ext</groupId>
<artifactId>spring-extensions</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.unboundid</groupId>
- <artifactId>unboundid-ldapsdk</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-profile-api</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-saml-impl</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>org.hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.unboundid</groupId>
+ <artifactId>unboundid-ldapsdk</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-profile-api</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-saml-impl</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>net.shibboleth.utilities</groupId>
+ <artifactId>java-support</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
<!-- We need these even if mvn dependency:analyze says we don't - loaded by service interface -->
<dependency>
<groupId>org.graalvm.js</groupId>
diff --git a/idp-attribute-resolver-spring/pom.xml b/idp-attribute-resolver-spring/pom.xml
index cdad82499..490fc3973 100644
--- a/idp-attribute-resolver-spring/pom.xml
+++ b/idp-attribute-resolver-spring/pom.xml
@@ -191,6 +191,20 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>net.shibboleth.utilities</groupId>
+ <artifactId>java-support</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- We need these even if mvn dependency:analyze says we don't - loaded by service interface -->
<dependency>
<groupId>org.graalvm.js</groupId>
<artifactId>js</artifactId>
@@ -204,7 +218,7 @@
<version>${graalvm.version}</version>
<scope>test</scope>
</dependency>
- <!-- Managed Dependencies -->
+
</dependencies>
<scm>
diff --git a/idp-authn-api/pom.xml b/idp-authn-api/pom.xml
index 90038f2fb..75a45f40f 100644
--- a/idp-authn-api/pom.xml
+++ b/idp-authn-api/pom.xml
@@ -74,6 +74,11 @@
<artifactId>jakarta.json-api</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
<!-- Runtime Dependencies -->
<dependency>
@@ -90,6 +95,12 @@
<scope>test</scope>
<type>test-jar</type>
</dependency>
+
+ <dependency>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-test</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
diff --git a/idp-authn-impl/pom.xml b/idp-authn-impl/pom.xml
index 276afd7b1..a5b871172 100644
--- a/idp-authn-impl/pom.xml
+++ b/idp-authn-impl/pom.xml
@@ -168,6 +168,11 @@
<artifactId>jakarta.json-api</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
<!-- Runtime Dependencies -->
<dependency>
@@ -251,6 +256,19 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>net.shibboleth.utilities</groupId>
+ <artifactId>java-support</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<scm>
diff --git a/idp-cas-api/pom.xml b/idp-cas-api/pom.xml
index 5b3c89f56..76243be45 100644
--- a/idp-cas-api/pom.xml
+++ b/idp-cas-api/pom.xml
@@ -59,7 +59,6 @@
<!-- Test Dependencies -->
- <!-- Managed Dependencies -->
</dependencies>
<scm>
diff --git a/idp-cas-impl/pom.xml b/idp-cas-impl/pom.xml
index 4fa9d3bfd..09845a8b6 100644
--- a/idp-cas-impl/pom.xml
+++ b/idp-cas-impl/pom.xml
@@ -203,7 +203,19 @@
<scope>test</scope>
</dependency>
- <!-- Managed Dependencies -->
+ <dependency>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>net.shibboleth.utilities</groupId>
+ <artifactId>java-support</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<scm>
diff --git a/idp-conf/pom.xml b/idp-conf/pom.xml
index cfd93e1d0..0e4f9f996 100644
--- a/idp-conf/pom.xml
+++ b/idp-conf/pom.xml
@@ -152,6 +152,26 @@
<artifactId>janino</artifactId>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>net.shibboleth.utilities</groupId>
+ <artifactId>java-support</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- We need these even if mvn dependency:analyze says we don't - loaded by service interface -->
<dependency>
<groupId>org.graalvm.js</groupId>
<artifactId>js</artifactId>
@@ -164,7 +184,7 @@
<version>${graalvm.version}</version>
<scope>test</scope>
</dependency>
- <!-- Managed Dependencies -->
+
</dependencies>
<scm>
diff --git a/idp-consent-api/pom.xml b/idp-consent-api/pom.xml
index 62a637a6f..1c7712990 100644
--- a/idp-consent-api/pom.xml
+++ b/idp-consent-api/pom.xml
@@ -34,7 +34,6 @@
<!-- Test Dependencies -->
- <!-- Managed Dependencies -->
</dependencies>
<scm>
@@ -50,4 +49,4 @@
</site>
</distributionManagement>
-</project>
\ No newline at end of file
+</project>
diff --git a/idp-consent-impl/pom.xml b/idp-consent-impl/pom.xml
index 1178b405a..d3d3da436 100644
--- a/idp-consent-impl/pom.xml
+++ b/idp-consent-impl/pom.xml
@@ -79,6 +79,11 @@
<artifactId>jakarta.json-api</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
<!-- Runtime Dependencies -->
<dependency>
@@ -119,7 +124,19 @@
<scope>test</scope>
</dependency>
- <!-- Managed Dependencies -->
+ <dependency>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>net.shibboleth.utilities</groupId>
+ <artifactId>java-support</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<scm>
diff --git a/idp-core/pom.xml b/idp-core/pom.xml
index 858fe8ac9..f57c1af3b 100644
--- a/idp-core/pom.xml
+++ b/idp-core/pom.xml
@@ -79,16 +79,21 @@
<artifactId>opensaml-xmlsec-api</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ </dependency>
<!-- Provided Dependencies -->
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
<!-- Runtime Dependencies -->
diff --git a/idp-distribution/pom.xml b/idp-distribution/pom.xml
index 2bb5d93c2..c59b75968 100644
--- a/idp-distribution/pom.xml
+++ b/idp-distribution/pom.xml
@@ -71,7 +71,6 @@
<!-- Test Dependencies -->
- <!-- Managed Dependencies -->
</dependencies>
<scm>
diff --git a/idp-installer/pom.xml b/idp-installer/pom.xml
index 575eb3c5c..8ca72415b 100644
--- a/idp-installer/pom.xml
+++ b/idp-installer/pom.xml
@@ -126,7 +126,6 @@
<scope>test</scope>
</dependency>
- <!-- Managed Dependencies -->
</dependencies>
<scm>
diff --git a/idp-parent/pom.xml b/idp-parent/pom.xml
index f15b88691..e8e99ffd8 100644
--- a/idp-parent/pom.xml
+++ b/idp-parent/pom.xml
@@ -98,46 +98,14 @@
</repository>
</repositories>
- <!-- Dependencies which are required by every single project module should go here and will be inherited by all modules. -->
<dependencies>
- <!-- Compile Dependencies -->
- <dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
- <dependency>
- <groupId>net.shibboleth.utilities</groupId>
- <artifactId>java-support</artifactId>
- </dependency>
- <dependency>
- <groupId>${spring.groupId}</groupId>
- <artifactId>spring-context-support</artifactId>
- </dependency>
+ <!-- This file should contain NO Dependencies. See IDP-1620. -->
<!-- Provided Dependencies -->
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- </dependency>
<!-- Runtime Dependencies -->
<!-- Test Dependencies -->
- <dependency>
- <groupId>${spring.groupId}</groupId>
- <artifactId>spring-test</artifactId>
- </dependency>
- <dependency>
- <groupId>net.shibboleth.utilities</groupId>
- <artifactId>java-support</artifactId>
- <version>${java-support.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
</dependencies>
@@ -146,7 +114,7 @@
used by all project modules. -->
<dependencyManagement>
<dependencies>
- <!-- Compile Dependencies -->
+ <!-- Import Dependencies: OpenSAML -->
<dependency>
<groupId>${opensaml.groupId}</groupId>
<artifactId>opensaml-bom</artifactId>
@@ -161,6 +129,9 @@
<type>pom</type>
<scope>import</scope>
</dependency>
+
+ <!-- Compile Dependencies -->
+
<dependency>
<groupId>net.shibboleth.utilities</groupId>
<artifactId>java-support</artifactId>
@@ -171,6 +142,7 @@
<artifactId>spring-extensions</artifactId>
<version>${spring-extensions.version}</version>
</dependency>
+
<dependency>
<groupId>${spring-webflow.groupId}</groupId>
<artifactId>spring-webflow</artifactId>
@@ -182,6 +154,11 @@
</exclusion>
</exclusions>
</dependency>
+<!-- <dependency>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-context-support</artifactId>
+ <version>${spring.version}</version>
+ </dependency> -->
<!-- Provided Dependencies -->
@@ -207,6 +184,14 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>net.shibboleth.utilities</groupId>
+ <artifactId>java-support</artifactId>
+ <version>${java-support.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
</dependencyManagement>
diff --git a/idp-profile-api/pom.xml b/idp-profile-api/pom.xml
index 113a0fc92..a036d3745 100644
--- a/idp-profile-api/pom.xml
+++ b/idp-profile-api/pom.xml
@@ -78,10 +78,20 @@
</dependency>
<!-- Provided Dependencies -->
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
<!-- Runtime Dependencies -->
<!-- Test Dependencies -->
+ <dependency>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-test</artifactId>
+ <scope>test</scope>
+ </dependency>
<!-- We need these even if mvn dependency:analyze says we don't - loaded by service interface -->
<dependency>
<groupId>org.graalvm.js</groupId>
diff --git a/idp-profile-impl/pom.xml b/idp-profile-impl/pom.xml
index 8bddc525c..a178af358 100644
--- a/idp-profile-impl/pom.xml
+++ b/idp-profile-impl/pom.xml
@@ -88,6 +88,11 @@
</dependency>
<!-- Provided Dependencies -->
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
<!-- Runtime Dependencies -->
@@ -173,6 +178,19 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>net.shibboleth.utilities</groupId>
+ <artifactId>java-support</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<scm>
diff --git a/idp-profile-spring/pom.xml b/idp-profile-spring/pom.xml
index 9313c397b..edd7dbd1b 100644
--- a/idp-profile-spring/pom.xml
+++ b/idp-profile-spring/pom.xml
@@ -174,6 +174,26 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>net.shibboleth.utilities</groupId>
+ <artifactId>java-support</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- We need these even if mvn dependency:analyze says we don't - loaded by service interface -->
<dependency>
<groupId>org.graalvm.js</groupId>
<artifactId>js</artifactId>
@@ -187,7 +207,7 @@
<version>${graalvm.version}</version>
<scope>test</scope>
</dependency>
- <!-- Managed Dependencies -->
+
</dependencies>
<scm>
diff --git a/idp-saml-api/pom.xml b/idp-saml-api/pom.xml
index debf81aa7..b0ca6fe9e 100644
--- a/idp-saml-api/pom.xml
+++ b/idp-saml-api/pom.xml
@@ -93,10 +93,10 @@
<artifactId>spring-webflow</artifactId>
</dependency>
- <dependency>
- <groupId>net.shibboleth.ext</groupId>
- <artifactId>spring-extensions</artifactId>
- </dependency>
+ <dependency>
+ <groupId>net.shibboleth.ext</groupId>
+ <artifactId>spring-extensions</artifactId>
+ </dependency>
<!-- Provided Dependencies -->
@@ -129,6 +129,17 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-test</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.xmlunit</groupId>
<artifactId>xmlunit-core</artifactId>
diff --git a/idp-saml-impl/pom.xml b/idp-saml-impl/pom.xml
index 47bd96b55..1c7bc8cc4 100644
--- a/idp-saml-impl/pom.xml
+++ b/idp-saml-impl/pom.xml
@@ -136,6 +136,11 @@
<artifactId>jakarta.json-api</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
<!-- Runtime Dependencies -->
<dependency>
@@ -225,11 +230,13 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>org.xmlunit</groupId>
<artifactId>xmlunit-core</artifactId>
@@ -240,7 +247,20 @@
<artifactId>xmlunit-matchers</artifactId>
<scope>test</scope>
</dependency>
-
+
+ <dependency>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>net.shibboleth.utilities</groupId>
+ <artifactId>java-support</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<scm>
diff --git a/idp-schema/pom.xml b/idp-schema/pom.xml
index 00d14a15b..97cf6b45a 100644
--- a/idp-schema/pom.xml
+++ b/idp-schema/pom.xml
@@ -29,7 +29,6 @@
<!-- Test Dependencies -->
- <!-- Managed Dependencies -->
</dependencies>
<scm>
@@ -45,4 +44,4 @@
</site>
</distributionManagement>
-</project>
\ No newline at end of file
+</project>
diff --git a/idp-session-api/pom.xml b/idp-session-api/pom.xml
index 513988a05..ddcf48b66 100644
--- a/idp-session-api/pom.xml
+++ b/idp-session-api/pom.xml
@@ -53,7 +53,6 @@
<!-- Test Dependencies -->
- <!-- Managed Dependencies -->
</dependencies>
<scm>
diff --git a/idp-session-impl/pom.xml b/idp-session-impl/pom.xml
index 2b88c509e..60626dfa4 100644
--- a/idp-session-impl/pom.xml
+++ b/idp-session-impl/pom.xml
@@ -71,6 +71,11 @@
<artifactId>jakarta.json-api</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
<!-- Runtime Dependencies -->
<dependency>
@@ -123,7 +128,6 @@
<scope>test</scope>
</dependency>
- <!-- Managed Dependencies -->
</dependencies>
<scm>
diff --git a/idp-ui/pom.xml b/idp-ui/pom.xml
index a210c896a..d3823870f 100644
--- a/idp-ui/pom.xml
+++ b/idp-ui/pom.xml
@@ -83,7 +83,12 @@
<scope>test</scope>
</dependency>
- <!-- Managed Dependencies -->
+ <dependency>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<scm>
diff --git a/idp-war/pom.xml b/idp-war/pom.xml
index f89134551..1f2f34ba6 100644
--- a/idp-war/pom.xml
+++ b/idp-war/pom.xml
@@ -215,7 +215,6 @@
<!-- Test Dependencies -->
- <!-- Managed Dependencies -->
</dependencies>
<scm>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list