summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiam Fallon <liam.fallon@est.tech>2019-12-13 11:55:41 +0000
committerGerrit Code Review <gerrit@onap.org>2019-12-13 11:55:41 +0000
commit7e686f3944a9618426fadc5fb952a4283375161c (patch)
tree450802174818d7bc8bd73ba103a02aa33e12f3d4
parent21317cfb4a10da6f59376dabb59fc2dd7b60b897 (diff)
parent4b7e270c5c749a97c5d33283b9c95f24acce1d29 (diff)
Merge "Added some JDK 11 upgrades and point to oparent java 11 branch"
-rw-r--r--integration/pom.xml9
-rw-r--r--pom.xml8
2 files changed, 7 insertions, 10 deletions
diff --git a/integration/pom.xml b/integration/pom.xml
index a43bcfe0..6d6a1318 100644
--- a/integration/pom.xml
+++ b/integration/pom.xml
@@ -34,13 +34,11 @@
<description>Policy Integration POM</description>
<properties>
- <java.version>1.8</java.version>
- <maven.compiler.source>1.8</maven.compiler.source>
- <maven.compiler.target>1.8</maven.compiler.target>
+ <java.version>11</java.version>
<version.logback>1.2.3</version.logback>
<version.dmaap>1.1.9</version.dmaap>
<version.powermock>1.7.4</version.powermock>
- <version.eclipselink>2.7.0</version.eclipselink>
+ <version.eclipselink>2.7.5</version.eclipselink>
<version.jackson>2.10.0.pr3</version.jackson>
<version.drools>7.30.0.Final</version.drools>
<version.jersey>2.29.1</version.jersey>
@@ -580,8 +578,7 @@
<version>3.8.1</version>
<configuration>
<encoding>${project.build.sourceEncoding}</encoding>
- <source>${java.version}</source>
- <target>${java.version}</target>
+ <release>${java.version}</release>
</configuration>
</plugin>
<plugin>
diff --git a/pom.xml b/pom.xml
index 42eb180b..7ea3ef67 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onap.oparent</groupId>
<artifactId>oparent</artifactId>
- <version>2.1.0</version>
+ <version>3.0.0-SNAPSHOT</version>
<relativePath />
</parent>
<groupId>org.onap.policy.parent</groupId>
@@ -31,7 +31,7 @@
<packaging>pom</packaging>
<properties>
- <oparent.version>2.1.0</oparent.version>
+ <oparent.version>3.0.0-SNAPSHOT</oparent.version>
</properties>
<modules>
@@ -53,7 +53,7 @@
<plugin>
<groupId>net.revelc.code.formatter</groupId>
<artifactId>formatter-maven-plugin</artifactId>
- <version>2.8.1</version>
+ <version>2.11.0</version>
<configuration>
<configFile>${project.parent.basedir}/onap-java-formatter.xml</configFile>
</configuration>
@@ -64,7 +64,7 @@
<plugin>
<groupId>com.diffplug.spotless</groupId>
<artifactId>spotless-maven-plugin</artifactId>
- <version>1.18.0</version>
+ <version>1.26.1</version>
<configuration>
<java>
<importOrder>