[java-shib-attribute] branch main updated: Cleanup from dependency:analyze.

Scott Cantor cantor.2 at osu.edu
Wed Sep 7 14:44:53 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-attribute.

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

The following commit(s) were added to refs/heads/main by this push:
     new abcab0073 Cleanup from dependency:analyze.
abcab0073 is described below

commit abcab00734ae48cc1e17a2bdbb33a70224b4a6fe
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Sep 7 10:44:50 2022 -0400

    Cleanup from dependency:analyze.
---
 shib-attribute-filter-api/pom.xml      |   6 +-
 shib-attribute-filter-impl/pom.xml     |  50 ++++++---------
 shib-attribute-filter-spring/pom.xml   |  35 +++++------
 shib-attribute-impl/pom.xml            |  15 ++---
 shib-attribute-resolver-api/pom.xml    |  18 +++---
 shib-attribute-resolver-impl/pom.xml   |  93 ++++++++++++++++------------
 shib-attribute-resolver-spring/pom.xml |  61 +++++++++++-------
 shib-saml-attribute-api/pom.xml        |  50 +--------------
 shib-saml-attribute-impl/pom.xml       | 110 +++++----------------------------
 9 files changed, 158 insertions(+), 280 deletions(-)

diff --git a/shib-attribute-filter-api/pom.xml b/shib-attribute-filter-api/pom.xml
index 31ed583e8..ef7bcbee8 100644
--- a/shib-attribute-filter-api/pom.xml
+++ b/shib-attribute-filter-api/pom.xml
@@ -44,11 +44,7 @@
             <groupId>${shib-shared.groupId}</groupId>
             <artifactId>shib-service</artifactId>
         </dependency>
-
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
+        
         <!-- Provided Dependencies -->
 
         <!-- Runtime Dependencies -->
diff --git a/shib-attribute-filter-impl/pom.xml b/shib-attribute-filter-impl/pom.xml
index d88027310..a7a40610f 100644
--- a/shib-attribute-filter-impl/pom.xml
+++ b/shib-attribute-filter-impl/pom.xml
@@ -27,21 +27,11 @@
             <artifactId>shib-attribute-api</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>shib-saml-attribute-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>shib-attribute-filter-api</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>shib-attribute-resolver-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
 
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -50,7 +40,7 @@
 
         <dependency>
             <groupId>${shib-shared.groupId}</groupId>
-            <artifactId>shib-spring</artifactId>
+            <artifactId>shib-service</artifactId>
         </dependency>
 
         <dependency>
@@ -70,19 +60,6 @@
             <artifactId>opensaml-saml-api</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>${spring.groupId}</groupId>
-            <artifactId>spring-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${spring.groupId}</groupId>
-            <artifactId>spring-context</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${spring-webflow.groupId}</groupId>
-            <artifactId>spring-webflow</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
@@ -100,6 +77,13 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>shib-saml-attribute-api</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>shib-saml-attribute-impl</artifactId>
@@ -107,6 +91,13 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>shib-attribute-resolver-api</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>shib-attribute-filter-api</artifactId>
@@ -151,20 +142,19 @@
 
         <dependency>
             <groupId>${shib-shared.groupId}</groupId>
-            <artifactId>shib-testing</artifactId>
+            <artifactId>shib-spring</artifactId>
             <scope>test</scope>
         </dependency>
 
-        <!-- Required even if dependency:analyse says not -->
         <dependency>
-            <groupId>${spring.groupId}</groupId>
-            <artifactId>spring-test</artifactId>
+            <groupId>${shib-shared.groupId}</groupId>
+            <artifactId>shib-testing</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>jakarta.servlet</groupId>
-            <artifactId>jakarta.servlet-api</artifactId>
+            <groupId>${spring.groupId}</groupId>
+            <artifactId>spring-core</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/shib-attribute-filter-spring/pom.xml b/shib-attribute-filter-spring/pom.xml
index d42abbde8..53a35f511 100644
--- a/shib-attribute-filter-spring/pom.xml
+++ b/shib-attribute-filter-spring/pom.xml
@@ -22,11 +22,6 @@
 
     <dependencies>
         <!-- Compile Dependencies -->
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>shib-attribute-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>shib-attribute-filter-api</artifactId>
@@ -39,16 +34,8 @@
         </dependency>
 
         <dependency>
