From a31feef8c602092bf7c24284ecbd2b09d4032077 Mon Sep 17 00:00:00 2001
From: Dan Timoney <dtimoney@att.com>
Date: Tue, 17 Aug 2021 11:59:38 -0400
Subject: [PATCH] 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
---
 springboot/spring-boot-setup/pom.xml | 35 -----------------------------------
 springboot/springboot25/pom.xml      | 15 +++++++--------
 2 files changed, 7 insertions(+), 43 deletions(-)

diff --git a/springboot/spring-boot-setup/pom.xml b/springboot/spring-boot-setup/pom.xml
index fe5a295d..d41913b0 100644
--- a/springboot/spring-boot-setup/pom.xml
+++ b/springboot/spring-boot-setup/pom.xml
@@ -71,30 +71,6 @@
                             <encoding>UTF-8</encoding>
                         </configuration>
                     </execution>
-                    <execution>
-                        <id>create-springboot25-parent-pom</id>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals><!-- here the phase you need -->
-                        <phase>validate</phase>
-                        <configuration>
-                            <outputDirectory>../springboot25</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>src/main/resources</directory>
-                                    <includes>
-                                        <include>pom-template.xml</include>
-                                    </includes>
-                                    <filtering>true</filtering>
-                                </resource>
-                            </resources>
-                            <escapeString>\</escapeString>
-                            <filters>
-                                <filter>${basedir}/src/main/properties/springboot25.properties</filter>
-                            </filters>
-                            <encoding>UTF-8</encoding>
-                        </configuration>
-                    </execution>
                 </executions>
             </plugin>
             <plugin>
@@ -124,17 +100,6 @@
                             <destinationFile>../springboot2/pom.xml</destinationFile>
                         </configuration>
                     </execution>
-                    <execution>
-                        <id>rename-springboot25-parent-pom</id>
-                        <phase>validate</phase>
-                        <goals>
-                            <goal>rename</goal>
-                        </goals>
-                        <configuration>
-                            <sourceFile>../springboot25/pom-template.xml</sourceFile>
-                            <destinationFile>../springboot25/pom.xml</destinationFile>
-                        </configuration>
-                    </execution>
                 </executions>
             </plugin>
         </plugins>
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>
-- 
2.16.6