hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From apurt...@apache.org
Subject [4/4] hbase git commit: HBASE-14586 Use a maven profile to run Jacoco analysis (Andrew Wang)
Date Wed, 14 Oct 2015 20:39:43 GMT
HBASE-14586 Use a maven profile to run Jacoco analysis (Andrew Wang)


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/fe0bdbe4
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/fe0bdbe4
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/fe0bdbe4

Branch: refs/heads/master
Commit: fe0bdbe48ec5046be5cdc2ba13c620b0c1e2b666
Parents: 940e540
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 13:39:27 2015 -0700

----------------------------------------------------------------------
 pom.xml | 94 +++++++++++++++++++++++++++---------------------------------
 1 file changed, 43 insertions(+), 51 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/fe0bdbe4/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a4e4e7c..def9021 100644
--- a/pom.xml
+++ b/pom.xml
@@ -570,11 +570,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>
 
@@ -1140,32 +1137,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>
@@ -1299,11 +1270,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 -->
@@ -1865,6 +1837,44 @@
       </build>
     </profile>
     <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>
@@ -1896,26 +1906,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>


Mime
View raw message