Maven: Add jacoco plugin and adjust to apply argLine correctly when calling "mvn...

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1776068 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/sonar/main/pom.xml b/sonar/main/pom.xml
index 7a9da5ae09110868344356760a02f2b957acf1df..f3e05f2f2a395f80ef094991826f67e2bf923dd2 100644 (file)
--- a/sonar/main/pom.xml
+++ b/sonar/main/pom.xml
@@ -103,7 +103,7 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>${maven.plugin.surefire.version}</version>
                 <configuration>
-                    <argLine>-Duser.language=en -Duser.country=US -Xmx1024m -XX:MaxPermSize=256m -XX:-OmitStackTraceInFastThrow</argLine>
+                    <argLine>@{argLine} -Duser.language=en -Duser.country=US -Xmx1024m -XX:MaxPermSize=256m -XX:-OmitStackTraceInFastThrow</argLine>
                 </configuration>
             </plugin>
                </plugins>

diff --git a/sonar/ooxml/pom.xml b/sonar/ooxml/pom.xml
index e7ffcc2d11fd13ecc720fe932adfdcabe2e05b72..c5f0adaf02fa55742092d7b8e5995d02e76488ce 100644 (file)
--- a/sonar/ooxml/pom.xml
+++ b/sonar/ooxml/pom.xml
@@ -93,7 +93,7 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>${maven.plugin.surefire.version}</version>
                 <configuration>
-                    <argLine>-Duser.language=en -Duser.country=US -Xmx1024m -XX:MaxPermSize=256m -XX:-OmitStackTraceInFastThrow</argLine>
+                    <argLine>@{argLine} -Duser.language=en -Duser.country=US -Xmx1024m -XX:MaxPermSize=256m -XX:-OmitStackTraceInFastThrow</argLine>
                 </configuration>
             </plugin>
                </plugins>

diff --git a/sonar/pom.xml b/sonar/pom.xml
index 5be832f140493a15f65c0b6aa6e8962992f60f6b..a1a0da1201a04e521cdeabb1c87e4b80ff232202 100644 (file)
--- a/sonar/pom.xml
+++ b/sonar/pom.xml
@@ -106,7 +106,7 @@
                                                <org.apache.poi.util.POILogger>org.apache.poi.util.NullLogger</org.apache.poi.util.POILogger>
                                        </systemPropertyVariables>
                                        <!-- use to following to analyze OOM issues:    -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp -->
-                                       <argLine>-Duser.language=en -Duser.country=US -Xmx1024m</argLine>
+                                       <argLine>@{argLine} -Duser.language=en -Duser.country=US -Xmx1024m</argLine>
                                        <excludes>
                                                <exclude>**/All*Tests.java</exclude>
                                                <exclude>**/TestUnfixedBugs.java</exclude>
@@ -121,6 +121,11 @@
                                <threadCount>10</threadCount-->
                                </configuration>
                        </plugin>
+                       <plugin>
+                               <groupId>org.jacoco</groupId>
+                               <artifactId>jacoco-maven-plugin</artifactId>
+                               <version>0.7.8</version>
+                       </plugin>
                </plugins>
        </build>
        
@@ -151,7 +156,7 @@
                        </activation>
                        <properties>
                                <maven.compiler.maxmem>512m</maven.compiler.maxmem>
-                <argLine>-Xmx768m -XX:MaxPermSize=128m @{argLine}</argLine>
+                <argLine>-Xmx768m -XX:MaxPermSize=128m</argLine>
                        </properties>
                </profile>
                
@@ -165,7 +170,7 @@
                        </activation>
                        <properties>
                                <maven.compiler.maxmem>768m</maven.compiler.maxmem>
-                <argLine>-Xmx1024m -XX:MaxPermSize=256m @{argLine}</argLine>
+                <argLine>-Xmx1024m -XX:MaxPermSize=256m</argLine>
                        </properties>
                </profile>