pom: Make dependencies explicit

Motivation: Maven's dependency module has a nice feature to show used but undeclared or unused but declared dependencies. Modification: Adds and removes dependencies accordingly. Result: No user visible changes. Target: trunk Require-notes: no Require-book: no Acked-by: Albert Rossi <arossi@fnal.gov> Patch: https://rb.dcache.org/r/8677/
dCache · Feb 10, 2016 · 0aebf12 · 0aebf12
1 parent d1aa11d
commit 0aebf12
Show file tree

Hide file tree

Showing 21 changed files with 133 additions and 119 deletions.
diff --git a/modules/cells/pom.xml b/modules/cells/pom.xml
@@ -22,6 +22,10 @@
         <groupId>ch.qos.logback</groupId>
         <artifactId>logback-classic</artifactId>
     </dependency>
+    <dependency>
+        <groupId>ch.qos.logback</groupId>
+        <artifactId>logback-core</artifactId>
+    </dependency>
     <dependency>
         <groupId>jline</groupId>
         <artifactId>jline</artifactId>

diff --git a/modules/chimera/pom.xml b/modules/chimera/pom.xml
@@ -18,6 +18,10 @@
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>jline</groupId>
+      <artifactId>jline</artifactId>
+    </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
@@ -30,6 +34,14 @@
         <groupId>org.postgresql</groupId>
         <artifactId>postgresql</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.zaxxer</groupId>
+      <artifactId>HikariCP</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-tx</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-jdbc</artifactId>
@@ -39,6 +51,11 @@
       <artifactId>dcache-common</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.dcache</groupId>
+      <artifactId>acl-vehicles</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.dcache</groupId>
       <artifactId>common-cli</artifactId>

diff --git a/modules/dcache-chimera/pom.xml b/modules/dcache-chimera/pom.xml
@@ -26,35 +26,35 @@
         <groupId>org.springframework</groupId>
         <artifactId>spring-tx</artifactId>
     </dependency>
+    <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-jdbc</artifactId>
+    </dependency>
 
     <dependency>
       <groupId>org.dcache</groupId>
-      <artifactId>dcache-core</artifactId>
+      <artifactId>dcache-vehicles</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.dcache</groupId>
-      <artifactId>common-cli</artifactId>
+      <artifactId>chimera</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.dcache</groupId>
-      <artifactId>chimera</artifactId>
+      <artifactId>acl-vehicles</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.dcache</groupId>
-      <artifactId>acl</artifactId>
+      <artifactId>dcache-core</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>com.zaxxer</groupId>
       <artifactId>HikariCP</artifactId>
     </dependency>
-    <dependency>
-        <groupId>org.postgresql</groupId>
-        <artifactId>postgresql</artifactId>
-    </dependency>
 
     <dependency>
         <groupId>org.hsqldb</groupId>

diff --git a/modules/dcache-nearline-spi/pom.xml b/modules/dcache-nearline-spi/pom.xml
@@ -15,8 +15,13 @@
 
   <dependencies>
       <dependency>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-api</artifactId>
+          <groupId>com.google.guava</groupId>
+          <artifactId>guava</artifactId>
+      </dependency>
+      <dependency>
+          <groupId>org.dcache</groupId>
+          <artifactId>dcache-common</artifactId>
+          <version>${project.version}</version>
       </dependency>
       <dependency>
           <groupId>org.dcache</groupId>

diff --git a/modules/dcache-vehicles/pom.xml b/modules/dcache-vehicles/pom.xml
@@ -15,8 +15,9 @@
 
   <dependencies>
       <dependency>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-api</artifactId>
+          <groupId>org.dcache</groupId>
+          <artifactId>dcache-common</artifactId>
+          <version>${project.version}</version>
       </dependency>
       <dependency>
           <groupId>org.dcache</groupId>
@@ -28,6 +29,10 @@
           <artifactId>acl-vehicles</artifactId>
           <version>${project.version}</version>
       </dependency>
+      <dependency>
+          <groupId>eu.eu-emi.security</groupId>
+          <artifactId>canl</artifactId>
+      </dependency>
       <dependency>
           <groupId>com.google.code.findbugs</groupId>
           <artifactId>annotations</artifactId>

diff --git a/modules/ftp-client/pom.xml b/modules/ftp-client/pom.xml
@@ -31,18 +31,10 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.google.code.findbugs</groupId>
             <artifactId>annotations</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.bouncycastle</groupId>
-            <artifactId>${bouncycastle.bcprov}</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.dcache</groupId>
             <artifactId>dcache-common</artifactId>
@@ -53,10 +45,6 @@
             <artifactId>common-security</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>eu.eu-emi.security</groupId>
-            <artifactId>canl</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>

diff --git a/modules/gplazma2-argus/pom.xml b/modules/gplazma2-argus/pom.xml
@@ -45,6 +45,11 @@
         <artifactId>jcl-over-slf4j</artifactId>
         <scope>test</scope>
     </dependency>
