[java-shib-shared] branch main updated: Apply results of dependency analyzer.

Scott Cantor cantor.2 at osu.edu
Tue Sep 6 21:21:01 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-shared.

View the commit online:
http://git.shibboleth.net/view/?p=java-shib-shared.git;a=commit;h=b812601ad44172180453a8fe15a3cb76aff59ece

The following commit(s) were added to refs/heads/main by this push:
     new b812601a Apply results of dependency analyzer.
b812601a is described below

commit b812601ad44172180453a8fe15a3cb76aff59ece
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Sep 6 17:20:58 2022 -0400

    Apply results of dependency analyzer.
---
 shib-networking/pom.xml      | 13 +++++++------
 shib-security/pom.xml        | 15 +++++----------
 shib-spring/pom.xml          | 33 ++++++++++++++++++---------------
 shib-testing/pom.xml         | 12 ++++++++----
 shib-velocity-spring/pom.xml | 14 ++++++++------
 shib-velocity/pom.xml        |  5 +++++
 6 files changed, 51 insertions(+), 41 deletions(-)

diff --git a/shib-networking/pom.xml b/shib-networking/pom.xml
index 55118f74..7d013684 100644
--- a/shib-networking/pom.xml
+++ b/shib-networking/pom.xml
@@ -27,6 +27,11 @@
             <version>${project.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
@@ -52,19 +57,15 @@
         <!-- Test Dependencies -->
         <dependency>
             <groupId>${spring.groupId}</groupId>
-            <artifactId>spring-core</artifactId>
+            <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-test</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <profiles>
diff --git a/shib-security/pom.xml b/shib-security/pom.xml
index fd6d7d0b..a17fe718 100644
--- a/shib-security/pom.xml
+++ b/shib-security/pom.xml
@@ -33,6 +33,11 @@
             <version>${project.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>com.beust</groupId>
             <artifactId>jcommander</artifactId>
@@ -61,16 +66,6 @@
             <artifactId>spring-core</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-test</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <profiles>
diff --git a/shib-spring/pom.xml b/shib-spring/pom.xml
index 796bfeca..cef7c703 100644
--- a/shib-spring/pom.xml
+++ b/shib-spring/pom.xml
@@ -30,6 +30,11 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <!-- Required for HTTPResource. -->
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpcore</artifactId>
+        </dependency>
         <dependency>
             <!-- Required for HTTPResource. -->
             <groupId>org.apache.httpcomponents</groupId>
@@ -58,12 +63,6 @@
             <!-- Required for any classes that deals with cryptographic artifacts (keys, certs, algorithms, etc.) -->
             <optional>true</optional>
         </dependency>
-        <!-- Override temporarily. -->
-        <dependency>
-            <groupId>org.bouncycastle</groupId>
-            <artifactId>bcprov-jdk15on</artifactId>
-            <optional>true</optional>
-        </dependency>
         <dependency>
             <groupId>com.beust</groupId>
             <artifactId>jcommander</artifactId>
@@ -90,22 +89,26 @@
         </dependency>
         <dependency>
             <groupId>${spring.groupId}</groupId>
-            <artifactId>spring-webmvc</artifactId>
+            <artifactId>spring-expression</artifactId>
+            <!-- Required for error handling classes. -->
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>${spring.groupId}</groupId>
+            <artifactId>spring-jcl</artifactId>
             <!-- Required for error handling classes. -->
             <optional>true</optional>
         </dependency>
         <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-core</artifactId>
-            <scope>compile</scope><!-- normally runtime -->
-            <!-- Required if you're using the LogginService implementation. -->
+            <groupId>${spring.groupId}</groupId>
+            <artifactId>spring-web</artifactId>
+            <!-- Required for error handling classes. -->
             <optional>true</optional>
         </dependency>
         <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <scope>compile</scope><!-- normally runtime -->
-            <!-- Required if you're using the LogginService implementation. -->
+            <groupId>${spring.groupId}</groupId>
+            <artifactId>spring-webmvc</artifactId>
+            <!-- Required for error handling classes. -->
             <optional>true</optional>
         </dependency>
 
diff --git a/shib-testing/pom.xml b/shib-testing/pom.xml
index d8f7cd61..95b829b6 100644
--- a/shib-testing/pom.xml
+++ b/shib-testing/pom.xml
@@ -29,14 +29,13 @@
 
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>shib-spring</artifactId>
+            <artifactId>shib-service</artifactId>
             <version>${project.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>shib-service</artifactId>
-            <version>${project.version}</version>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
         </dependency>
 
         <!-- Normally test scope. -->
@@ -51,6 +50,11 @@
             <artifactId>spring-core</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>${spring.groupId}</groupId>
+            <artifactId>spring-beans</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>${spring.groupId}</groupId>
             <artifactId>spring-context</artifactId>
diff --git a/shib-velocity-spring/pom.xml b/shib-velocity-spring/pom.xml
index 50a6761d..cacf40b7 100644
--- a/shib-velocity-spring/pom.xml
+++ b/shib-velocity-spring/pom.xml
@@ -27,12 +27,6 @@
             <version>${project.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>shib-spring</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity-engine-core</artifactId>
@@ -46,6 +40,14 @@
             <groupId>${spring.groupId}</groupId>
             <artifactId>spring-beans</artifactId>
         </dependency>
+        <dependency>
+            <groupId>${spring.groupId}</groupId>
+            <artifactId>spring-context</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${spring.groupId}</groupId>
+            <artifactId>spring-web</artifactId>
+        </dependency>
         <dependency>
             <groupId>${spring.groupId}</groupId>
             <artifactId>spring-webmvc</artifactId>
diff --git a/shib-velocity/pom.xml b/shib-velocity/pom.xml
index d9338f9c..fc5daf56 100644
--- a/shib-velocity/pom.xml
+++ b/shib-velocity/pom.xml
@@ -27,6 +27,11 @@
             <version>${project.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity-engine-core</artifactId>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the commits mailing list