-            <groupId>${opensaml.groupId}</groupId>
-            <artifactId>opensaml-messaging-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${opensaml.groupId}</groupId>
-            <artifactId>opensaml-profile-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${opensaml.groupId}</groupId>
-            <artifactId>opensaml-saml-api</artifactId>
+            <groupId>${shib-shared.groupId}</groupId>
+            <artifactId>shib-security</artifactId>
         </dependency>
         
         <dependency>
@@ -86,7 +73,7 @@
         <!-- Test Dependencies -->
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>shib-attribute-resolver-api</artifactId>
+            <artifactId>shib-attribute-api</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
@@ -94,13 +81,13 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>shib-attribute-resolver-api</artifactId>
             <version>${project.version}</version>
-            <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>shib-attribute-resolver-impl</artifactId>
+            <artifactId>shib-attribute-resolver-api</artifactId>
             <version>${project.version}</version>
+            <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -127,7 +114,17 @@
         </dependency>
         <dependency>
             <groupId>${opensaml.groupId}</groupId>
-            <artifactId>opensaml-saml-impl</artifactId>
+            <artifactId>opensaml-messaging-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>${opensaml.groupId}</groupId>
+            <artifactId>opensaml-profile-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>${opensaml.groupId}</groupId>
+            <artifactId>opensaml-saml-api</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/shib-attribute-impl/pom.xml b/shib-attribute-impl/pom.xml
index 0a4d9a6eb..494be4406 100644
--- a/shib-attribute-impl/pom.xml
+++ b/shib-attribute-impl/pom.xml
@@ -33,6 +33,10 @@
             <artifactId>opensaml-profile-api</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>${spring.groupId}</groupId>
+            <artifactId>spring-beans</artifactId>
+        </dependency>
         <dependency>
             <groupId>${spring.groupId}</groupId>
             <artifactId>spring-context</artifactId>
@@ -46,11 +50,6 @@
             <groupId>${shib-shared.groupId}</groupId>
             <artifactId>shib-service</artifactId>
         </dependency>
-        
-        <dependency>
-            <groupId>${shib-shared.groupId}</groupId>
-            <artifactId>shib-spring</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>com.google.guava</groupId>
@@ -68,12 +67,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.hsqldb</groupId>
-            <artifactId>hsqldb</artifactId>
-            <scope>test</scope>
-        </dependency>
-
     </dependencies>
 
 </project>
diff --git a/shib-attribute-resolver-api/pom.xml b/shib-attribute-resolver-api/pom.xml
index af52bb6a8..70fc7a514 100644
--- a/shib-attribute-resolver-api/pom.xml
+++ b/shib-attribute-resolver-api/pom.xml
@@ -56,13 +56,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>${spring.groupId}</groupId>
-            <artifactId>spring-beans</artifactId>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
         </dependency>
         
         <dependency>
@@ -76,8 +71,13 @@
         </dependency>
 
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>${spring.groupId}</groupId>
+            <artifactId>spring-beans</artifactId>
         </dependency>
         
         <!-- Provided Dependencies -->
diff --git a/shib-attribute-resolver-impl/pom.xml b/shib-attribute-resolver-impl/pom.xml
index f6dd866ab..80e6ee6af 100644
--- a/shib-attribute-resolver-impl/pom.xml
+++ b/shib-attribute-resolver-impl/pom.xml
@@ -32,46 +32,45 @@
             <artifactId>shib-attribute-resolver-api</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>shib-attribute-impl</artifactId>
-            <version>${project.version}</version>
-        </dependency>
 
         <dependency>
             <groupId>${opensaml.groupId}</groupId>
             <artifactId>opensaml-messaging-api</artifactId>
         </dependency>
-        <!--  We only need the rest of OpenSAML because of the legacy Contexts we need for scripting -->
         <dependency>
             <groupId>${opensaml.groupId}</groupId>
-            <artifactId>opensaml-core</artifactId>
+            <artifactId>opensaml-profile-api</artifactId>
         </dependency>
         <dependency>
             <groupId>${opensaml.groupId}</groupId>
-            <artifactId>opensaml-profile-api</artifactId>
+            <artifactId>opensaml-security-api</artifactId>
         </dependency>
         <dependency>
             <groupId>${opensaml.groupId}</groupId>
-            <artifactId>opensaml-saml-api</artifactId>
+            <artifactId>opensaml-storage-api</artifactId>
         </dependency>
+
         <dependency>
