Consolidating and organizing dependencies

This is the first sweep to organize the dependencies. I did upgrade
the JUnit in this repo to 4.12 as I thought this would be harmless.

Issue-ID: POLICY-626
Change-Id: I4dc120d2d48830b282d9a173ab69cc553a4d5e78
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>

diff --git a/common-logging/pom.xml b/common-logging/pom.xml
index 400434c..26da304 100644 (file)
--- a/common-logging/pom.xml
+++ b/common-logging/pom.xml
@@ -33,6 +33,11 @@
   <packaging>jar</packaging>
 
   <dependencies>
+       <dependency>
+               <groupId>log4j</groupId>
+               <artifactId>log4j</artifactId>
+               <scope>provided</scope>
+       </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>javax.servlet-api</artifactId>
@@ -49,12 +54,6 @@
                <artifactId>eelf-core</artifactId>
                <version>0.0.1</version>
        </dependency>
-       <dependency>
-               <groupId>log4j</groupId>
-               <artifactId>log4j</artifactId>
-               <version>1.2.17</version>
-               <scope>provided</scope>
-       </dependency>
   </dependencies>
  
        <build>

diff --git a/integrity-audit/pom.xml b/integrity-audit/pom.xml
index 413ee1d..286842f 100644 (file)
--- a/integrity-audit/pom.xml
+++ b/integrity-audit/pom.xml
@@ -36,54 +36,49 @@
        <name>Integrity Audit</name>
 
        <dependencies>
-               <dependency>
-                       <groupId>log4j</groupId>
-                       <artifactId>log4j</artifactId>
-                       <version>1.2.17</version>
-               </dependency>
                <dependency>
                        <groupId>junit</groupId>
                        <artifactId>junit</artifactId>
-                       <version>4.11</version>
                        <scope>test</scope>
                </dependency>
                <dependency>
-                       <groupId>org.onap.policy.common</groupId>
-                       <artifactId>utils</artifactId>
-                       <version>${project.version}</version>
-                       <scope>test</scope>
+                       <groupId>log4j</groupId>
+                       <artifactId>log4j</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.onap.policy.common</groupId>
-                       <artifactId>utils-test</artifactId>
-                        <version>${project.version}</version>
-                       <scope>test</scope>
+                       <groupId>com.h2database</groupId>
+                       <artifactId>h2</artifactId>
                </dependency>
                <dependency>
                        <groupId>org.eclipse.persistence</groupId>
                        <artifactId>javax.persistence</artifactId>
-                       <version>2.1.0</version>
                </dependency>
                <dependency>
                        <groupId>org.eclipse.persistence</groupId>
                        <artifactId>eclipselink</artifactId>
-                       <version>2.6.0</version>
                </dependency>
                <dependency>
-                       <groupId>com.h2database</groupId>
-                       <artifactId>h2</artifactId>
-                       <version>[1.4.186,)</version>
+                       <groupId>org.onap.policy.common</groupId>
+                       <artifactId>utils</artifactId>
+                       <version>${project.version}</version>
+                       <scope>test</scope>
                </dependency>
                <dependency>
-                        <groupId>org.apache.commons</groupId>
-                        <artifactId>commons-lang3</artifactId>
-                        <version>3.4</version>
+                       <groupId>org.onap.policy.common</groupId>
+                       <artifactId>utils-test</artifactId>
+                        <version>${project.version}</version>
+                       <scope>test</scope>
                </dependency>
                <dependency>
                         <groupId>org.onap.policy.common</groupId>
                         <artifactId>ONAP-Logging</artifactId>
                         <version>${project.version}</version>
                </dependency>
+               <dependency>
+                        <groupId>org.apache.commons</groupId>
+                        <artifactId>commons-lang3</artifactId>
+                        <version>3.4</version>
+               </dependency>
        </dependencies>
 
        <build>

diff --git a/integrity-monitor/pom.xml b/integrity-monitor/pom.xml
index 4e69cce..a5295b1 100644 (file)
--- a/integrity-monitor/pom.xml
+++ b/integrity-monitor/pom.xml
@@ -36,54 +36,49 @@
        <name>Integrity Monitor</name>
 
        <dependencies>
-               <dependency>
-                       <groupId>log4j</groupId>
-                       <artifactId>log4j</artifactId>
-                       <version>1.2.17</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.common</groupId>
-                       <artifactId>utils</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
                <dependency>
                        <groupId>junit</groupId>
                        <artifactId>junit</artifactId>
-                       <version>4.11</version>
                        <scope>test</scope>
                </dependency>
                <dependency>
-                       <groupId>org.onap.policy.common</groupId>
-                       <artifactId>utils-test</artifactId>
-                       <version>${project.version}</version>
-                       <scope>test</scope>
+                       <groupId>log4j</groupId>
+                       <artifactId>log4j</artifactId>
                </dependency>
                <dependency>
-                       <groupId>commons-logging</groupId>
-                       <artifactId>commons-logging</artifactId>
-                       <version>1.1.3</version>
-                       <scope>test</scope>
-               </dependency>   
+                       <groupId>com.h2database</groupId>
+                       <artifactId>h2</artifactId>
+               </dependency>
                <dependency>
                        <groupId>org.eclipse.persistence</groupId>
                        <artifactId>javax.persistence</artifactId>
