Code Review
/
policy
/
engine.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "uplift oparent version 1.2.1->1.2.3"
[policy/engine.git]
/
ONAP-PAP-REST
/
pom.xml
diff --git
a/ONAP-PAP-REST/pom.xml
b/ONAP-PAP-REST/pom.xml
index
7cf30b9
..
3322acd
100644
(file)
--- a/
ONAP-PAP-REST/pom.xml
+++ b/
ONAP-PAP-REST/pom.xml
@@
-19,9
+19,7
@@
============LICENSE_END=========================================================
-->
============LICENSE_END=========================================================
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>ONAP-PAP-REST</artifactId>
<description>ONAP-PAP-REST</description>
<modelVersion>4.0.0</modelVersion>
<artifactId>ONAP-PAP-REST</artifactId>
<description>ONAP-PAP-REST</description>
@@
-29,7
+27,7
@@
<parent>
<groupId>org.onap.policy.engine</groupId>
<artifactId>PolicyEngineSuite</artifactId>
<parent>
<groupId>org.onap.policy.engine</groupId>
<artifactId>PolicyEngineSuite</artifactId>
- <version>1.
3.1
-SNAPSHOT</version>
+ <version>1.
4.0
-SNAPSHOT</version>
</parent>
<build>
<plugins>
</parent>
<build>
<plugins>
@@
-174,12
+172,10
@@
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>javax.persistence</artifactId>
<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>
</dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>eclipselink</artifactId>
- <version>2.6.0</version>
</dependency>
<dependency>
<groupId>org.mariadb.jdbc</groupId>
</dependency>
<dependency>
<groupId>org.mariadb.jdbc</groupId>