From 6e72acb2cd854758b17f751e1e2a8b62da4c8d9b Mon Sep 17 00:00:00 2001 From: Nick Dimiduk Date: Sun, 3 Feb 2013 13:37:14 -0800 Subject: [PATCH] [WIP] hacking around the hadoop-3.0 profile --- hbase-common/pom.xml | 2 +- hbase-examples/pom.xml | 2 +- hbase-it/pom.xml | 4 ++-- hbase-server/pom.xml | 2 +- pom.xml | 54 +++++++++++++++++++++++++++++++------------------- 5 files changed, 39 insertions(+), 25 deletions(-) diff --git a/hbase-common/pom.xml b/hbase-common/pom.xml index 85bb7ad..3efb9eb 100644 --- a/hbase-common/pom.xml +++ b/hbase-common/pom.xml @@ -181,7 +181,7 @@ org.apache.hadoop - hadoop-annotations + hadoop-client diff --git a/hbase-examples/pom.xml b/hbase-examples/pom.xml index 3ff38ab..1f9261b 100644 --- a/hbase-examples/pom.xml +++ b/hbase-examples/pom.xml @@ -183,7 +183,7 @@ if we can combine these profiles somehow --> org.apache.hadoop - hadoop-annotations + hadoop-client org.apache.hadoop diff --git a/hbase-it/pom.xml b/hbase-it/pom.xml index 1fa1279..0aed0ce 100644 --- a/hbase-it/pom.xml +++ b/hbase-it/pom.xml @@ -254,13 +254,13 @@ 3.0-SNAPSHOT - + org.apache.hadoop hadoop-common org.apache.hadoop - hadoop-annotations + hadoop-client org.apache.hadoop diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml index 53c643b..b71618a 100644 --- a/hbase-server/pom.xml +++ b/hbase-server/pom.xml @@ -643,7 +643,7 @@ org.apache.hadoop - hadoop-annotations + hadoop-client org.apache.hadoop diff --git a/pom.xml b/pom.xml index 4c5661e..f7e66fc 100644 --- a/pom.xml +++ b/pom.xml @@ -334,6 +334,13 @@ https://repository.apache.org/content/repositories/releases/ + apache snapshots + https://repository.apache.org/content/repositories/snapshots/ + + true + + + java.net Java.Net http://download.java.net/maven/2/ @@ -1492,30 +1499,37 @@ 3.0 + + hbase-hadoop2-compat + 1.6.1 3.0.0-SNAPSHOT + hbase-hadoop2-compat + src/assembly/hadoop-two-compat.xml - - - org.apache.hadoop - hadoop-common - ${hadoop.version} - - - org.apache.hadoop - hadoop-annotations - ${hadoop.version} - - - - - org.apache.hadoop - hadoop-minicluster - ${hadoop.version} - compile - - + + + + org.apache.hadoop + hadoop-common + ${hadoop.version} + + + org.apache.hadoop + hadoop-client + ${hadoop.version} + + + + + org.apache.hadoop + hadoop-minicluster + ${hadoop.version} + compile + + +