-                       <version>2.1.0</version>
                </dependency>
                <dependency>
                        <groupId>org.eclipse.persistence</groupId>
                        <artifactId>eclipselink</artifactId>
-                       <version>2.6.0</version>
                </dependency>
                <dependency>
-                       <groupId>com.h2database</groupId>
-                       <artifactId>h2</artifactId>
-                       <version>[1.4.186,)</version>
+                       <groupId>org.onap.policy.common</groupId>
+                       <artifactId>utils</artifactId>
+                       <version>${project.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.onap.policy.common</groupId>
+                       <artifactId>utils-test</artifactId>
+                       <version>${project.version}</version>
+                       <scope>test</scope>
                </dependency>
                <dependency>
                         <groupId>org.onap.policy.common</groupId>
                         <artifactId>ONAP-Logging</artifactId>
                         <version>${project.version}</version>
                </dependency>
+               <dependency>
+                       <groupId>commons-logging</groupId>
+                       <artifactId>commons-logging</artifactId>
+                       <version>1.1.3</version>
+                       <scope>test</scope>
+               </dependency>
        </dependencies>
 
        <build>

diff --git a/pom.xml b/pom.xml
index bab777b..bea8f47 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -58,9 +58,24 @@
                <sonar.jacoco.itReportPath>${project.basedir}/../target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPath>
                <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
 
-               <!-- Project common dependency versions -->
+               <!--
+               Shared between policy/* project repositories - same version 
+        -->
+               <junit.version>4.12</junit.version>
                <logback.version>1.2.3</logback.version>
+               <log4j.version>1.2.17</log4j.version>
+               <javax.persistence.version>2.1.0</javax.persistence.version>
+                       
+               <!--
+               Shared between policy/* project repositories - different version 
+        -->
+               <eclipselink.version>2.6.0</eclipselink.version>
+               <mariadb.jdbc.version>1.2.3</mariadb.jdbc.version>
+        
+               <!-- Project common dependency versions -->
                <javax.persistence.api.version>1.0.2</javax.persistence.api.version>
+               <h2.version>1.4.186</h2.version>
+
        </properties>
 
 
@@ -104,6 +119,42 @@
                </repository>
                <!-- LF repositories END -->
        </repositories>
+       
+       <dependencyManagement>
+               <dependencies>
+                       <dependency>
+                               <groupId>ch.qos.logback</groupId>
+                               <artifactId>logback-classic</artifactId>
+                               <version>${logback.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>junit</groupId>
+                               <artifactId>junit</artifactId>
+                               <version>${junit.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>log4j</groupId>
+                               <artifactId>log4j</artifactId>
+                               <version>${log4j.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>com.h2database</groupId>
+                               <artifactId>h2</artifactId>
+                               <version>${h2.version}</version>
+                               <scope>test</scope>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.eclipse.persistence</groupId>
+                               <artifactId>javax.persistence</artifactId>
+                               <version>${javax.persistence.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.eclipse.persistence</groupId>
+                               <artifactId>eclipselink</artifactId>
+                               <version>${eclipselink.version}</version>
+                       </dependency>
+               </dependencies>
+       </dependencyManagement>
 
        <build>
                <pluginManagement>

diff --git a/site-manager/pom.xml b/site-manager/pom.xml
index 8726825..a30be04 100644 (file)
--- a/site-manager/pom.xml
+++ b/site-manager/pom.xml
@@ -108,7 +108,6 @@
                <dependency>
                        <groupId>org.eclipse.persistence</groupId>
                        <artifactId>javax.persistence</artifactId>
-                       <version>2.1.0</version>
                </dependency>
                <dependency>
                        <groupId>org.onap.policy.common</groupId>
@@ -118,7 +117,7 @@
                <dependency>
                        <groupId>org.mariadb.jdbc</groupId>
                        <artifactId>mariadb-java-client</artifactId>
-                       <version>1.2.3</version>
+                       <version>${mariadb.jdbc.version}</version>
                </dependency>
                <dependency>
                        <groupId>commons-cli</groupId>

diff --git a/utils-test/pom.xml b/utils-test/pom.xml
index 7df85eb..8e1a570 100644 (file)
--- a/utils-test/pom.xml
+++ b/utils-test/pom.xml
@@ -36,13 +36,11 @@
                <dependency>
                        <groupId>junit</groupId>
                        <artifactId>junit</artifactId>
-                       <version>4.11</version>
                        <scope>provided</scope>
                </dependency>
                <dependency>
                        <groupId>ch.qos.logback</groupId>
                        <artifactId>logback-classic</artifactId>
-                       <version>${logback.version}</version>
                </dependency>
        </dependencies>
 

diff --git a/utils/pom.xml b/utils/pom.xml
index a9aff9e..27eeceb 100644 (file)
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -40,7 +40,6 @@
                <dependency>
                        <groupId>junit</groupId>
                        <artifactId>junit</artifactId>
-                       <version>4.11</version>
                        <scope>test</scope>
                </dependency>
                <dependency>