-            <groupId>${opensaml.groupId}</groupId>
-            <artifactId>opensaml-security-api</artifactId>
+            <groupId>${shib-shared.groupId}</groupId>
+            <artifactId>shib-security</artifactId>
         </dependency>
         <dependency>
-            <groupId>${opensaml.groupId}</groupId>
-            <artifactId>opensaml-security-impl</artifactId>
+            <groupId>${shib-shared.groupId}</groupId>
+            <artifactId>shib-service</artifactId>
         </dependency>
-
         <dependency>
             <groupId>${shib-shared.groupId}</groupId>
             <artifactId>shib-velocity</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>${shib-shared.groupId}</groupId>
-            <artifactId>shib-spring</artifactId>
+            <groupId>io.dropwizard.metrics</groupId>
+            <artifactId>metrics-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
         </dependency>
 
         <dependency>
@@ -87,31 +86,11 @@
             <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>
-
-        <dependency>
-            <groupId>io.dropwizard.metrics</groupId>
-            <artifactId>metrics-core</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
-
         <!-- Provided Dependencies -->
     
         <!-- Runtime Dependencies -->
@@ -125,18 +104,29 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>shib-attribute-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>
             <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>
+            <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 
@@ -145,18 +135,39 @@
             <artifactId>opensaml-saml-impl</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>${opensaml.groupId}</groupId>
+            <artifactId>opensaml-security-impl</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>${opensaml.groupId}</groupId>
             <artifactId>opensaml-storage-impl</artifactId>
             <scope>test</scope>
         </dependency>
         
+        <dependency>
+            <groupId>${shib-shared.groupId}</groupId>
+            <artifactId>shib-networking</artifactId>
+            <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>
             <scope>test</scope>
         </dependency>
         
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <scope>test</scope>
+        </dependency>
+    
         <dependency>
             <groupId>org.hsqldb</groupId>
             <artifactId>hsqldb</artifactId>
@@ -168,6 +179,12 @@
             <scope>test</scope>
         </dependency>
     
+        <dependency>
+            <groupId>${spring.groupId}</groupId>
+            <artifactId>spring-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
 
     <profiles>
diff --git a/shib-attribute-resolver-spring/pom.xml b/shib-attribute-resolver-spring/pom.xml
index 4a9fc875d..18392b0e8 100644
--- a/shib-attribute-resolver-spring/pom.xml
+++ b/shib-attribute-resolver-spring/pom.xml
@@ -32,6 +32,11 @@
             <artifactId>shib-attribute-impl</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>shib-saml-attribute-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>shib-saml-attribute-impl</artifactId>
@@ -53,22 +58,10 @@
             <artifactId>shib-metadata-spring</artifactId>
         </dependency>
 
-        <dependency>
-            <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>
         </dependency>
-        <dependency>
-            <groupId>${opensaml.groupId}</groupId>
-            <artifactId>opensaml-saml-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>${opensaml.groupId}</groupId>
             <artifactId>opensaml-security-api</artifactId>
@@ -78,6 +71,10 @@
             <artifactId>opensaml-spring</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>${shib-shared.groupId}</groupId>
+            <artifactId>shib-service</artifactId>
+        </dependency>
         <dependency>
             <groupId>${shib-shared.groupId}</groupId>
             <artifactId>shib-spring</artifactId>
@@ -93,6 +90,11 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>org.ldaptive</groupId>
@@ -113,11 +115,6 @@
             <artifactId>spring-context</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
-
         <!-- Provided Dependencies -->
 
         <!-- Runtime Dependencies -->
@@ -153,7 +150,17 @@
         </dependency>
         <dependency>
             <groupId>${opensaml.groupId}</groupId>
-            <artifactId>opensaml-saml-impl</artifactId>
+            <artifactId>opensaml-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>${opensaml.groupId}</groupId>
+            <artifactId>opensaml-messaging-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>${opensaml.groupId}</groupId>
+            <artifactId>opensaml-saml-api</artifactId>
             <scope>test</scope>
         </dependency>
         <!-- TODO: this is only needed for some X.509 resources in the tests -->
@@ -163,18 +170,29 @@
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>${opensaml.groupId}</groupId>
+            <artifactId>opensaml-storage-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <!-- Needed for Spring wiring in tests. -->
         <dependency>
             <groupId>${opensaml.groupId}</groupId>
             <artifactId>opensaml-storage-impl</artifactId>
             <scope>test</scope>
         </dependency>
         
