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 2014/12/02 05:25:02 UTC
hbase git commit: HBASE-12383 Move 0.98 build to surefire 2.18
Repository: hbase
Updated Branches:
refs/heads/0.98 72b4adbcf -> 5f5ed7af7
HBASE-12383 Move 0.98 build to surefire 2.18
Backports additional Surefire configuration changes from POM on master branch
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/5f5ed7af
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/5f5ed7af
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/5f5ed7af
Branch: refs/heads/0.98
Commit: 5f5ed7af7e16a3c21c706bdf678615fe9f82bc90
Parents: 72b4adb
Author: Andrew Purtell <ap...@apache.org>
Authored: Mon Dec 1 23:24:46 2014 -0500
Committer: Andrew Purtell <ap...@apache.org>
Committed: Mon Dec 1 23:24:46 2014 -0500
----------------------------------------------------------------------
pom.xml | 53 +++++++++++++++++------------------------------------
1 file changed, 17 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/5f5ed7af/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a29774e..260d479 100644
--- a/pom.xml
+++ b/pom.xml
@@ -420,29 +420,16 @@
<enabled>false</enabled>
</snapshots>
</repository>
- <repository>
- <id>ghelmling.testing</id>
- <name>Gary Helmling test repo</name>
- <url>http://people.apache.org/~garyh/mvn/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
</repositories>
+ <!--Add apache snapshots in case we want to use unreleased versions of plugins:
+ e.g. surefire 2.18-SNAPSHOT-->
<pluginRepositories>
<pluginRepository>
- <id>ghelmling.testing</id>
- <name>Gary Helmling test repo</name>
- <url>http://people.apache.org/~garyh/mvn/</url>
+ <id>apache.snapshots</id>
+ <url>http://repository.apache.org/snapshots/</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
</pluginRepository>
</pluginRepositories>
<build>
@@ -475,6 +462,7 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.5.1</version>
<configuration>
@@ -487,6 +475,7 @@
</plugin>
<!-- Test oriented plugins -->
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
<dependencies>
@@ -503,13 +492,8 @@
<configuration>
<failIfNoTests>false</failIfNoTests>
<skip>${surefire.skipFirstPart}</skip>
- <forkMode>${surefire.firstPartForkMode}</forkMode>
- <parallel>${surefire.firstPartParallel}</parallel>
- <perCoreThreadCount>false</perCoreThreadCount>
- <threadCount>${surefire.firstPartThreadCount}</threadCount>
- <parallel>classes</parallel>
- <!-- surefire hack, if not we're
- using method parallelization class ! -->
+ <forkCount>${surefire.firstPartForkCount}</forkCount>
+ <reuseForks>false</reuseForks>
<testFailureIgnore>${surefire.testFailureIgnore}</testFailureIgnore>
<forkedProcessTimeoutInSeconds>${surefire.timeout}</forkedProcessTimeoutInSeconds>
<argLine>${hbase-surefire.argLine} ${argLine}</argLine>
@@ -528,22 +512,20 @@
<configuration>
<skip>${surefire.skipSecondPart}</skip>
<testFailureIgnore>${surefire.testFailureIgnore}</testFailureIgnore>
- <forkMode>${surefire.secondPartForkMode}</forkMode>
- <perCoreThreadCount>false</perCoreThreadCount>
- <threadCount>${surefire.secondPartThreadCount}</threadCount>
- <parallel>classes</parallel>
- <!-- surefire hack, if not we're using method
- parallelisation class ! -->
+ <reuseForks>false</reuseForks>
+ <forkCount>${surefire.secondPartForkCount}</forkCount>
<groups>${surefire.secondPartGroups}</groups>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
<version>${surefire.version}</version>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<configuration>
<filesets>
@@ -572,6 +554,7 @@
<version>1.5</version>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>${maven.antrun.version}</version>
</plugin>
@@ -687,6 +670,7 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>${maven.assembly.version}</version>
<configuration>
@@ -1042,16 +1026,13 @@
<server.test.jar>hbase-server-${project.version}-tests.jar</server.test.jar>
<common.test.jar>hbase-common-${project.version}-tests.jar</common.test.jar>
<it.test.jar>hbase-it-${project.version}-tests.jar</it.test.jar>
- <surefire.version>2.12-TRUNK-HBASE-2</surefire.version>
+ <surefire.version>2.18</surefire.version>
<surefire.provider>surefire-junit47</surefire.provider>
<!-- default: run small & medium, medium with 2 threads -->
<surefire.skipFirstPart>false</surefire.skipFirstPart>
<surefire.skipSecondPart>false</surefire.skipSecondPart>
- <surefire.firstPartForkMode>once</surefire.firstPartForkMode>
- <surefire.firstPartParallel>classes</surefire.firstPartParallel>
- <surefire.secondPartForkMode>perThread</surefire.secondPartForkMode>
- <surefire.firstPartThreadCount>1</surefire.firstPartThreadCount>
- <surefire.secondPartThreadCount>2</surefire.secondPartThreadCount>
+ <surefire.firstPartForkCount>1</surefire.firstPartForkCount>
+ <surefire.secondPartForkCount>2</surefire.secondPartForkCount>
<surefire.firstPartGroups>org.apache.hadoop.hbase.SmallTests</surefire.firstPartGroups>
<surefire.secondPartGroups>org.apache.hadoop.hbase.MediumTests</surefire.secondPartGroups>
<surefire.testFailureIgnore>false</surefire.testFailureIgnore>