Update eclipselink version in policy engine

Use eclipselink from policy parent.

Change-Id: I60b8779c1b384f3fe69d21e7b9ed2a1091ca301e
Issue-ID: POLICY-1365
Signed-off-by: Jim Hahn <jrh3@att.com>

diff --git a/LogParser/pom.xml b/LogParser/pom.xml
index f088f21..035181d 100644 (file)
--- a/LogParser/pom.xml
+++ b/LogParser/pom.xml
@@ -59,12 +59,10 @@
         <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>org.onap.policy.engine</groupId>

diff --git a/ONAP-PAP-REST/pom.xml b/ONAP-PAP-REST/pom.xml
index 21e7db9..3322acd 100644 (file)
--- a/ONAP-PAP-REST/pom.xml
+++ b/ONAP-PAP-REST/pom.xml
@@ -172,12 +172,10 @@
         <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>org.mariadb.jdbc</groupId>

diff --git a/PolicyEngineUtils/pom.xml b/PolicyEngineUtils/pom.xml
index 76a4862..5a30f51 100644 (file)
--- a/PolicyEngineUtils/pom.xml
+++ b/PolicyEngineUtils/pom.xml
@@ -46,12 +46,10 @@
         <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>org.mariadb.jdbc</groupId>

diff --git a/pom.xml b/pom.xml
index 162ea88..fd98fcf 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -51,15 +51,9 @@
         <sonar.jacoco.itReportPath>${project.basedir}/../target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPath>
         <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
 
-        <!-- Shared between policy/* project repositories - same version -->
-        <h2.version>1.4.186</h2.version>
-
-        <!-- Shared between policy/* project repositories - different version -->
-
         <!-- Project common dependency versions -->
         <springframework.version>4.3.18.RELEASE</springframework.version>
         <jetty.plugin.version>9.2.3.v20140905</jetty.plugin.version>
-        <httpclient.version>4.5.5</httpclient.version>
         <jackson.version>2.9.4</jackson.version>
         <commons.fileupload.version>1.3.3</commons.fileupload.version>
         <commons.compress.version>1.18</commons.compress.version>
@@ -103,16 +97,6 @@
             </plugin>
         </plugins>
     </reporting>
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>com.h2database</groupId>
-                <artifactId>h2</artifactId>
-                <version>${h2.version}</version>
-                <scope>test</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
     <dependencies>
         <dependency>
             <groupId>javax.servlet</groupId>
@@ -151,13 +135,11 @@
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-api-mockito</artifactId>
-            <version>1.7.3</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-module-junit4</artifactId>
-            <version>1.7.3</version>
             <scope>test</scope>
         </dependency>
         <!-- https://mvnrepository.com/artifact/org.mockito/mockito-all -->