+        <dependency>
+            <groupId>${shib-shared.groupId}</groupId>
+            <artifactId>shib-security</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>${shib-shared.groupId}</groupId>
             <artifactId>shib-testing</artifactId>
             <scope>test</scope>
         </dependency>
-
+        <!-- Needed for Spring wiring in tests. -->
         <dependency>
             <groupId>${shib-shared.groupId}</groupId>
             <artifactId>shib-velocity-spring</artifactId>
@@ -186,11 +204,6 @@
             <artifactId>unboundid-ldapsdk</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.hsqldb</groupId>
-            <artifactId>hsqldb</artifactId>
-            <scope>test</scope>
-        </dependency>
 
         <dependency>
             <groupId>${spring.groupId}</groupId>
diff --git a/shib-saml-attribute-api/pom.xml b/shib-saml-attribute-api/pom.xml
index e5f84d296..d07859fa8 100644
--- a/shib-saml-attribute-api/pom.xml
+++ b/shib-saml-attribute-api/pom.xml
@@ -41,40 +41,16 @@
             <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>
         </dependency>
-        <dependency>
-            <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-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 -->
@@ -86,12 +62,6 @@
             <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>
         <!-- Needed despite what dependency:analyze says -->
         <dependency>
             <groupId>${opensaml.groupId}</groupId>
@@ -99,24 +69,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-saml-attribute-impl/pom.xml b/shib-saml-attribute-impl/pom.xml
index 6558617b2..e81c50ef9 100644
--- a/shib-saml-attribute-impl/pom.xml
+++ b/shib-saml-attribute-impl/pom.xml
@@ -28,16 +28,6 @@
             <artifactId>shib-attribute-api</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>shib-attribute-impl</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>shib-attribute-filter-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>shib-attribute-resolver-api</artifactId>
@@ -53,18 +43,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-saml-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>${opensaml.groupId}</groupId>
-            <artifactId>opensaml-saml-impl</artifactId>
-        </dependency>
         <dependency>
             <groupId>${opensaml.groupId}</groupId>
             <artifactId>opensaml-profile-api</artifactId>
@@ -72,90 +54,51 @@
         
         <dependency>
             <groupId>${shib-shared.groupId}</groupId>
-            <artifactId>shib-spring</artifactId>
+            <artifactId>shib-service</artifactId>
         </dependency>
-        
         <dependency>
             <groupId>${shib-shared.groupId}</groupId>
             <artifactId>shib-support</artifactId>
         </dependency>
 
-        <dependency>
-            <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-core</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.dropwizard.metrics</groupId>
-            <artifactId>metrics-core</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-        </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>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.servlet</groupId>
-            <artifactId>jakarta.servlet-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
 
         <!-- Runtime Dependencies -->
-        <dependency>
-            <groupId>org.glassfish</groupId>
-            <artifactId>jakarta.json</artifactId>
-            <scope>runtime</scope>
-        </dependency>
 
         <!-- Test Dependencies -->
         <dependency>
-            <groupId>${opensaml.groupId}</groupId>
-            <artifactId>opensaml-core</artifactId>
-            <type>test-jar</type>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>shib-attribute-impl</artifactId>
+            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>${opensaml.groupId}</groupId>
-            <artifactId>opensaml-profile-api</artifactId>
-            <type>test-jar</type>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>shib-metadata-api</artifactId>
             <scope>test</scope>
         </dependency>
+        <!-- Needed for XMLObject providers. -->
         <dependency>
-            <groupId>${opensaml.groupId}</groupId>
-            <artifactId>opensaml-saml-api</artifactId>
-            <type>test-jar</type>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>shib-metadata-impl</artifactId>
             <scope>test</scope>
         </dependency>
+
         <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>shib-saml-attribute-api</artifactId>
-            <version>${project.version}</version>
+            <groupId>${opensaml.groupId}</groupId>
+            <artifactId>opensaml-core</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
+        <!-- Needed for XMLObject providers. -->
         <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>shib-metadata-impl</artifactId>
+            <groupId>${opensaml.groupId}</groupId>
+            <artifactId>opensaml-saml-impl</artifactId>
             <scope>test</scope>
         </dependency>
         
@@ -164,29 +107,6 @@
             <artifactId>shib-testing</artifactId>
             <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>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.xmlunit</groupId>
-            <artifactId>xmlunit-matchers</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>${spring.groupId}</groupId>
-            <artifactId>spring-test</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
 </project>

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


More information about the commits mailing list