summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim Hahn <jrh3@att.com>2018-11-30 09:28:09 -0500
committerJim Hahn <jrh3@att.com>2018-11-30 09:28:40 -0500
commita2db43afdf63b3c935406ab659676297ee90b376 (patch)
tree4daf67ff94fa4cafe94c86edce295584b0741251
parent1ff3457738007037364a103c28836d582098f764 (diff)
Update eclipselink version in policy common
Use eclipselink from policy parent. Change-Id: I472900a82a5c8b69e1a4a1efc4b3bcb86f3965a8 Issue-ID: POLICY-1359 Signed-off-by: Jim Hahn <jrh3@att.com>
-rw-r--r--pom.xml42
-rw-r--r--utils/pom.xml5
2 files changed, 2 insertions, 45 deletions
diff --git a/pom.xml b/pom.xml
index d50a9652..e3b1ae8a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,18 +57,7 @@
<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 -->
- <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>
-
<!-- Project common dependency versions -->
- <javax.persistence.api.version>1.0.2</javax.persistence.api.version>
- <h2.version>1.4.186</h2.version>
<commons-lang3.version>3.4</commons-lang3.version>
</properties>
@@ -86,37 +75,6 @@
<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>
- <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>${commons-lang3.version}</version>
diff --git a/utils/pom.xml b/utils/pom.xml
index 239710a4..f5489ee0 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -42,9 +42,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
- <scope>provided</scope>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>javax.persistence</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>