From 9a5261682bb4d2966867e7be5ff961fed960b59a Mon Sep 17 00:00:00 2001 From: "Lee, Tian (tl5884)" Date: Thu, 3 Oct 2019 12:22:40 +0100 Subject: [PATCH] Enforce minimum Jacoco line coverage Current coverage at 97%, enforced limit set to 90% Change-Id: Ib6ad68dc5b72c2c76d02b42e18943b79400968a6 Issue-ID: AAI-2363 Signed-off-by: Lee, Tian (tl5884) --- pom.xml | 951 +++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 492 insertions(+), 459 deletions(-) diff --git a/pom.xml b/pom.xml index 2e76668..bf85f3e 100644 --- a/pom.xml +++ b/pom.xml @@ -21,477 +21,510 @@ ============LICENSE_END========================================================= --> - - 4.0.0 + + 4.0.0 - - org.onap.oparent - oparent - 2.0.0 - - + + org.onap.oparent + oparent + 2.0.0 + + - org.onap.aai - babel - 1.6.0-SNAPSHOT - jar + org.onap.aai + babel + 1.6.0-SNAPSHOT + jar - aai-babel - ONAP AAI Babel Microservice + aai-babel + ONAP AAI Babel Microservice - - - 2.1.6.RELEASE + + + 2.1.6.RELEASE - UTF-8 - UTF-8 - 1.8 - onap/aai_schema - ${project.build.directory}/aai-schema + UTF-8 + UTF-8 + 1.8 + onap/aai_schema + ${project.build.directory}/aai-schema + ${project.build.directory}/code-coverage + 0.90 - 0.28.0 - 1.0.0 - ${project.build.directory}/${project.artifactId}-${project.version}-build/ - - onap - alpine - 1.6.0 + 0.28.0 + 1.0.0 + ${project.build.directory}/${project.artifactId}-${project.version}-build/ + + onap + alpine + 1.6.0 - - 1.2.2 - 1.5.1 - 1.18 - 2.1 - 0.13.2 - org.onap.aai.schema-service - 1.5.0 - 3.7 - 1.2.1 - 1.3.0 - 1.6 - 1.2.3 - 1.8 + + 1.2.2 + 1.5.1 + 1.18 + 2.1 + 0.13.2 + org.onap.aai.schema-service + 1.5.0 + 1.2.1 + 1.3.0 + 1.6 + 1.2.3 + 1.8 - yyyyMMdd'T'HHmmss'Z' - + yyyyMMdd'T'HHmmss'Z' + - - - - - org.springframework.boot - spring-boot-dependencies - ${spring.boot.version} - pom - import - - - + + + + + org.springframework.boot + spring-boot-dependencies + ${spring.boot.version} + pom + import + + + - + - - docker - - - - org.codehaus.mojo - build-helper-maven-plugin - 3.0.0 - - - pre-clean - parse-version - - parse-version - - - - - - org.codehaus.groovy.maven - gmaven-plugin - 1.0 - - - pre-clean - - execute - - - - def userAaiBaseImage = session.userProperties['aai.base.image']; - def userAaiCommonVersion = session.userProperties['aai.base.image.version']; - if (userAaiCommonVersion != null) { - project.properties['aai.base.image.version'] = userAaiCommonVersion; - } - if (userAaiBaseImage != null) { - project.properties['aai.base.image'] = userAaiBaseImage; - } - log.info 'Base image flavour: ' + project.properties['aai.base.image']; - log.info 'Base image version: ' + project.properties['aai.base.image.version']; - - - - - - - io.fabric8 - docker-maven-plugin - ${docker.fabric.version} - - true - 1.23 - - - ${docker.push.registry}/${aai.docker.namespace}/${project.artifactId}:%l - - - @ - - latest - ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest - ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-${maven.build.timestamp} - - try - ${project.basedir}/src/main/docker - - - - - ${aai.build.directory} - /${project.artifactId} - - - - - - - - - - - clean-images - pre-clean - - remove - - - true - - - - generate-images - package - - build - - - - push-images - deploy - - push - - - - - - - - - - - org.springframework.boot - spring-boot-starter-jetty - - - org.springframework.boot - spring-boot-starter-jersey - - - org.springframework.boot - spring-boot-starter-tomcat - - - - - org.onap.aai.logging-service - common-logging - ${common.logging.version} - - - ch.qos.logback - logback-classic - ${logback.version} - - - ch.qos.logback - logback-core - ${logback.version} - - - commons-codec - commons-codec - - - org.apache.commons - commons-compress - ${commons.compress.version} - - - org.apache.commons - commons-lang3 - - - javax.ws.rs - javax.ws.rs-api - ${javax.ws.rs.version} - - - org.codehaus.groovy - groovy - - - org.onap.sdc.sdc-tosca - sdc-tosca - ${sdc.tosca.version} - - - org.onap.aai - rest-client - ${aai.rest.client.version} - + + docker + + + + org.codehaus.mojo + build-helper-maven-plugin + 3.0.0 + + + pre-clean + parse-version + + parse-version + + + + + + org.codehaus.groovy.maven + gmaven-plugin + 1.0 + + + pre-clean + + execute + + + + def userAaiBaseImage = session.userProperties['aai.base.image']; + def userAaiCommonVersion = session.userProperties['aai.base.image.version']; + if (userAaiCommonVersion != null) { + project.properties['aai.base.image.version'] = userAaiCommonVersion; + } + if (userAaiBaseImage != null) { + project.properties['aai.base.image'] = userAaiBaseImage; + } + log.info 'Base image flavour: ' + project.properties['aai.base.image']; + log.info 'Base image version: ' + project.properties['aai.base.image.version']; + + + + + + + io.fabric8 + docker-maven-plugin + ${docker.fabric.version} + + true + 1.23 + + + ${docker.push.registry}/${aai.docker.namespace}/${project.artifactId}:%l + + + @ + + latest + ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest + ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-${maven.build.timestamp} + + try + ${project.basedir}/src/main/docker + + + + + ${aai.build.directory} + /${project.artifactId} + + + + + + + + + + + clean-images + pre-clean + + remove + + + true + + + + generate-images + package + + build + + + + push-images + deploy + + push + + + + + + + + + + + org.springframework.boot + spring-boot-starter-jetty + + + org.springframework.boot + spring-boot-starter-jersey + + + org.springframework.boot + spring-boot-starter-tomcat + + + + + org.onap.aai.logging-service + common-logging + ${common.logging.version} + + + ch.qos.logback + logback-classic + ${logback.version} + + + ch.qos.logback + logback-core + ${logback.version} + + + commons-codec + commons-codec + + + org.apache.commons + commons-compress + ${commons.compress.version} + + + org.apache.commons + commons-lang3 + + + javax.ws.rs + javax.ws.rs-api + ${javax.ws.rs.version} + + + org.codehaus.groovy + groovy + + + org.onap.sdc.sdc-tosca + sdc-tosca + ${sdc.tosca.version} + + + org.onap.aai + rest-client + ${aai.rest.client.version} + + + + + org.springframework.boot + spring-boot-starter-test + test + + + org.onap.sdc.sdc-distribution-client + sdc-distribution-client + ${sdc.distribution.client.version} + test + + + xmlunit + xmlunit + ${xmlunit.version} + test + + - - - org.springframework.boot - spring-boot-starter-test - test - - - org.onap.sdc.sdc-distribution-client - sdc-distribution-client - ${sdc.distribution.client.version} - test - - - xmlunit - xmlunit - ${xmlunit.version} - test - - - - - - - org.springframework.boot - spring-boot-maven-plugin - ${spring.boot.version} - - - -DCONFIG_HOME=./appconfig-local - -DAPP_HOME=. - -Dtosca.mappings.config=./appconfig-local/tosca-mappings.json - -DKEY_STORE_PASSWORD=${KEY_STORE_PASSWORD} - - - - - - repackage - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - unpack - initialize - - unpack - - - - - ${aai-schema.group.id} - aai-schema - ${aai-schema.version} - jar - ${aai.schema.source.folder}/aai_schema_v**.xsd - ${project.build.directory}/tmp - - - - - - - - org.apache.maven.plugins - maven-antrun-plugin - ${antrun.version} - - - Flatten XSDs - initialize - - run - - - - - - - - - - - - - - - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin - ${mvn.jaxb2.version} - - - process-sources - - generate - - - - - ${aai.schema.target.folder} - org.onap.aai.babel.xml.generator.xsd - ${project.build.directory}/generated-sources - - aai_schema_latest.xsd - - true - - -Xannotate - - - - org.jvnet.jaxb2_commons - jaxb2-basics-annotate - 0.6.4 - - - - org.jvnet.jaxb2_commons - jaxb2-annotate-plugin-test-annox-annotations - 1.0.0 - - - - - - exec-maven-plugin - org.codehaus.mojo - 1.5.0 - - - Get latest xsd version - generate-sources - - exec - - - ${basedir}/scripts - bash - get-latest-xsd-version.sh ${basedir} - - - - - - maven-assembly-plugin - - - src/main/assembly/descriptor.xml - - - - - make-assembly - package - - single - - - - - - com.mycila - license-maven-plugin - 3.0 - -
License.txt
- - src/main/java/** - src/test/java/** - pom.xml - - true -
- - - - - check - - validate - - -
- - org.apache.maven.plugins - maven-surefire-plugin - - false - 1 - - . - src/test/resources - - - - - org.apache.maven.plugins - maven-jar-plugin - 3.0.2 - - - package - - jar - - - client - - **/babel/service/data/* - - - - - - - org.apache.maven.plugins - maven-deploy-plugin - - client - - -
-
+ + + + org.springframework.boot + spring-boot-maven-plugin + ${spring.boot.version} + + + -DCONFIG_HOME=./appconfig-local + -DAPP_HOME=. + -Dtosca.mappings.config=./appconfig-local/tosca-mappings.json + -DKEY_STORE_PASSWORD=${KEY_STORE_PASSWORD} + + + + + + repackage + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + unpack + initialize + + unpack + + + + + ${aai-schema.group.id} + aai-schema + ${aai-schema.version} + jar + ${aai.schema.source.folder}/aai_schema_v**.xsd + ${project.build.directory}/tmp + + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + ${antrun.version} + + + Flatten XSDs + initialize + + run + + + + + + + + + + + + + + + org.jvnet.jaxb2.maven2 + maven-jaxb2-plugin + ${mvn.jaxb2.version} + + + process-sources + + generate + + + + + ${aai.schema.target.folder} + org.onap.aai.babel.xml.generator.xsd + ${project.build.directory}/generated-sources + + aai_schema_latest.xsd + + true + + -Xannotate + + + + org.jvnet.jaxb2_commons + jaxb2-basics-annotate + 0.6.4 + + + + org.jvnet.jaxb2_commons + jaxb2-annotate-plugin-test-annox-annotations + 1.0.0 + + + + + + exec-maven-plugin + org.codehaus.mojo + 1.5.0 + + + Get latest xsd version + generate-sources + + exec + + + ${basedir}/scripts + bash + get-latest-xsd-version.sh ${basedir} + + + + + + maven-assembly-plugin + + + src/main/assembly/descriptor.xml + + + + + make-assembly + package + + single + + + + + + com.mycila + license-maven-plugin + 3.0 + +
License.txt
+ + src/main/java/** + src/test/java/** + pom.xml + + true +
+ + + + + check + + validate + + +
+ + org.apache.maven.plugins + maven-surefire-plugin + + false + 1 + + . + src/test/resources + + + + + org.apache.maven.plugins + maven-jar-plugin + 3.0.2 + + + package + + jar + + + client + + **/babel/service/data/* + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + client + + + + org.jacoco + jacoco-maven-plugin + + + org/onap/aai/babel/xml/generator/xsd/* + + + + + default-check + + check + + + ${jacoco.report.directory}/jacoco-ut.exec + + + + BUNDLE + + + LINE + COVEREDRATIO + ${jacoco.line.coverage.limit} + + + + + + + + +
+
-- 2.16.6