diff options
| author |   Filip Krzywka <filip.krzywka@nokia.com> | 2018-08-10 08:26:42 +0200 |
|---|---|---|
| committer |   Piotr Jaszczyk <piotr.jaszczyk@nokia.com> | 2018-08-13 13:06:32 +0200 |
| commit | 88726d99b07a91495b800d6155d796c634560882 (patch) | |
| tree | 509391679fda028ec4cfff7a97fd700d6d5791a6 /pom.xml | |
| parent | 3b74e64f62587ef7c30d7520ed85ab35378f733c (diff) | |
Link project as ONAP oparent module child
- Downgraded checkstyle-plugin version to not break build - oparent
uses deprecated config property that cannot be overriden... Also it
uses plugin version from 2014...
- Moved jacoco plugin definition for similiar reasons.
- Bumped maven-surefire-plugin.
- Also added missing license in file. Not sure why CI did not catch
that one earlier
- removed nexus properties that should be inherited from onap
`version` artifact (parent of oparent)
- Use upgraded maven-failsafe-plugin - works with java 8, not sure
about Java 9+
Change-Id: I47e441315cc0e1dc49ed474450db0ee3d2701a10
Issue-ID: DCAEGEN2-700
Signed-off-by: Filip Krzywka <filip.krzywka@nokia.com>
Signed-off-by: Piotr Jaszczyk <piotr.jaszczyk@nokia.com>
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 308 |
1 files changed, 139 insertions, 169 deletions
@@ -30,6 +30,13 @@ </license> </licenses> + <parent> + <groupId>org.onap.oparent</groupId> + <artifactId>oparent</artifactId> + <version>0.1.1</version> + <relativePath/> + </parent> + <groupId>org.onap.dcaegen2.collectors.veshv</groupId> <artifactId>ves-hv-collector</artifactId> <version>1.0.0-SNAPSHOT</version> @@ -68,20 +75,18 @@ <junit-platform.version>1.2.0-RC1</junit-platform.version> <junit-jupiter.version>5.2.0-RC1</junit-jupiter.version> <spek.version>1.1.5</spek.version> - <maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version> - <failIfMissingUnitTests>true</failIfMissingUnitTests> + <maven-surefire-plugin.version>2.22.0</maven-surefire-plugin.version> + <failIfMissingUnitTests>false</failIfMissingUnitTests> <failIfMissingComponentTests>false</failIfMissingComponentTests> <skipAnalysis>true</skipAnalysis> <!-- Docker --> <skipDocker>false</skipDocker> - <onap.nexus.dockerregistry.daily>nexus3.onap.org:10003</onap.nexus.dockerregistry.daily> - <onap.nexus.dockerregistry.release>nexus3.onap.org:10002</onap.nexus.dockerregistry.release> <docker-image.registry>${onap.nexus.dockerregistry.daily}</docker-image.registry> <docker-image.namespace>onap</docker-image.namespace> - <docker-image.name>ves-hv-collector/${project.artifactId}</docker-image.name> - <docker.http_proxy> </docker.http_proxy> - <docker.https_proxy> </docker.https_proxy> + <docker-image.name>${project.groupId}.${project.artifactId}</docker-image.name> + <docker.http_proxy></docker.http_proxy> + <docker.https_proxy></docker.https_proxy> </properties> @@ -196,36 +201,44 @@ <artifactId>maven-surefire-plugin</artifactId> <groupId>org.apache.maven.plugins</groupId> <version>${maven-surefire-plugin.version}</version> - <executions> - <execution> - <id>default-test</id> - <goals> - <goal>test</goal> - </goals> - <configuration> - <failIfNoTests>${failIfMissingUnitTests}</failIfNoTests> - <forkCount>1</forkCount> - <includes> - <include>**/*Test.*</include> - </includes> - <!--<argLine>--add-modules org.junit.jupiter.api,reactor.test,assertj.core</argLine>--> - </configuration> - </execution> - <execution> - <id>component-tests</id> - <phase>verify</phase> - <goals> - <goal>test</goal> - </goals> - <configuration> - <failIfNoTests>${failIfMissingComponentTests}</failIfNoTests> - <forkCount>1</forkCount> - <includes> - <include>**/*Specification.*</include> - </includes> - </configuration> - </execution> - </executions> + <configuration> + <failIfNoTests>${failIfMissingUnitTests}</failIfNoTests> + <forkCount>1</forkCount> + <includes> + <include>**/*Test.*</include> + </includes> + </configuration> + <dependencies> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>3.7</version> + </dependency> + <dependency> + <groupId>org.junit.platform</groupId> + <artifactId>junit-platform-surefire-provider</artifactId> + <version>${junit-platform.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.jetbrains.spek</groupId> + <artifactId>spek-junit-platform-engine</artifactId> + <version>${spek.version}</version> + <scope>runtime</scope> + </dependency> + </dependencies> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-failsafe-plugin</artifactId> + <version>2.22.0</version> + <configuration> + <failIfNoTests>${failIfMissingComponentTests}</failIfNoTests> + <forkCount>1</forkCount> + <includes> + <include>**/*Specification.*</include> + </includes> + </configuration> <dependencies> <dependency> <groupId>org.apache.commons</groupId> @@ -248,6 +261,88 @@ </plugin> </plugins> </pluginManagement> + <plugins> + <plugin> + <artifactId>maven-checkstyle-plugin</artifactId> + <version>2.17</version> + <dependencies> + <dependency> + <groupId>org.onap.oparent</groupId> + <artifactId>checkstyle</artifactId> + <version>1.1.1</version> + </dependency> + </dependencies> + <executions> + <execution> + <!-- To override oparent configuration different id must be used + We need to override it to include .kt files in check. --> + <id>check-license-kotlin</id> + <goals> + <goal>check</goal> + </goals> + <phase>process-sources</phase> + <configuration> + <configLocation>onap-checkstyle/check-license.xml</configLocation> + <includeResources>false</includeResources> + <includeTestSourceDirectory>true</includeTestSourceDirectory> + <includeTestResources>false</includeTestResources> + <includes>**\/*.kt</includes> + <consoleOutput>true</consoleOutput> + <!--<failOnViolation>false</failOnViolation>--> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.8</version> + <executions> + <execution> + <!-- This can be run separately with mvn antrun:run@detekt --> + <id>detekt</id> + <phase>verify</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <target name="detekt" unless="${skipAnalysis}"> + <java taskname="detekt" dir="${basedir}" + fork="true" + failonerror="true" + classname="io.gitlab.arturbosch.detekt.cli.Main" + classpathref="maven.plugin.classpath"> + <arg value="--input"/> + <arg value="${basedir}/src/main/kotlin"/> + <arg value="--config-resource"/> + <arg value="onap-detekt-config.yml"/> + <arg value="--filters"/> + <arg value=".*/target/.*,.*/resources/.*"/> + <arg value="--output"/> + <arg value="${basedir}/target/reports"/> + <arg value="--output-name"/> + <arg value="detekt-report"/> + <arg value="--baseline"/> + <arg value="${basedir}/target/reports/baseline.xml"/> + </java> + </target> + </configuration> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>io.gitlab.arturbosch.detekt</groupId> + <artifactId>detekt-cli</artifactId> + <version>1.0.0.RC7</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>hv-collector-analysis</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + </plugin> + </plugins> <extensions> <extension> <groupId>kr.motd.maven</groupId> @@ -259,121 +354,6 @@ <profiles> <profile> - <id>analysis</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.jacoco</groupId> - <artifactId>jacoco-maven-plugin</artifactId> - <version>0.8.1</version> - <executions> - <execution> - <id>default-prepare-agent</id> - <goals> - <goal>prepare-agent</goal> - </goals> - </execution> - <execution> - <id>default-prepare-agent-integration</id> - <goals> - <goal>prepare-agent-integration</goal> - </goals> - </execution> - </executions> - <configuration> - <excludes> - <!-- Exclute Protobuf-generated classes --> - <exclude>org/onap/ves/*</exclude> - </excludes> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <version>1.8</version> - <executions> - <execution> - <!-- This can be run separately with mvn antrun:run@detekt --> - <id>detekt</id> - <phase>verify</phase> - <configuration> - <target name="detekt" unless="${skipAnalysis}"> - <java taskname="detekt" dir="${basedir}" - fork="true" - failonerror="true" - classname="io.gitlab.arturbosch.detekt.cli.Main" - classpathref="maven.plugin.classpath"> - <arg value="--input"/> - <arg value="${basedir}/src/main/kotlin"/> - <arg value="--config-resource"/> - <arg value="onap-detekt-config.yml"/> - <arg value="--filters"/> - <arg value=".*/target/.*,.*/resources/.*"/> - <arg value="--output"/> - <arg value="${basedir}/target/reports"/> - <arg value="--output-name"/> - <arg value="detekt-report"/> - <arg value="--baseline"/> - <arg value="${basedir}/target/reports/baseline.xml"/> - </java> - </target> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>io.gitlab.arturbosch.detekt</groupId> - <artifactId>detekt-cli</artifactId> - <version>1.0.0.RC7</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>hv-collector-analysis</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - </plugin> - - <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - <version>3.0.0</version> - <dependencies> - <dependency> - <groupId>org.onap.oparent</groupId> - <artifactId>checkstyle</artifactId> - <version>1.1.1</version> - </dependency> - </dependencies> - <executions> - <execution> - <id>onap-license</id> - <goals> - <goal>check</goal> - </goals> - <phase>process-sources</phase> - <configuration> - <configLocation>onap-checkstyle/check-license.xml</configLocation> - <includeResources>false</includeResources> - <includeTestSourceDirectory>true</includeTestSourceDirectory> - <includeTestResources>false</includeTestResources> - <includes>**\/*.kt</includes> - <consoleOutput>true</consoleOutput> - <!--<failOnViolation>false</failOnViolation>--> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - <profile> <id>docker</id> <activation> <property> @@ -445,7 +425,13 @@ <images> <image> <alias>${project.artifactId}</alias> - <name>${docker-image.registry}/${docker-image.namespace}/${docker-image.name}</name> + <name>${docker-image.registry}/${docker-image.namespace}/${docker-image.name} + </name> + <tags> + <tag>${project.version}-SNAPSHOT-${maven.build.timestamp}Z</tag> + <tag>${project.version}</tag> + <tag>latest</tag> + </tags> <build> <!-- <args> @@ -465,22 +451,6 @@ </profile> </profiles> - <reporting> - <plugins> - <plugin> - <groupId>org.jacoco</groupId> - <artifactId>jacoco-maven-plugin</artifactId> - <reportSets> - <reportSet> - <reports> - <report>report</report> - </reports> - </reportSet> - </reportSets> - </plugin> - </plugins> - </reporting> - <pluginRepositories> <pluginRepository> <id>40_openecomp-release</id> |