From fdc9b78829ab49a6945a3dfa888d43867d08081f Mon Sep 17 00:00:00 2001
From: Remigiusz Janeczek <remigiusz.janeczek@nokia.com>
Date: Thu, 17 Sep 2020 13:17:15 +0200
Subject: Update bpgenerator to java 11

Remove cobertura (not compatible with java 11)
Change sonar to use jacoco report

Issue-ID: DCAEGEN2-2289
Signed-off-by: Remigiusz Janeczek <remigiusz.janeczek@nokia.com>
Change-Id: I4edcc601b46c11e1ff0c9a7305a0a01a2becded3
---
 mod/bpgenerator/pom.xml            | 72 +++-----------------------------------
 mod/bpgenerator/version.properties |  2 +-
 2 files changed, 5 insertions(+), 69 deletions(-)

(limited to 'mod/bpgenerator')

diff --git a/mod/bpgenerator/pom.xml b/mod/bpgenerator/pom.xml
index 96ceb41..8960d69 100644
--- a/mod/bpgenerator/pom.xml
+++ b/mod/bpgenerator/pom.xml
@@ -29,17 +29,12 @@
 	</parent>
 	<groupId>org.onap.dcaegen2.platform.mod</groupId>
 	<artifactId>blueprint-generator</artifactId>
-	<version>1.4.0-SNAPSHOT</version>
+	<version>1.5.0-SNAPSHOT</version>
 	<properties>
-		<maven.compiler.source>1.6</maven.compiler.source>
-		<maven.compiler.target>1.6</maven.compiler.target>
-
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<sonar.core.codeCoveragePlugin>cobertura</sonar.core.codeCoveragePlugin>
-		<sonar.java.coveragePlugin>cobertura</sonar.java.coveragePlugin>
 		<sonar.junit.reportsPath>${project.basedir}/target/surefire-reports</sonar.junit.reportsPath>
 		<sonar.surefire.reportsPath>${project.basedir}/target/surefire-reports</sonar.surefire.reportsPath>
-		<sonar.cobertura.reportPaths>${project.basedir}/target/site/cobertura/coverage.xml</sonar.cobertura.reportPaths>
+		<sonar.coverage.jacoco.xmlReportPaths>${project.basedir}/target/site/jacoco-ut/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
 		<shade.main>org.onap.blueprintgenerator.core.App</shade.main>
 		<shade.transformer>org.apache.maven.plugins.shade.resource.ManifestResourceTransformer</shade.transformer>
 	</properties>
@@ -69,47 +64,6 @@
 
 			</plugin>
 
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>cobertura-maven-plugin</artifactId>
-				<version>2.7</version>
-				<configuration>
-					<instrumentation>
-						<includes>
-							<include>**/*.class</include>
-						</includes>
-					</instrumentation>
-					<encoding>UTF-8</encoding>
-				</configuration>
-
-				<executions>
-
-					<execution>
-						<id>clean</id>
-						<!-- > <phase>pre-site</phase> -->
-						<phase>pre-site</phase>
-						<goals>
-							<goal>cobertura</goal>
-						</goals>
-					</execution>
-
-
-					<execution>
-						<id>instrument</id>
-						<phase>site</phase>
-						<goals>
-							<goal>instrument</goal>
-							<goal>cobertura</goal>
-						</goals>
-						<configuration>
-							<encoding>UTF-8</encoding>
-						</configuration>
-					</execution>
-
-				</executions>
-
-			</plugin>
-
 			<plugin>
 				<groupId>org.sonarsource.scanner.maven</groupId>
 				<artifactId>sonar-maven-plugin</artifactId>
@@ -141,31 +95,13 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<configuration>
-					<source>8</source>
-					<target>8</target>
+					<source>11</source>
+					<target>11</target>
 				</configuration>
 			</plugin>
 		</plugins>
-
 	</build>
 
-	<reporting>
-		<plugins>
-			<plugin>
-				<!-- use mvn cobertura:cobertura to generate cobertura reports -->
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>cobertura-maven-plugin</artifactId>
-				<version>2.7</version>
-				<configuration>
-					<formats>
-						<format>xml</format>
-					</formats>
-				</configuration>
-			</plugin>
-		</plugins>
-	</reporting>
-
-
 	<dependencies>
 		<dependency>
 			<groupId>junit</groupId>
diff --git a/mod/bpgenerator/version.properties b/mod/bpgenerator/version.properties
index 9e0d73d..68bc8f5 100644
--- a/mod/bpgenerator/version.properties
+++ b/mod/bpgenerator/version.properties
@@ -1,5 +1,5 @@
 major=1
-minor=4
+minor=5
 patch=0
 base_version=${major}.${minor}.${patch}
 release_version=${base_version}
-- 
cgit 1.2.3-korg