[java-metadata-aggregator] 02/02: Fix dependencies: migrate down from parent

[Ian Young]

This is an automated email from the git hooks/post-receive script.

iay pushed a commit to branch main
in repository java-metadata-aggregator.

View the commit online:
http://git.shibboleth.net/view/?p=java-metadata-aggregator.git;a=commit;h=4280cd7ef9e2c4884472a11392d4b9877b2b5198

commit 4280cd7ef9e2c4884472a11392d4b9877b2b5198
Author: Ian Young <ian at iay.org.uk>
AuthorDate: Mon Nov 27 16:13:43 2023 +0000

    Fix dependencies: migrate down from parent
---
 mda-cli/pom.xml       | 14 ++++++++++++++
 mda-framework/pom.xml | 31 +++++++++++++++++++++++++++++++
 pom.xml               | 35 -----------------------------------
 3 files changed, 45 insertions(+), 35 deletions(-)

diff --git a/mda-cli/pom.xml b/mda-cli/pom.xml
index d296191..72cd5ad 100644
--- a/mda-cli/pom.xml
+++ b/mda-cli/pom.xml
@@ -22,11 +22,21 @@
 
     <dependencies>
         <!-- Compile Dependencies -->
+
+        <dependency>
+            <groupId>net.shibboleth</groupId>
+            <artifactId>shib-support</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>mda-framework</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+        </dependency>
         <dependency>
             <groupId>${spring.groupId}</groupId>
             <artifactId>spring-beans</artifactId>
@@ -39,6 +49,10 @@
             <groupId>com.beust</groupId>
             <artifactId>jcommander</artifactId>
         </dependency>
+        <dependency>
+            <groupId>${slf4j.groupId}</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
 
         <!-- Provided Dependencies -->
 
diff --git a/mda-framework/pom.xml b/mda-framework/pom.xml
index 5e15892..43510c3 100644
--- a/mda-framework/pom.xml
+++ b/mda-framework/pom.xml
@@ -21,7 +21,13 @@
     </properties>
 
     <dependencies>
+
         <!-- Compile Dependencies -->
+
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
@@ -61,6 +67,11 @@
 		   <artifactId>spring-core</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>${slf4j.groupId}</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+
         <!-- Provided Dependencies -->
         <dependency>
             <groupId>jakarta.json</groupId>
@@ -145,6 +156,26 @@
             <artifactId>spring-context</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.xmlunit</groupId>
+            <artifactId>xmlunit-core</artifactId>
+            <scope>test</scope>
+        </dependency>
 
     </dependencies>
 
diff --git a/pom.xml b/pom.xml
index c47d2ae..c8a4059 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,41 +44,6 @@
         <url>${shibboleth.scm.url}java-metadata-aggregator.git</url>
     </scm>
 
-    <!-- Dependencies which are required by every single project module should go here and will be inherited by all modules. -->
-    <dependencies>
-        <!-- Compile Dependencies -->
-        <dependency>
-            <groupId>${slf4j.groupId}</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-        </dependency>
-
-        <!-- Provided Dependencies -->
-
-        <!-- Runtime Dependencies -->
-
-        <!-- Test Dependencies -->
-        <dependency>
-            <groupId>org.xmlunit</groupId>
-            <artifactId>xmlunit-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
     <!-- Dependencies which are not required by every project module but for which every module should use the same version
         of the dependency should go here. That is to say, placing a dependency here allows one to "peg" the version of the artifact
         used by all project modules. -->

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