diff options
| -rw-r--r-- | mod/bpgenerator/coverage/pom.xml | 80 | ||||
| -rw-r--r-- | mod/bpgenerator/lombok.config | 2 | ||||
| -rw-r--r-- | mod/bpgenerator/pom.xml | 344 |
3 files changed, 255 insertions, 171 deletions
diff --git a/mod/bpgenerator/coverage/pom.xml b/mod/bpgenerator/coverage/pom.xml new file mode 100644 index 0000000..b831b8e --- /dev/null +++ b/mod/bpgenerator/coverage/pom.xml @@ -0,0 +1,80 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +============LICENSE_START======================================================= +Copyright (c) 2021 Nokia. All rights reserved. +================================================================================ +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +============LICENSE_END========================================================= +--> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <parent> + <artifactId>blueprint-generator</artifactId> + <groupId>org.onap.dcaegen2.platform.mod</groupId> + <version>1.7.3-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + + <artifactId>coverage</artifactId> + + <name>Coverage</name> + <description>This module is used to generate aggregated coverage report</description> + + <properties> + <maven.deploy.skip>true</maven.deploy.skip> + </properties> + + <dependencies> + <dependency> + <groupId>org.onap.dcaegen2.platform.mod</groupId> + <artifactId>blueprint-generator-common</artifactId> + <version>1.7.3-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.onap.dcaegen2.platform.mod</groupId> + <artifactId>blueprint-generator-onap</artifactId> + <version>1.7.3-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.onap.dcaegen2.platform.mod</groupId> + <artifactId>blueprint-generator-onap-executable</artifactId> + <version>1.7.3-SNAPSHOT</version> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.jacoco</groupId> + <artifactId>jacoco-maven-plugin</artifactId> + <executions> + <execution> + <phase>verify</phase> + <id>report</id> + <goals> + <goal>report-aggregate</goal> + </goals> + <configuration> + <dataFileIncludes> + <dataFileInclude>**/jacoco-ut.exec</dataFileInclude> + <dataFileInclude>**/jacoco-it.exec</dataFileInclude> + </dataFileIncludes> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + +</project> diff --git a/mod/bpgenerator/lombok.config b/mod/bpgenerator/lombok.config new file mode 100644 index 0000000..df71bb6 --- /dev/null +++ b/mod/bpgenerator/lombok.config @@ -0,0 +1,2 @@ +config.stopBubbling = true +lombok.addLombokGeneratedAnnotation = true diff --git a/mod/bpgenerator/pom.xml b/mod/bpgenerator/pom.xml index dd157d9..179a57b 100644 --- a/mod/bpgenerator/pom.xml +++ b/mod/bpgenerator/pom.xml @@ -5,7 +5,7 @@ ~ * org.onap.dcae ~ * ================================================================================ ~ * Copyright (c) 2020 AT&T Intellectual Property. All rights reserved. - ~ * Copyright (c) 2020 Nokia. All rights reserved. + ~ * Copyright (c) 2020-2021 Nokia. All rights reserved. ~ * ================================================================================ ~ * Licensed under the Apache License, Version 2.0 (the "License"); ~ * you may not use this file except in compliance with the License. @@ -24,183 +24,185 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> - <groupId>org.onap.dcaegen2.platform.mod</groupId> - <artifactId>blueprint-generator</artifactId> - <version>1.7.3-SNAPSHOT</version> - <packaging>pom</packaging> + <groupId>org.onap.dcaegen2.platform.mod</groupId> + <artifactId>blueprint-generator</artifactId> + <version>1.7.3-SNAPSHOT</version> + <packaging>pom</packaging> - <modules> - <module>common</module> - <module>onap</module> - <module>onap-executable</module> - </modules> + <modules> + <module>common</module> + <module>onap</module> + <module>onap-executable</module> + <module>coverage</module> + </modules> - <name>BlueprintGenerator</name> - <description>This is Parent Module used by DCAE and ONAP to generate Blueprints</description> + <name>BlueprintGenerator</name> + <description>This is Parent Module used by DCAE and ONAP to generate Blueprints</description> - <parent> - <groupId>org.onap.oparent</groupId> - <artifactId>oparent</artifactId> - <version>2.0.0</version> - <relativePath/> - </parent> + <parent> + <groupId>org.onap.oparent</groupId> + <artifactId>oparent</artifactId> + <version>2.0.0</version> + <relativePath/> + </parent> - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <java.version>11</java.version> - <maven.compiler.source>${java.version}</maven.compiler.source> - <maven.compiler.target>${java.version}</maven.compiler.target> - <spring-boot.version>2.2.9.RELEASE</spring-boot.version> - <jackson.version>2.9.7</jackson.version> - <lombok.version>1.18.10</lombok.version> - <gson.version>2.8.6</gson.version> - <commons.io.version>2.6</commons.io.version> - <commons.cli.version>1.4</commons.cli.version> - <maven.surefireplugin.version>2.22.2</maven.surefireplugin.version> - <maven.compilerplugin.version>3.8.1</maven.compilerplugin.version> - <dockerfile-maven-plugin.version>1.4.10</dockerfile-maven-plugin.version> - <docker.image.name>onap/${project.groupId}.${project.artifactId}</docker.image.name> - <sonar.maven.plugin>3.0.2</sonar.maven.plugin> - <sonar.junit.reportsPath>${project.basedir}/target/surefire-reports - </sonar.junit.reportsPath> - <sonar.surefire.reportsPath>${project.basedir}/target/surefire-reports - </sonar.surefire.reportsPath> - <sonar.coverage.jacoco.xmlReportPaths>${project.basedir}/target/site/jacoco-ut/jacoco.xml - </sonar.coverage.jacoco.xmlReportPaths> - </properties> + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> + <java.version>11</java.version> + <maven.compiler.source>${java.version}</maven.compiler.source> + <maven.compiler.target>${java.version}</maven.compiler.target> + <spring-boot.version>2.2.9.RELEASE</spring-boot.version> + <jackson.version>2.9.7</jackson.version> + <lombok.version>1.18.10</lombok.version> + <gson.version>2.8.6</gson.version> + <commons.io.version>2.6</commons.io.version> + <commons.cli.version>1.4</commons.cli.version> + <maven.surefireplugin.version>2.22.2</maven.surefireplugin.version> + <maven.compilerplugin.version>3.8.1</maven.compilerplugin.version> + <dockerfile-maven-plugin.version>1.4.10</dockerfile-maven-plugin.version> + <docker.image.name>onap/${project.groupId}.${project.artifactId}</docker.image.name> + <sonar.maven.plugin>3.0.2</sonar.maven.plugin> + <sonar.junit.reportsPath>${project.basedir}/target/surefire-reports + </sonar.junit.reportsPath> + <sonar.surefire.reportsPath>${project.basedir}/target/surefire-reports + </sonar.surefire.reportsPath> + <sonar.coverage.exclusions>coverage/**</sonar.coverage.exclusions> + <sonar.coverage.jacoco.xmlReportPaths>${project.basedir}/../coverage/target/site/jacoco-aggregate/jacoco.xml + </sonar.coverage.jacoco.xmlReportPaths> + </properties> - <dependencies> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-context</artifactId> - <version>5.2.0.RELEASE</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-core</artifactId> - <version>5.2.0.RELEASE</version> - </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter</artifactId> - <version>2.2.5.RELEASE</version> - </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-test</artifactId> - <version>2.2.5.RELEASE</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-validation</artifactId> - <version>2.2.5.RELEASE</version> - </dependency> - <dependency> - <groupId>org.projectlombok</groupId> - <artifactId>lombok</artifactId> - <version>${lombok.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> - <version>${gson.version}</version> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.dataformat</groupId> - <artifactId>jackson-dataformat-yaml</artifactId> - <version>${jackson.version}</version> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.12</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <version>3.1.0</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>info.picocli</groupId> - <artifactId>picocli</artifactId> - <version>3.9.6</version> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-databind</artifactId> - <version>${jackson.version}</version> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-annotations</artifactId> - <version>${jackson.version}</version> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>${commons.io.version}</version> - </dependency> - <dependency> - <groupId>commons-cli</groupId> - <artifactId>commons-cli</artifactId> - <version>${commons.cli.version}</version> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-model</artifactId> - <version>3.3.9</version> - </dependency> - </dependencies> + <dependencies> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + <version>5.2.0.RELEASE</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + <version>5.2.0.RELEASE</version> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter</artifactId> + <version>2.2.5.RELEASE</version> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-test</artifactId> + <version>2.2.5.RELEASE</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-validation</artifactId> + <version>2.2.5.RELEASE</version> + </dependency> + <dependency> + <groupId>org.projectlombok</groupId> + <artifactId>lombok</artifactId> + <version>${lombok.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + <version>${gson.version}</version> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.dataformat</groupId> + <artifactId>jackson-dataformat-yaml</artifactId> + <version>${jackson.version}</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.12</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>3.1.0</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>info.picocli</groupId> + <artifactId>picocli</artifactId> + <version>3.9.6</version> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + <version>${jackson.version}</version> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-annotations</artifactId> + <version>${jackson.version}</version> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>${commons.io.version}</version> + </dependency> + <dependency> + <groupId>commons-cli</groupId> + <artifactId>commons-cli</artifactId> + <version>${commons.cli.version}</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-model</artifactId> + <version>3.3.9</version> + </dependency> + </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.10.2</version> - <configuration> - <additionalparam>-Xdoclint:all</additionalparam> - <additionalparam>-Xlint:all</additionalparam> - </configuration> - </plugin> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.10.2</version> + <configuration> + <additionalparam>-Xdoclint:all</additionalparam> + <additionalparam>-Xlint:all</additionalparam> + </configuration> + </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-report-plugin</artifactId> - <version>2.6</version> - <executions> - <execution> - <phase>test</phase> - <goals> - <goal>report</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>${maven.compilerplugin.version}</version> - <configuration> - <source>${maven.compiler.source}</source> - <target>${maven.compiler.target}</target> - </configuration> - </plugin> - <plugin> - <groupId>org.sonarsource.scanner.maven</groupId> - <artifactId>sonar-maven-plugin</artifactId> - <version>${sonar.maven.plugin}</version> - </plugin> - </plugins> - </build> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-report-plugin</artifactId> + <version>2.6</version> + <executions> + <execution> + <phase>test</phase> + <goals> + <goal>report</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>${maven.compilerplugin.version}</version> + <configuration> + <source>${maven.compiler.source}</source> + <target>${maven.compiler.target}</target> + </configuration> + </plugin> + <plugin> + <groupId>org.sonarsource.scanner.maven</groupId> + <artifactId>sonar-maven-plugin</artifactId> + <version>${sonar.maven.plugin}</version> + </plugin> + </plugins> + </build> </project> |