summaryrefslogtreecommitdiffstats
path: root/springboot/springboot25
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2021-08-17 11:59:38 -0400
committerDan Timoney <dtimoney@att.com>2021-08-17 13:38:44 -0400
commita31feef8c602092bf7c24284ecbd2b09d4032077 (patch)
tree3a47e3106d2e73df328454398a4edd95a6f6bd31 /springboot/springboot25
parent95395e80b9e994c8fa801570f689b26870457951 (diff)
Update for Java 11
Update to use java 11 to compile Issue-ID: CCSDK-3415 Signed-off-by: Dan Timoney <dtimoney@att.com> Change-Id: I6f60e301c801f44ff811a6dd1cc40ad721bb7fc3
Diffstat (limited to 'springboot/springboot25')
-rw-r--r--springboot/springboot25/pom.xml15
1 files changed, 7 insertions, 8 deletions
diff --git a/springboot/springboot25/pom.xml b/springboot/springboot25/pom.xml
index 294bda86..ae8ba4d9 100644
--- a/springboot/springboot25/pom.xml
+++ b/springboot/springboot25/pom.xml
@@ -54,8 +54,6 @@
<jacoco.version>0.8.5</jacoco.version>
<!-- properties from oparent -->
- <maven.compiler.source>1.8</maven.compiler.source>
- <maven.compiler.target>1.8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<!-- sitePath may be overridden in the inheriting POM if desired -->
@@ -79,10 +77,9 @@
<onap.nexus.staging.server-id>ecomp-staging</onap.nexus.staging.server-id>
<onap.nexus.staging.profile-id>176c31dfe190a</onap.nexus.staging.profile-id>
- <java.version.source>1.8</java.version.source>
- <java.version.target>1.8</java.version.target>
+ <java.version>11</java.version>
<bundle.plugin.version>2.5.0</bundle.plugin.version>
- <maven.compile.plugin.version>2.5.1</maven.compile.plugin.version>
+ <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
<features.file>features.xml</features.file>
<jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath>
<salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath>
@@ -443,10 +440,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>${maven.compile.plugin.version}</version>
+ <version>${maven-compiler-plugin.version}</version>
<configuration>
- <source>${java.version.source}</source>
- <target>${java.version.target}</target>
+ <release>${java.version}</release>
+ <!--explicitly remove source and target-->
+ <source combine.self="override"/>
+ <target combine.self="override"/>
</configuration>
</plugin>
<plugin>