[java-opensaml] branch main updated: Update dependencies after running analyzer.
Scott Cantor
cantor.2 at osu.edu
Thu Sep 8 14:17:46 UTC 2022
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-opensaml.
View the commit online:
http://git.shibboleth.net/view/?p=java-opensaml.git;a=commit;h=1f5e21ce65359ddf568bf280edadd1a5d3335e37
The following commit(s) were added to refs/heads/main by this push:
new 1f5e21ce6 Update dependencies after running analyzer.
1f5e21ce6 is described below
commit 1f5e21ce65359ddf568bf280edadd1a5d3335e37
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Sep 8 10:17:42 2022 -0400
Update dependencies after running analyzer.
---
opensaml-messaging-impl/pom.xml | 11 +----------
opensaml-profile-impl/pom.xml | 5 +++++
opensaml-saml-impl/pom.xml | 38 ++++++++++++++++----------------------
opensaml-security-api/pom.xml | 21 ++++++---------------
opensaml-security-impl/pom.xml | 16 +++++++++++-----
opensaml-soap-api/pom.xml | 5 -----
opensaml-soap-impl/pom.xml | 12 +++++-------
opensaml-spring/pom.xml | 31 +++++++++++++++++++++++++++++++
opensaml-storage-api/pom.xml | 4 ----
opensaml-storage-impl/pom.xml | 33 +++++++++------------------------
opensaml-xacml-impl/pom.xml | 15 ---------------
opensaml-xmlsec-api/pom.xml | 5 +++++
opensaml-xmlsec-impl/pom.xml | 14 ++++++++++++--
13 files changed, 101 insertions(+), 109 deletions(-)
diff --git a/opensaml-messaging-impl/pom.xml b/opensaml-messaging-impl/pom.xml
index 1c90f90fb..3a65ab6d7 100644
--- a/opensaml-messaging-impl/pom.xml
+++ b/opensaml-messaging-impl/pom.xml
@@ -36,10 +36,6 @@
<groupId>${shib-shared.groupId}</groupId>
<artifactId>shib-networking</artifactId>
</dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
<!-- Provided Dependencies -->
<dependency>
@@ -63,17 +59,12 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>${shib-shared.groupId}</groupId>
- <artifactId>shib-spring</artifactId>
- <scope>test</scope>
- </dependency>
-
<dependency>
<groupId>${spring.groupId}</groupId>
<artifactId>spring-test</artifactId>
<scope>test</scope>
</dependency>
+ <!-- Needed regardless of dependency:analyze. -->
<dependency>
<groupId>${spring.groupId}</groupId>
<artifactId>spring-web</artifactId>
diff --git a/opensaml-profile-impl/pom.xml b/opensaml-profile-impl/pom.xml
index f7e2a6a2a..6668b72b8 100644
--- a/opensaml-profile-impl/pom.xml
+++ b/opensaml-profile-impl/pom.xml
@@ -58,6 +58,11 @@
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-security</artifactId>
+ </dependency>
+
<!-- Provided Dependencies -->
<dependency>
<groupId>jakarta.servlet</groupId>
diff --git a/opensaml-saml-impl/pom.xml b/opensaml-saml-impl/pom.xml
index e3c7b28e4..9244feedf 100644
--- a/opensaml-saml-impl/pom.xml
+++ b/opensaml-saml-impl/pom.xml
@@ -145,21 +145,6 @@
<!-- Runtime Dependencies -->
<!-- Test Dependencies -->
- <dependency>
- <groupId>${spring.groupId}</groupId>
- <artifactId>spring-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${spring.groupId}</groupId>
- <artifactId>spring-web</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${spring.groupId}</groupId>
- <artifactId>spring-core</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>opensaml-core</artifactId>
@@ -173,13 +158,6 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>opensaml-storage-impl</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>opensaml-xmlsec-impl</artifactId>
@@ -225,6 +203,22 @@
<artifactId>shib-spring</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <!-- Needed despite dependency:analyze. -->
+ <dependency>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-web</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-core</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
diff --git a/opensaml-security-api/pom.xml b/opensaml-security-api/pom.xml
index dfd932c6a..665b47271 100644
--- a/opensaml-security-api/pom.xml
+++ b/opensaml-security-api/pom.xml
@@ -87,28 +87,19 @@
<dependency>
<groupId>${shib-shared.groupId}</groupId>
- <artifactId>shib-testing</artifactId>
+ <artifactId>shib-spring</artifactId>
<scope>test</scope>
</dependency>
-
- <dependency>
- <groupId>${spring.groupId}</groupId>
- <artifactId>spring-beans</artifactId>
- <scope>test</scope>
- </dependency>
+
<dependency>
- <groupId>${spring.groupId}</groupId>
- <artifactId>spring-core</artifactId>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-testing</artifactId>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>${spring.groupId}</groupId>
- <artifactId>spring-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${shib-shared.groupId}</groupId>
- <artifactId>shib-spring</artifactId>
+ <artifactId>spring-core</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/opensaml-security-impl/pom.xml b/opensaml-security-impl/pom.xml
index 7304fbd97..3b9dac453 100644
--- a/opensaml-security-impl/pom.xml
+++ b/opensaml-security-impl/pom.xml
@@ -40,6 +40,11 @@
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-networking</artifactId>
+ </dependency>
+
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
@@ -50,11 +55,6 @@
<artifactId>guava</artifactId>
</dependency>
- <dependency>
- <groupId>org.cryptacular</groupId>
- <artifactId>cryptacular</artifactId>
- </dependency>
-
<dependency>
<groupId>${httpclient.groupId}</groupId>
<artifactId>httpclient</artifactId>
@@ -92,6 +92,12 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.cryptacular</groupId>
+ <artifactId>cryptacular</artifactId>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>org.ldaptive</groupId>
<artifactId>ldaptive</artifactId>
diff --git a/opensaml-soap-api/pom.xml b/opensaml-soap-api/pom.xml
index 9fe0eb39b..57f83337e 100644
--- a/opensaml-soap-api/pom.xml
+++ b/opensaml-soap-api/pom.xml
@@ -46,11 +46,6 @@
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
-
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
diff --git a/opensaml-soap-impl/pom.xml b/opensaml-soap-impl/pom.xml
index a1c41dc1c..7917a4767 100644
--- a/opensaml-soap-impl/pom.xml
+++ b/opensaml-soap-impl/pom.xml
@@ -52,6 +52,10 @@
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-networking</artifactId>
+ </dependency>
<dependency>
<groupId>${shib-shared.groupId}</groupId>
<artifactId>shib-security</artifactId>
@@ -102,18 +106,12 @@
<groupId>${spring.groupId}</groupId>
<artifactId>spring-test</artifactId>
</dependency>
+ <!-- Needed despite dependency:analyze. -->
<dependency>
<groupId>${spring.groupId}</groupId>
<artifactId>spring-web</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>${spring.groupId}</groupId>
- <artifactId>spring-core</artifactId>
- <version>${spring.version}</version>
- <scope>test</scope>
- </dependency>
-
</dependencies>
<scm>
diff --git a/opensaml-spring/pom.xml b/opensaml-spring/pom.xml
index 2d79542d8..97bcdb6f9 100644
--- a/opensaml-spring/pom.xml
+++ b/opensaml-spring/pom.xml
@@ -35,12 +35,23 @@
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>opensaml-xmlsec-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>opensaml-xmlsec-impl</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-networking</artifactId>
+ </dependency>
+
<dependency>
<groupId>${shib-shared.groupId}</groupId>
<artifactId>shib-spring</artifactId>
@@ -53,6 +64,26 @@
<artifactId>guava</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.cryptacular</groupId>
+ <artifactId>cryptacular</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15on</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>${httpclient.groupId}</groupId>
+ <artifactId>httpclient</artifactId>
+ </dependency>
+
<dependency>
<groupId>${spring.groupId}</groupId>
<artifactId>spring-beans</artifactId>
diff --git a/opensaml-storage-api/pom.xml b/opensaml-storage-api/pom.xml
index c51a15606..64efbb0ad 100644
--- a/opensaml-storage-api/pom.xml
+++ b/opensaml-storage-api/pom.xml
@@ -22,10 +22,6 @@
<dependencies>
<!-- Compile Dependencies -->
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
<!-- Provided Dependencies -->
diff --git a/opensaml-storage-impl/pom.xml b/opensaml-storage-impl/pom.xml
index ca5e4f3de..fe70e0e25 100644
--- a/opensaml-storage-impl/pom.xml
+++ b/opensaml-storage-impl/pom.xml
@@ -67,6 +67,11 @@
<artifactId>cryptacular</artifactId>
</dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </dependency>
+
<!-- Provided Dependencies -->
<dependency>
<groupId>jakarta.json</groupId>
@@ -76,6 +81,7 @@
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
+ <scope>provided</scope>
</dependency>
<!-- Runtime Dependencies -->
@@ -138,15 +144,11 @@
-->
<dependency>
- <groupId>${spring.groupId}</groupId>
- <artifactId>spring-beans</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${spring.groupId}</groupId>
- <artifactId>spring-context</artifactId>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-spring</artifactId>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>${spring.groupId}</groupId>
<artifactId>spring-core</artifactId>
@@ -157,23 +159,6 @@
<artifactId>spring-test</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>${spring.groupId}</groupId>
- <artifactId>spring-web</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>${shib-shared.groupId}</groupId>
- <artifactId>shib-spring</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
- <scope>test</scope>
- </dependency>
<!-- Managed Dependencies -->
</dependencies>
diff --git a/opensaml-xacml-impl/pom.xml b/opensaml-xacml-impl/pom.xml
index c5fd66ba3..70a3ee4a0 100644
--- a/opensaml-xacml-impl/pom.xml
+++ b/opensaml-xacml-impl/pom.xml
@@ -51,21 +51,6 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
- <!-- TODO these two saml-* deps should be removed -->
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>opensaml-saml-impl</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>opensaml-saml-impl</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
</dependencies>
<scm>
diff --git a/opensaml-xmlsec-api/pom.xml b/opensaml-xmlsec-api/pom.xml
index c242aac13..d015be2d5 100644
--- a/opensaml-xmlsec-api/pom.xml
+++ b/opensaml-xmlsec-api/pom.xml
@@ -45,6 +45,11 @@
<artifactId>guava</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15on</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.apache.santuario</groupId>
<artifactId>xmlsec</artifactId>
diff --git a/opensaml-xmlsec-impl/pom.xml b/opensaml-xmlsec-impl/pom.xml
index ff68a7e9b..4ccb509e1 100644
--- a/opensaml-xmlsec-impl/pom.xml
+++ b/opensaml-xmlsec-impl/pom.xml
@@ -46,13 +46,17 @@
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.santuario</groupId>
<artifactId>xmlsec</artifactId>
</dependency>
<dependency>
- <groupId>org.cryptacular</groupId>
- <artifactId>cryptacular</artifactId>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15on</artifactId>
</dependency>
<!-- TODO This needs to be removed once classes are moved from security-impl to security-api -->
<dependency>
@@ -94,6 +98,12 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.cryptacular</groupId>
+ <artifactId>cryptacular</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<scm>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list