[java-shib-metadata] branch main updated: Apply results of dependency:analyze.
Scott Cantor
cantor.2 at osu.edu
Tue Sep 6 21:46:22 UTC 2022
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-shib-metadata.
View the commit online:
http://git.shibboleth.net/view/?p=java-shib-metadata.git;a=commit;h=0e8263fd53ac3b16234b6b3cf0a3b8a8c06ae868
The following commit(s) were added to refs/heads/main by this push:
new 0e8263fd5 Apply results of dependency:analyze.
0e8263fd5 is described below
commit 0e8263fd53ac3b16234b6b3cf0a3b8a8c06ae868
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Sep 6 17:46:20 2022 -0400
Apply results of dependency:analyze.
---
shib-metadata-api/pom.xml | 31 +++++++-------------
shib-metadata-impl/pom.xml | 56 +++++++++++-------------------------
shib-metadata-spring/pom.xml | 67 +++++++++++++++++++++++++++-----------------
3 files changed, 67 insertions(+), 87 deletions(-)
diff --git a/shib-metadata-api/pom.xml b/shib-metadata-api/pom.xml
index 8e6346ee5..07466ed99 100644
--- a/shib-metadata-api/pom.xml
+++ b/shib-metadata-api/pom.xml
@@ -22,20 +22,28 @@
<dependencies>
<!-- Compile Dependencies -->
+ <dependency>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-core</artifactId>
+ </dependency>
<dependency>
<groupId>${opensaml.groupId}</groupId>
<artifactId>opensaml-saml-api</artifactId>
</dependency>
<dependency>
<groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-core</artifactId>
+ <artifactId>opensaml-security-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-xmlsec-api</artifactId>
</dependency>
<!-- Provided Dependencies -->
<!-- Runtime Dependencies -->
- <!-- Test Dependencies -->
+ <!-- Test Dependencies -->
<dependency>
<groupId>${opensaml.groupId}</groupId>
<artifactId>opensaml-core</artifactId>
@@ -50,25 +58,6 @@
<scope>test</scope>
</dependency>
- <!-- Needed despite what dependency:analyze says -->
- <dependency>
- <groupId>jakarta.servlet</groupId>
- <artifactId>jakarta.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>
- <scope>test</scope>
- </dependency>
-
</dependencies>
</project>
diff --git a/shib-metadata-impl/pom.xml b/shib-metadata-impl/pom.xml
index d195b955e..1db0eb7ba 100644
--- a/shib-metadata-impl/pom.xml
+++ b/shib-metadata-impl/pom.xml
@@ -41,20 +41,23 @@
<groupId>${opensaml.groupId}</groupId>
<artifactId>opensaml-saml-impl</artifactId>
</dependency>
-
<dependency>
- <groupId>${shib-shared.groupId}</groupId>
- <artifactId>shib-service</artifactId>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-security-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-xmlsec-api</artifactId>
</dependency>
<dependency>
<groupId>${shib-shared.groupId}</groupId>
- <artifactId>shib-spring</artifactId>
+ <artifactId>shib-service</artifactId>
</dependency>
<dependency>
- <groupId>${spring.groupId}</groupId>
- <artifactId>spring-context</artifactId>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
</dependency>
<dependency>
@@ -63,28 +66,17 @@
</dependency>
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
-
- <!-- Provided Dependencies -->
- <dependency>
- <groupId>jakarta.json</groupId>
- <artifactId>jakarta.json-api</artifactId>
- <scope>provided</scope>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-beans</artifactId>
</dependency>
<dependency>
- <groupId>jakarta.servlet</groupId>
- <artifactId>jakarta.servlet-api</artifactId>
- <scope>provided</scope>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-context</artifactId>
</dependency>
+ <!-- Provided Dependencies -->
+
<!-- Runtime Dependencies -->
- <dependency>
- <groupId>org.glassfish</groupId>
- <artifactId>jakarta.json</artifactId>
- <scope>runtime</scope>
- </dependency>
<!-- Test Dependencies -->
<dependency>
@@ -93,29 +85,13 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-saml-api</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <scope>test</scope>
- </dependency>
+ <!-- Used regardless of dependency:analyze -->
<dependency>
<groupId>org.xmlunit</groupId>
<artifactId>xmlunit-core</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.xmlunit</groupId>
- <artifactId>xmlunit-matchers</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
diff --git a/shib-metadata-spring/pom.xml b/shib-metadata-spring/pom.xml
index 5de7d1606..7d54cd8ed 100644
--- a/shib-metadata-spring/pom.xml
+++ b/shib-metadata-spring/pom.xml
@@ -22,11 +22,6 @@
<dependencies>
<!-- Compile Dependencies -->
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>shib-metadata-api</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>shib-metadata-impl</artifactId>
@@ -37,45 +32,43 @@
<groupId>${shib-shared.groupId}</groupId>
<artifactId>shib-networking</artifactId>
</dependency>
-
+
<dependency>
<groupId>${shib-shared.groupId}</groupId>
<artifactId>shib-spring</artifactId>
</dependency>
<dependency>
- <groupId>${spring.groupId}</groupId>
- <artifactId>spring-beans</artifactId>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-core</artifactId>
</dependency>
<dependency>
- <groupId>${spring.groupId}</groupId>
- <artifactId>spring-context</artifactId>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-saml-api</artifactId>
</dependency>
<dependency>
- <groupId>${spring.groupId}</groupId>
- <artifactId>spring-core</artifactId>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-saml-impl</artifactId>
</dependency>
-
<dependency>
<groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-core</artifactId>
+ <artifactId>opensaml-security-api</artifactId>
</dependency>
<dependency>
<groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-saml-api</artifactId>
+ <artifactId>opensaml-security-impl</artifactId>
</dependency>
<dependency>
<groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-saml-impl</artifactId>
+ <artifactId>opensaml-spring</artifactId>
</dependency>
<dependency>
<groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-spring</artifactId>
+ <artifactId>opensaml-xmlsec-api</artifactId>
</dependency>
-
<dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-xmlsec-impl</artifactId>
</dependency>
<dependency>
@@ -84,15 +77,25 @@
</dependency>
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
+ <groupId>org.cryptacular</groupId>
+ <artifactId>cryptacular</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-beans</artifactId>
</dependency>
- <!-- Provided Dependencies -->
<dependency>
- <groupId>jakarta.servlet</groupId>
- <artifactId>jakarta.servlet-api</artifactId>
- <scope>provided</scope>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-context</artifactId>
</dependency>
+ <dependency>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-core</artifactId>
+ </dependency>
+
+
+ <!-- Provided Dependencies -->
<!-- Runtime Dependencies -->
@@ -110,12 +113,24 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-service</artifactId>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>${shib-shared.groupId}</groupId>
<artifactId>shib-velocity-spring</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</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