Return-Path: 
 <commits-return-27535-apmail-hbase-commits-archive=hbase.apache.org@hbase.apache.org>
X-Original-To: apmail-hbase-commits-archive@www.apache.org
Delivered-To: apmail-hbase-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 04F93187DB
	for <apmail-hbase-commits-archive@www.apache.org>;
 Wed, 14 Oct 2015 20:39:22 +0000 (UTC)
Received: (qmail 4958 invoked by uid 500); 14 Oct 2015 20:39:21 -0000
Delivered-To: apmail-hbase-commits-archive@hbase.apache.org
Received: (qmail 4917 invoked by uid 500); 14 Oct 2015 20:39:21 -0000
Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@hbase.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@hbase.apache.org>
List-Post: <mailto:commits@hbase.apache.org>
List-Id: <commits.hbase.apache.org>
Reply-To: dev@hbase.apache.org
Delivered-To: mailing list commits@hbase.apache.org
Received: (qmail 4908 invoked by uid 99); 14 Oct 2015 20:39:21 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org)
 (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 Oct 2015 20:39:21 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id AE488E0BB5; Wed, 14 Oct 2015 20:39:21 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: apurtell@apache.org
To: commits@hbase.apache.org
Date: Wed, 14 Oct 2015 20:39:21 -0000
Message-Id: <80c01e52bda94531b26efdcadb2c7c5b@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [1/2] hbase git commit: HBASE-14586 Use a maven profile to run Jacoco
 analysis (Andrew Wang)

Repository: hbase
Updated Branches:
  refs/heads/0.98 bbcb53a21 -> 4b1fd1bda
  refs/heads/branch-1.0 71b8cb9bd -> 19c7968b0


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/4b1fd1bd
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/4b1fd1bd
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/4b1fd1bd

Branch: refs/heads/0.98
Commit: 4b1fd1bda0635c2fc78a56c627018bb9ad5c3194
Parents: bbcb53a
Author: Andrew Purtell <apurtell@apache.org>
Authored: Wed Oct 14 12:22:27 2015 -0700
Committer: Andrew Purtell <apurtell@apache.org>
Committed: Wed Oct 14 12:26:02 2015 -0700

----------------------------------------------------------------------
 pom.xml | 93 ++++++++++++++++++++++++++++--------------------------------
 1 file changed, 43 insertions(+), 50 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/4b1fd1bd/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2b3b649..f353c25 100644
--- a/pom.xml
+++ b/pom.xml
@@ -498,10 +498,8 @@
             <reuseForks>false</reuseForks>
             <testFailureIgnore>${surefire.testFailureIgnore}</testFailureIgnore>
             <forkedProcessTimeoutInSeconds>${surefire.timeout}</forkedProcessTimeoutInSeconds>
-            <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>
 
@@ -1021,32 +1019,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>
@@ -1173,11 +1145,12 @@
       -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>
+    </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 -->
@@ -1679,6 +1652,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>
@@ -1710,26 +1721,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>