From fdc9b78829ab49a6945a3dfa888d43867d08081f Mon Sep 17 00:00:00 2001 From: Remigiusz Janeczek 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 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 @@ org.onap.dcaegen2.platform.mod blueprint-generator - 1.4.0-SNAPSHOT + 1.5.0-SNAPSHOT - 1.6 - 1.6 - UTF-8 - cobertura - cobertura ${project.basedir}/target/surefire-reports ${project.basedir}/target/surefire-reports - ${project.basedir}/target/site/cobertura/coverage.xml + ${project.basedir}/target/site/jacoco-ut/jacoco.xml org.onap.blueprintgenerator.core.App org.apache.maven.plugins.shade.resource.ManifestResourceTransformer @@ -69,47 +64,6 @@ - - org.codehaus.mojo - cobertura-maven-plugin - 2.7 - - - - **/*.class - - - UTF-8 - - - - - - clean - - pre-site - - cobertura - - - - - - instrument - site - - instrument - cobertura - - - UTF-8 - - - - - - - org.sonarsource.scanner.maven sonar-maven-plugin @@ -141,31 +95,13 @@ org.apache.maven.plugins maven-compiler-plugin - 8 - 8 + 11 + 11 - - - - - - org.codehaus.mojo - cobertura-maven-plugin - 2.7 - - - xml - - - - - - - junit 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