aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJorge Hernandez <jh1730@att.com>2018-02-20 17:54:03 +0000
committerGerrit Code Review <gerrit@onap.org>2018-02-20 17:54:03 +0000
commitd87ae428f0e9b2941bd7a341ce92bbb2549d18d5 (patch)
treee71e4876392bd35712106eff8271b3a53c64fd52
parent54800b25c8bcb27725c559e5fe7329dc46daf1a0 (diff)
parent29c8d903616ba7691c890e2e15fbe3a956fe3c50 (diff)
Merge "Consolidating and organizing dependencies"
-rw-r--r--common-logging/pom.xml11
-rw-r--r--integrity-audit/pom.xml39
-rw-r--r--integrity-monitor/pom.xml45
-rw-r--r--pom.xml53
-rw-r--r--site-manager/pom.xml3
-rw-r--r--utils-test/pom.xml2
-rw-r--r--utils/pom.xml1
7 files changed, 95 insertions, 59 deletions
diff --git a/common-logging/pom.xml b/common-logging/pom.xml
index 400434c1..26da3041 100644
--- 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 413ee1dd..286842fe 100644
--- a/integrity-audit/pom.xml
+++ b/integrity-audit/pom.xml
@@ -37,53 +37,48 @@
<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 4e69ccea..a5295b17 100644
--- a/integrity-monitor/pom.xml
+++ b/integrity-monitor/pom.xml
@@ -37,53 +37,48 @@
<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 bab777b1..bea8f47b 100644
--- 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 8726825e..a30be04d 100644
--- 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 7df85eb1..8e1a570a 100644
--- 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 a9aff9e4..27eeceb7 100644
--- 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>