diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml
index dca9352..576dd31 100644
--- a/hbase-server/pom.xml
+++ b/hbase-server/pom.xml
@@ -472,7 +472,7 @@
hadoop-1.0
- !hadoop.version
+ !hadoop.profile
@@ -495,8 +495,8 @@
hadoop-2.0
- hadoop.version
- 2.0.0-alpha
+ hadoop.profile
+ 2.0
@@ -546,8 +546,8 @@
hadoop-3.0
- hadoop.version
- 3.0.0-SNAPSHOT
+ hadoop.profile
+ 3.0
diff --git a/hbase-site/src/docbkx/developer.xml b/hbase-site/src/docbkx/developer.xml
index a2f3802..9562ca5 100644
--- a/hbase-site/src/docbkx/developer.xml
+++ b/hbase-site/src/docbkx/developer.xml
@@ -444,51 +444,6 @@ As most as possible, tests should use the default settings for the cluster. When
-
-
-Integration Tests
-HBase integration Tests are tests that are beyond HBase unit tests. They
-are generally long-lasting, sizeable (the test can be asked to 1M rows or 1B rows),
-targetable (they can take configuration that will point them at the ready-made cluster
-they are to run against; integration tests do not include cluster start/stop code),
-and verifying success, integration tests rely on public APIs only; they do not
-attempt to examine server internals asserring success/fail. Integration tests
-are what you would run when you need to more elaborate proofing of a release candidate
-beyond what unit tests can do. They are not generally run on the Apache Continuous Integration
-build server.
-
-
-Integration tests currently live under the src/test directory and
-will match the regex: **/IntegrationTest*.java.
-
-HBase 0.92 added a verify maven target.
-Invoking it, for example by doing mvn verify, will
-run all the phases up to and including the verify phase via the
-maven failsafe plugin,
-running all the above mentioned HBase unit tests as well as tests that are in the HBase integration test group.
-If you just want to run the integration tests, you need to run two commands. First:
- mvn failsafe:integration-test
-This actually runs ALL the integration tests.
- This command will always output BUILD SUCCESS even if there are test failures.
-
- At this point, you could grep the output by hand looking for failed tests. However, maven will do this for us; just use:
- mvn failsafe:verify
- The above command basically looks at all the test results (so don't remove the 'target' directory) for test failures and reports the results.
-
-
- Running a subset of Integration tests
- This is very similar to how you specify running a subset of unit tests (see above).
-To just run IntegrationTestClassXYZ.java, use:
- mvn failsafe:integration-test -Dtest=IntegrationTestClassXYZ
- Pretty similar, right?
- The next thing you might want to do is run groups of integration tests, say all integration tests that are named IntegrationTestClassX*.java:
- mvn failsafe:integration-test -Dtest=*ClassX*
- This runs everything that is an integration test that matches *ClassX*. This means anything matching: "**/IntegrationTest*ClassX*".
- You can also run multiple groups of integration tests using comma-delimited lists (similar to unit tests). Using a list of matches still supports full regex matching for each of the groups.This would look something like:
- mvn failsafe:integration-test -Dtest=*ClassX*, *ClassY
-
-
-
@@ -517,14 +472,21 @@ mvn compile
- To build against hadoop 0.22.x or 0.23.x
-
-mvn -Dhadoop.profile=22 ...
-
-That is, designate build with hadoop.profile 22. Pass 23 for hadoop.profile to build against hadoop 0.23.
-Tests do not all pass as of this writing so you may need ot pass -DskipTests unless you are inclined
-to fix the failing tests.
-
+ Building against various hadoop versions.
+ As of 0.96, HBase supports building against hadoop versions: 1.0.3, 2.0.0-alpha and 3.0.0-SNAPSHOT.
+ By default, we will build with Hadoop-1.0.3. To change the version to run with Hadoop-2.0.0-alpha, you would run:
+ mvn -Dhadoop.profile=2.0 ...
+
+ That is, designate build with hadoop.profile 2.0. Pass 2.0 for hadoop.profile to build against hadoop 2.0.
+ Tests may not all pass as of this writing so you may need to pass -DskipTests unless you are inclined
+ to fix the failing tests.
+
+ Similarly, for 3.0, you would just replace the profile value. Note that Hadoop-3.0.0-SNAPSHOT does not currently have a deployed maven artificat - you will need to build and install your own in your local maven repository if you want to run against this profile.
+
+
+ In earilier verions of HBase, you can build against older versions of hadoop, notably, Hadoop 0.22.x and 0.23.x.
+ If you are running, for example HBase-0.94 and wanted to build against Hadoop 0.23.x, you would run with:
+ mvn -Dhadoop.profile=22 ...
diff --git a/pom.xml b/pom.xml
index ec39e5f..f8fdbfb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1110,7 +1110,7 @@
hadoop-1.0
- !hadoop.version
+ !hadoop.profile
@@ -1164,12 +1164,13 @@
hadoop-2.0
- hadoop.version
- 2.0.0-alpha
+ hadoop.profile
+ 2.01.6.1
+ 2.0.0-alpha
@@ -1202,12 +1203,13 @@
hadoop-3.0
- hadoop.version
- 3.0.0-SNAPSHOT
+ hadoop.profile
+ 3.01.6.1
+ 3.0.0-SNAPSHOT