You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2015/10/14 22:39:41 UTC
[2/4] hbase git commit: HBASE-14586 Use a maven profile to run Jacoco
analysis (Andrew Wang)
HBASE-14586 Use a maven profile to run Jacoco analysis (Andrew Wang)
Conflicts:
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/bfacefb8
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/bfacefb8
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/bfacefb8
Branch: refs/heads/branch-1.1
Commit: bfacefb84b3bd82ee189d00635f62feeef020466
Parents: 294ae74
Author: Andrew Purtell <ap...@apache.org>
Authored: Wed Oct 14 12:22:27 2015 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Wed Oct 14 13:39:24 2015 -0700
----------------------------------------------------------------------
pom.xml | 96 ++++++++++++++++++++++++++++--------------------------------
1 file changed, 44 insertions(+), 52 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/bfacefb8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9a2677f..c0d96e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -514,11 +514,8 @@
<reuseForks>false</reuseForks>
<testFailureIgnore>${surefire.testFailureIgnore}</testFailureIgnore>
<forkedProcessTimeoutInSeconds>${surefire.timeout}</forkedProcessTimeoutInSeconds>
- <!--Allocate some direct memory for direct memory tests-->
- <argLine>${hbase-surefire.argLine} ${argLine}</argLine>
<redirectTestOutputToFile>${test.output.tofile}</redirectTestOutputToFile>
<systemPropertyVariables>
- <jacoco-agent.destfile>target/jacoco.exec</jacoco-agent.destfile>
<test.build.classes>${test.build.classes}</test.build.classes>
</systemPropertyVariables>
@@ -1086,32 +1083,6 @@
</executions>
</plugin>
<plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- <version>${jacoco.version}</version>
- <executions>
- <execution>
- <id>prepare-agent</id>
- <goals>
- <goal>prepare-agent</goal>
- </goals>
- </execution>
- <execution>
- <id>report</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>report</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <skip>${hbase.skip-jacoco}</skip>
- <excludes>
- <exclude>**/generated/**/*.class</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
<executions>
@@ -1245,12 +1216,13 @@
-XX:MaxPermSize=256m -Djava.security.egd=file:/dev/./urandom -Djava.net.preferIPv4Stack=true
-Djava.awt.headless=true
</hbase-surefire.argLine>
- <hbase-surefire.cygwin-argline>-enableassertions -Xmx${surefire.cygwinXmx} -XX:MaxPermSize=256m
+ <hbase-surefire.cygwin-argLine>-enableassertions -Xmx${surefire.cygwinXmx} -XX:MaxPermSize=256m
-Djava.security.egd=file:/dev/./urandom -Djava.net.preferIPv4Stack=true
"-Djava.library.path=${hadoop.library.path};${java.library.path}"
- </hbase-surefire.cygwin-argline>
- <hbase.skip-jacoco>true</hbase.skip-jacoco>
- <jacoco.version>0.6.2.201302030002</jacoco.version>
+ </hbase-surefire.cygwin-argLine>
+ <!-- Surefire argLine defaults to Linux, cygwin argLine is used in the os.windows profile -->
+ <argLine>${hbase-surefire.argLine}</argLine>
+ <jacoco.version>0.7.5.201505241946</jacoco.version>
<extra.enforcer.version>1.0-beta-3</extra.enforcer.version>
<!-- Location of test resources -->
<test.build.classes>${project.build.directory}/test-classes</test.build.classes>
@@ -1801,6 +1773,44 @@
-->
<profiles>
<profile>
+ <id>jacoco</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <version>${jacoco.version}</version>
+ <executions>
+ <execution>
+ <id>prepare-agent</id>
+ <goals>
+ <goal>prepare-agent</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>report</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>report</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <systemPropertyVariables>
+ <jacoco-agent.destfile>target/jacoco.exec</jacoco-agent.destfile>
+ </systemPropertyVariables>
+ <excludes>
+ <exclude>**/generated/**/*.class</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
<id>os.linux</id>
<activation>
<activeByDefault>false</activeByDefault>
@@ -1832,26 +1842,8 @@
</activation>
<properties>
<build.platform>cygwin</build.platform>
+ <argLine>${hbase-surefire.cygwin-argLine}</argLine>
</properties>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>${hbase-surefire.cygwin-argline} ${argLine}</argLine>
- <systemProperties>
- <property>
- <name>java.net.preferIPv4Stack</name>
- <value>true</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
</profile>
<!-- this profile should be activated for release builds -->
<profile>