From 6b1a3570356fd1a5624ea64db8d1f029ce0ab002 Mon Sep 17 00:00:00 2001
From: "Lott, Christopher (cl778h)" <cl778h@att.com>
Date: Tue, 9 Jul 2019 17:43:18 -0400
Subject: [PATCH] Add sonar plugin config to parent POM file

Upgrade to Java 11 compiler and openjdk:11 base image.
Upgrade version of jacoco plugin.
Drop forkCount=0 config on surefire plugin.

Change-Id: I2355f950c1689cfda01a0f21783cb0a0025de1f9
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>
---
 docs/release-notes.rst |  5 +++--
 pom.xml                | 16 +++++++---------
 webapp-backend/pom.xml |  4 ++--
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/docs/release-notes.rst b/docs/release-notes.rst
index d046a73f..253d43d2 100644
--- a/docs/release-notes.rst
+++ b/docs/release-notes.rst
@@ -20,10 +20,11 @@
 RIC Dashboard Release Notes
 ===========================
 
-Version 1.2.0, 9 July 2019
---------------------------
+Version 1.2.0, 10 July 2019
+---------------------------
 * Split URL properties into prefix/suffix parts
 * Add jacoco plugin to back-end for code coverage
+* Compile with Java version 11, run with image openjdk:11
 
 Version 1.0.5, 5 July 2019
 --------------------------
diff --git a/pom.xml b/pom.xml
index 8fd45a3e..dd134912 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,7 @@ limitations under the License.
 	<packaging>pom</packaging>
 	<version>1.2.0-SNAPSHOT</version>
 	<properties>
-		<java.version>8</java.version>
+		<java.version>11</java.version>
 		<!-- Properties for the license-maven-plugin in child POMs -->
 		<lmp.organization.name>AT&amp;T Intellectual Property and Nokia</lmp.organization.name>
 		<lmp.project.name>O-RAN-SC</lmp.project.name>
@@ -62,14 +62,6 @@ limitations under the License.
 					<target>${java.version}</target>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<configuration>
-					<!-- For Java 9 and later -->
-					<forkCount>0</forkCount>
-				</configuration>
-			</plugin>
 			<!-- Always generate a source jar -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -91,6 +83,12 @@ limitations under the License.
 					<skip>true</skip>
 				</configuration>
 			</plugin>
+			<!-- support sonar in multi-module project -->
+			<plugin>
+				<groupId>org.sonarsource.scanner.maven</groupId>
+				<artifactId>sonar-maven-plugin</artifactId>
+				<version>3.6.0.1398</version>
+			</plugin>
 		</plugins>
 		<pluginManagement>
 			<plugins>
diff --git a/webapp-backend/pom.xml b/webapp-backend/pom.xml
index 01362c6f..89a8315e 100644
--- a/webapp-backend/pom.xml
+++ b/webapp-backend/pom.xml
@@ -189,7 +189,7 @@ limitations under the License.
 			<plugin>
 				<groupId>org.jacoco</groupId>
 				<artifactId>jacoco-maven-plugin</artifactId>
-				<version>0.7.9</version>
+				<version>0.8.4</version>
 				<executions>
 					<execution>
 						<id>default-prepare-agent</id>
@@ -222,7 +222,7 @@ limitations under the License.
 							<!-- Avoid maven artifact name here -->
 							<name>ric-dashboard:${project.version}</name>
 							<build>
-								<from>openjdk:8-jre-slim</from>
+								<from>openjdk:11-jre-slim</from>
 								<tags>
 									<!-- Add tag with build number -->
 									<tag>${project.version}</tag>
-- 
2.16.6