summaryrefslogtreecommitdiffstats
path: root/ecomp-portal-widget-ms/widget-ms/pom.xml
diff options
context:
space:
mode:
authorChristopher Lott (cl778h) <clott@research.att.com>2017-10-04 14:14:36 -0400
committerChristopher Lott (cl778h) <clott@research.att.com>2017-10-04 15:53:41 -0400
commitb6079b39fc1193a32223933f7d93c08a63809689 (patch)
tree679384195495dfa64953d6f6aea253b58bfe78c9 /ecomp-portal-widget-ms/widget-ms/pom.xml
parent88c674e9f243ee7bfacfca847383ea01b482c1c1 (diff)
Repair widget-ms problem; adjust sonar in poms
Using OParent again; override some Sonar configuration and tasks. Repair display & fetch of users from remote apps. Use EPSDK version 1710 database scripts. Issue: PORTAL-50, PORTAL-59, PORTAL-86 Change-Id: I05eaea3680b0422236cc86cdd0ad5847c2731e54 Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>
Diffstat (limited to 'ecomp-portal-widget-ms/widget-ms/pom.xml')
-rw-r--r--ecomp-portal-widget-ms/widget-ms/pom.xml50
1 files changed, 44 insertions, 6 deletions
diff --git a/ecomp-portal-widget-ms/widget-ms/pom.xml b/ecomp-portal-widget-ms/widget-ms/pom.xml
index 08659cc7..67350d28 100644
--- a/ecomp-portal-widget-ms/widget-ms/pom.xml
+++ b/ecomp-portal-widget-ms/widget-ms/pom.xml
@@ -24,6 +24,8 @@
<java.version>1.8</java.version>
<hibernate.version>4.3.11.Final</hibernate.version>
<skipTests>true</skipTests>
+ <!-- Replicate this from OParent -->
+ <jacocoVersion>0.7.6.201602180812</jacocoVersion>
</properties>
<dependencies>
@@ -128,6 +130,13 @@
</exclusion>
</exclusions>
</dependency>
+ <!-- Jacoco offline instrumentation agent -->
+ <dependency>
+ <groupId>org.jacoco</groupId>
+ <artifactId>org.jacoco.agent</artifactId>
+ <version>${jacocoVersion}</version>
+ <classifier>runtime</classifier>
+ </dependency>
</dependencies>
<build>
@@ -150,6 +159,7 @@
<pluginManagement>
<plugins>
+ <!-- replicated from OParent -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
@@ -184,10 +194,28 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
- <version>0.7.6.201602180812</version>
+ <version>${jacocoVersion}</version>
<executions>
+ <!-- disable jacoco executions from oparent -->
+ <execution>
+ <id>pre-unit-test</id>
+ <phase>none</phase>
+ </execution>
+ <execution>
+ <id>post-unit-test</id>
+ <phase>none</phase>
+ </execution>
+ <execution>
+ <id>pre-integration-test</id>
+ <phase>none</phase>
+ </execution>
<execution>
- <id>prepare-agent</id>
+ <id>post-integration-test</id>
+ <phase>none</phase>
+ </execution>
+ <!-- Order matters -->
+ <execution>
+ <id>portal-prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
@@ -195,21 +223,22 @@
<destFile>${sonar.jacoco.reportPath}</destFile>
</configuration>
</execution>
+ <!-- offline instrumentation for PowerMock -->
<execution>
- <id>default-instrument</id>
+ <id>portal-offline-instrument</id>
<goals>
<goal>instrument</goal>
</goals>
</execution>
<execution>
- <id>default-restore-instrumented-classes</id>
+ <id>portal-restore-instrumented-classes</id>
<phase>test</phase>
<goals>
<goal>restore-instrumented-classes</goal>
</goals>
</execution>
<execution>
- <id>post-unit-test</id>
+ <id>portal-post-unit-test</id>
<phase>test</phase>
<goals>
<goal>report</goal>
@@ -219,9 +248,18 @@
<outputDirectory>${project.basedir}/target/site/jacoco</outputDirectory>
</configuration>
</execution>
-
</executions>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+ <jacoco-agent.destfile>${project.build.directory}/code-coverage/jacoco-ut.exec</jacoco-agent.destfile>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
</plugins>
</build>