diff --git a/examples/pom.xml b/examples/pom.xml index 002d4458c4b3e2868a8e6887db1455ce58c84a11..4b92147725f6bfa12dd00eabe73e453eaa6defd1 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -392,29 +392,6 @@ </dependency> </dependencies> </profile> - <profile> - <id>hbase-hadoop2</id> - <activation> - <property> - <name>hbase.profile</name> - <value>hadoop2</value> - </property> - </activation> - <properties> - <hbase.version>0.98.7-hadoop2</hbase.version> - </properties> - </profile> - <profile> - <id>hbase-hadoop1</id> - <activation> - <property> - <name>!hbase.profile</name> - </property> - </activation> - <properties> - <hbase.version>0.98.7-hadoop1</hbase.version> - </properties> - </profile> <profile> <!-- We add a source directory specific to Scala 2.10 since Kafka only works with it --> diff --git a/pom.xml b/pom.xml index 0403c008be4f4033e352af764fc6fbdd3dca7bc6..f4466e56c2a53fd4acbeeb170915dca162d430f3 100644 --- a/pom.xml +++ b/pom.xml @@ -122,7 +122,7 @@ <hadoop.version>1.0.4</hadoop.version> <protobuf.version>2.4.1</protobuf.version> <yarn.version>${hadoop.version}</yarn.version> - <hbase.version>0.94.6</hbase.version> + <hbase.version>0.98.7-hadoop1</hbase.version> <hbase.artifact>hbase</hbase.artifact> <flume.version>1.4.0</flume.version> <zookeeper.version>3.4.5</zookeeper.version> @@ -1466,6 +1466,7 @@ <properties> <hadoop.version>2.2.0</hadoop.version> <protobuf.version>2.5.0</protobuf.version> + <hbase.version>0.98.7-hadoop2</hbase.version> <avro.mapred.classifier>hadoop2</avro.mapred.classifier> </properties> </profile> @@ -1476,6 +1477,7 @@ <hadoop.version>2.3.0</hadoop.version> <protobuf.version>2.5.0</protobuf.version> <jets3t.version>0.9.0</jets3t.version> + <hbase.version>0.98.7-hadoop2</hbase.version> <commons.math3.version>3.1.1</commons.math3.version> <avro.mapred.classifier>hadoop2</avro.mapred.classifier> </properties> @@ -1487,6 +1489,7 @@ <hadoop.version>2.4.0</hadoop.version> <protobuf.version>2.5.0</protobuf.version> <jets3t.version>0.9.0</jets3t.version> + <hbase.version>0.98.7-hadoop2</hbase.version> <commons.math3.version>3.1.1</commons.math3.version> <avro.mapred.classifier>hadoop2</avro.mapred.classifier> </properties>