diff options
| author |   Christopher Lott (cl778h) <clott@research.att.com> | 2017-10-04 08:32:30 -0400 |
|---|---|---|
| committer | Christopher Lott (cl778h) <clott@research.att.com> | 2017-10-04 08:33:33 -0400 |
| commit | 88c674e9f243ee7bfacfca847383ea01b482c1c1 (patch) | |
| tree | 86b9bcc94f5a27828a62a329886d0a9d0c4ff6b5 /ecomp-portal-widget-ms | |
| parent | b415db2e304f285c620e6084d29eda66988fd625 (diff) | |
Repair aspect logger; repair site deploy
[PORTAL-54] Javadoc site deployment fails on widget-ms module
[PORTAL-116] WidgetCatalog request takes exception before reaching controller method
Issue: PORTAL-54, PORTAL-116
Change-Id: Id6d223a30a8c5f493c3fa1902225bc4e8964d085
Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>
Diffstat (limited to 'ecomp-portal-widget-ms')
| -rw-r--r-- | ecomp-portal-widget-ms/widget-ms/pom.xml | 86 |
1 files changed, 76 insertions, 10 deletions
diff --git a/ecomp-portal-widget-ms/widget-ms/pom.xml b/ecomp-portal-widget-ms/widget-ms/pom.xml index da6eb99d..08659cc7 100644 --- a/ecomp-portal-widget-ms/widget-ms/pom.xml +++ b/ecomp-portal-widget-ms/widget-ms/pom.xml @@ -3,7 +3,7 @@ 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> - <!-- This project must name Spring as parent; cannot name Portal --> + <!-- This project must name Spring as parent; cannot name Portal --> <parent> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-parent</artifactId> @@ -135,18 +135,35 @@ <finalName>${project.artifactId}</finalName> <!-- To add resources, must name all including usual src/main/resources --> - <resources> + <resources> <resource> <directory>src/main/resources</directory> <filtering>true</filtering> </resource> - <resource> - <directory>../common-widgets/target</directory> - <includes> - <include>**/*.zip</include> - </includes> - </resource> - </resources> + <resource> + <directory>../common-widgets/target</directory> + <includes> + <include>**/*.zip</include> + </includes> + </resource> + </resources> + + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-site-plugin</artifactId> + <version>3.6</version> + <dependencies> + <dependency> + <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-webdav-jackrabbit</artifactId> + <version>2.10</version> + </dependency> + </dependencies> + </plugin> + </plugins> + </pluginManagement> <plugins> @@ -159,13 +176,62 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-deploy-plugin</artifactId> - <version>2.8</version> + <!-- version set by spring <version>2.8</version> --> <configuration> <skip>true</skip> </configuration> </plugin> + <plugin> + <groupId>org.jacoco</groupId> + <artifactId>jacoco-maven-plugin</artifactId> + <version>0.7.6.201602180812</version> + <executions> + <execution> + <id>prepare-agent</id> + <goals> + <goal>prepare-agent</goal> + </goals> + <configuration> + <destFile>${sonar.jacoco.reportPath}</destFile> + </configuration> + </execution> + <execution> + <id>default-instrument</id> + <goals> + <goal>instrument</goal> + </goals> + </execution> + <execution> + <id>default-restore-instrumented-classes</id> + <phase>test</phase> + <goals> + <goal>restore-instrumented-classes</goal> + </goals> + </execution> + <execution> + <id>post-unit-test</id> + <phase>test</phase> + <goals> + <goal>report</goal> + </goals> + <configuration> + <dataFile>${sonar.jacoco.reportPath}</dataFile> + <outputDirectory>${project.basedir}/target/site/jacoco</outputDirectory> + </configuration> + </execution> + + </executions> + </plugin> </plugins> </build> + <!-- This POM cannot inherit from OParent --> + <distributionManagement> + <site> + <id>ecomp-site</id> + <url>dav:https://nexus.onap.org/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</url> + </site> + </distributionManagement> + </project> |