diff options
| -rw-r--r-- | dcae-analytics/dcae-analytics-tca-web/pom.xml | 38 | ||||
| -rw-r--r-- | dcae-analytics/pom.xml | 9 | ||||
| -rw-r--r-- | eelf-logger/pom.xml | 4 |
3 files changed, 35 insertions, 16 deletions
diff --git a/dcae-analytics/dcae-analytics-tca-web/pom.xml b/dcae-analytics/dcae-analytics-tca-web/pom.xml index 5cdfa4a..c9cd80c 100644 --- a/dcae-analytics/dcae-analytics-tca-web/pom.xml +++ b/dcae-analytics/dcae-analytics-tca-web/pom.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- ~ ================================================================================ - ~ Copyright (c) 2018-2019 AT&T Intellectual Property. All rights reserved. + ~ Copyright (c) 2018-2020 AT&T Intellectual Property. All rights reserved. ~ ================================================================================ ~ Modifications Copyright (C) 2019 IBM ~ ================================================================================ @@ -42,6 +42,7 @@ <properties> <main.basedir>${project.parent.basedir}</main.basedir> <docker.image.name>onap/${project.groupId}.${project.artifactId}</docker.image.name> + <maven.build.timestamp.format>yyyyMMdd'T'HHmmss</maven.build.timestamp.format> </properties> <dependencies> @@ -160,11 +161,6 @@ <configuration> <contextDirectory>${project.basedir}</contextDirectory> <repository>${docker.repository}/${docker.image.name}</repository> - <imageTags> - <tag>${project.version}</tag> - <tag>latest</tag> - <tag>${project.version}-${maven.build.timestamp}Z</tag> - </imageTags> <useMavenSettingsForAuth>true</useMavenSettingsForAuth> <buildArgs> <PROJECT_BUILD_DIR_NAME>target</PROJECT_BUILD_DIR_NAME> @@ -174,16 +170,36 @@ </buildArgs> </configuration> <executions> - <execution> - <id>default</id> + <execution> + <id>build-image</id> + <phase>install</phase> + <goals> + <goal>build</goal> + </goals> + </execution> + <execution> + <id>tag-version</id> <phase>install</phase> <goals> - <goal>build</goal> + <goal>tag</goal> <goal>push</goal> </goals> - </execution> + <configuration> + <tag>${project.version}</tag> + </configuration> + </execution> + <execution> + <id>tag-version-ts</id> + <phase>install</phase> + <goals> + <goal>tag</goal> + <goal>push</goal> + </goals> + <configuration> + <tag>${project.version}-${maven.build.timestamp}Z</tag> + </configuration> + </execution> </executions> - </plugin> </plugins> </build> diff --git a/dcae-analytics/pom.xml b/dcae-analytics/pom.xml index a970b7f..c9d4f62 100644 --- a/dcae-analytics/pom.xml +++ b/dcae-analytics/pom.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- ~ ================================================================================ - ~ Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. + ~ Copyright (c) 2018-2020 AT&T Intellectual Property. 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. @@ -81,6 +81,8 @@ <maven-source-plugin.version>3.0.1</maven-source-plugin.version> <maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version> <jacoco.plugin.version>0.8.1</jacoco.plugin.version> + <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml + </sonar.coverage.jacoco.xmlReportPaths> <findbugs.plugin.version>3.0.5</findbugs.plugin.version> <pmd.plugin.version>3.8</pmd.plugin.version> <checkstyle.plugin.version>2.17</checkstyle.plugin.version> @@ -507,6 +509,7 @@ <id>validate</id> <phase>validate</phase> <configuration> + <skip>true</skip> <configLocation>${checkstyle.file.name}</configLocation> <suppressionsLocation>${checkstyle.suppression.file.name}</suppressionsLocation> <encoding>UTF-8</encoding> @@ -705,10 +708,10 @@ <artifactId>findbugs-maven-plugin</artifactId> </plugin> - <plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> - </plugin> + </plugin> <plugin> <groupId>org.jacoco</groupId> diff --git a/eelf-logger/pom.xml b/eelf-logger/pom.xml index 8dac573..7424c99 100644 --- a/eelf-logger/pom.xml +++ b/eelf-logger/pom.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- ~ ================================================================================ - ~ Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. + ~ Copyright (c) 2018-2020 AT&T Intellectual Property. 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. @@ -88,6 +88,7 @@ <skip.integration.tests>true</skip.integration.tests> <pmd.violation.buildfail>true</pmd.violation.buildfail> <findbugs.failOnError>true</findbugs.failOnError> + <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths> </properties> @@ -438,7 +439,6 @@ <artifactId>maven-deploy-plugin</artifactId> </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> |