+    <dependency>
+        <groupId>org.dcache</groupId>
+        <artifactId>dcache-common</artifactId>
+        <version>${project.version}</version>
+    </dependency>
     <dependency>
         <groupId>org.dcache</groupId>
         <artifactId>gplazma2</artifactId>

diff --git a/modules/gplazma2-banfile/pom.xml b/modules/gplazma2-banfile/pom.xml
@@ -16,12 +16,13 @@
   <dependencies>
       <dependency>
           <groupId>org.dcache</groupId>
-          <artifactId>gplazma2</artifactId>
+          <artifactId>dcache-common</artifactId>
           <version>${project.version}</version>
       </dependency>
       <dependency>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-api</artifactId>
+          <groupId>org.dcache</groupId>
+          <artifactId>gplazma2</artifactId>
+          <version>${project.version}</version>
       </dependency>
       <dependency>
           <groupId>com.google.guava</groupId>

diff --git a/modules/gplazma2-grid/pom.xml b/modules/gplazma2-grid/pom.xml
@@ -26,6 +26,11 @@
         <groupId>org.italiangrid</groupId>
         <artifactId>voms-api-java</artifactId>
     </dependency>
+    <dependency>
+        <groupId>org.dcache</groupId>
+        <artifactId>dcache-common</artifactId>
+        <version>${project.version}</version>
+    </dependency>
     <dependency>
         <groupId>org.dcache</groupId>
         <artifactId>gplazma2</artifactId>

diff --git a/modules/gplazma2-gsi/pom.xml b/modules/gplazma2-gsi/pom.xml
diff --git a/modules/gplazma2-jaas/pom.xml b/modules/gplazma2-jaas/pom.xml
@@ -22,6 +22,11 @@
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.dcache</groupId>
+      <artifactId>dcache-common</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
         <groupId>org.dcache</groupId>
         <artifactId>gplazma2</artifactId>

diff --git a/modules/gplazma2-kpwd/pom.xml b/modules/gplazma2-kpwd/pom.xml
@@ -14,10 +14,6 @@
   <name>gPlazma 2 KPWD plugin</name>
 
   <dependencies>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-    </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
@@ -33,11 +29,5 @@
         <artifactId>gplazma2</artifactId>
         <version>${project.version}</version>
     </dependency>
-
-    <dependency>
-       <groupId>org.bouncycastle</groupId>
-       <artifactId>${bouncycastle.bcprov}</artifactId>
-       <scope>runtime</scope>
-    </dependency>
   </dependencies>
 </project>
diff --git a/modules/gplazma2-krb5/pom.xml b/modules/gplazma2-krb5/pom.xml
@@ -18,6 +18,11 @@
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.dcache</groupId>
+      <artifactId>dcache-common</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
         <groupId>org.dcache</groupId>
         <artifactId>gplazma2</artifactId>

diff --git a/modules/gplazma2-ldap/pom.xml b/modules/gplazma2-ldap/pom.xml
@@ -19,14 +19,15 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.scala-lang</groupId>
             <artifactId>scala-library</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.dcache</groupId>
+            <artifactId>dcache-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.dcache</groupId>
             <artifactId>gplazma2</artifactId>

diff --git a/modules/gplazma2-nis/pom.xml b/modules/gplazma2-nis/pom.xml
@@ -26,6 +26,11 @@
         <groupId>java.jndi</groupId>
         <artifactId>nis</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.dcache</groupId>
+      <artifactId>dcache-common</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
         <groupId>org.dcache</groupId>
         <artifactId>gplazma2</artifactId>

diff --git a/modules/gplazma2-nsswitch/pom.xml b/modules/gplazma2-nsswitch/pom.xml
@@ -14,10 +14,6 @@
   <name>gPlazma 2 Name Service Switch plugin</name>
 
   <dependencies>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-    </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
@@ -26,6 +22,11 @@
         <groupId>net.java.dev.jna</groupId>
         <artifactId>jna</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.dcache</groupId>
+      <artifactId>dcache-common</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
         <groupId>org.dcache</groupId>
         <artifactId>gplazma2</artifactId>

diff --git a/modules/gplazma2-voms/pom.xml b/modules/gplazma2-voms/pom.xml
@@ -14,18 +14,23 @@
   <name>gPlazma 2 VOMS plugin</name>
 
   <dependencies>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-    </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
     </dependency>
+    <dependency>
+      <groupId>eu.eu-emi.security</groupId>
+      <artifactId>canl</artifactId>
+    </dependency>
     <dependency>
         <groupId>org.italiangrid</groupId>
         <artifactId>voms-api-java</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.dcache</groupId>
+      <artifactId>dcache-common</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
         <groupId>org.dcache</groupId>
         <artifactId>gplazma2</artifactId>