From 8e524969d86a906ca0b02c425e7652580bfb60ad Mon Sep 17 00:00:00 2001 From: Andrew Purtell Date: Mon, 1 Dec 2014 16:58:57 -0500 Subject: [PATCH] HBASE-12383 Move 0.98 build to surefire 2.18 Backports additional Surefire configuration changes from POM on master branch --- pom.xml | 53 +++++++++++++++++------------------------------------ 1 file changed, 17 insertions(+), 36 deletions(-) diff --git a/pom.xml b/pom.xml index a29774e..260d479 100644 --- a/pom.xml +++ b/pom.xml @@ -420,29 +420,16 @@ false - - ghelmling.testing - Gary Helmling test repo - http://people.apache.org/~garyh/mvn/ - - true - - - true - - + - ghelmling.testing - Gary Helmling test repo - http://people.apache.org/~garyh/mvn/ + apache.snapshots + http://repository.apache.org/snapshots/ true - - true - @@ -475,6 +462,7 @@ + org.apache.maven.plugins maven-compiler-plugin 2.5.1 @@ -487,6 +475,7 @@ + org.apache.maven.plugins maven-surefire-plugin ${surefire.version} @@ -503,13 +492,8 @@ false ${surefire.skipFirstPart} - ${surefire.firstPartForkMode} - ${surefire.firstPartParallel} - false - ${surefire.firstPartThreadCount} - classes - + ${surefire.firstPartForkCount} + false ${surefire.testFailureIgnore} ${surefire.timeout} ${hbase-surefire.argLine} ${argLine} @@ -528,22 +512,20 @@ ${surefire.skipSecondPart} ${surefire.testFailureIgnore} - ${surefire.secondPartForkMode} - false - ${surefire.secondPartThreadCount} - classes - + false + ${surefire.secondPartForkCount} ${surefire.secondPartGroups} + org.apache.maven.plugins maven-surefire-report-plugin ${surefire.version} + org.apache.maven.plugins maven-clean-plugin @@ -572,6 +554,7 @@ 1.5 + org.apache.maven.plugins maven-antrun-plugin ${maven.antrun.version} @@ -687,6 +670,7 @@ + org.apache.maven.plugins maven-assembly-plugin ${maven.assembly.version} @@ -1042,16 +1026,13 @@ hbase-server-${project.version}-tests.jar hbase-common-${project.version}-tests.jar hbase-it-${project.version}-tests.jar - 2.12-TRUNK-HBASE-2 + 2.18 surefire-junit47 false false - once - classes - perThread - 1 - 2 + 1 + 2 org.apache.hadoop.hbase.SmallTests org.apache.hadoop.hbase.MediumTests false -- 1.7.12.4 (Apple Git-37)