HBASE-6112 Fix hadoop-2.0 build (Jesse Yates)
git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1343071 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
a113f4c291
commit
4ae26c1246
|
@ -485,7 +485,7 @@
|
||||||
<id>hadoop-1.0</id>
|
<id>hadoop-1.0</id>
|
||||||
<activation>
|
<activation>
|
||||||
<property>
|
<property>
|
||||||
<name>!hadoop.profile</name>
|
<name>!hadoop.version</name>
|
||||||
</property>
|
</property>
|
||||||
</activation>
|
</activation>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
@ -508,8 +508,8 @@
|
||||||
<id>hadoop-2.0</id>
|
<id>hadoop-2.0</id>
|
||||||
<activation>
|
<activation>
|
||||||
<property>
|
<property>
|
||||||
<name>hadoop.profile</name>
|
<name>hadoop.version</name>
|
||||||
<value>2.0</value>
|
<value>2.0.0-alpha</value>
|
||||||
</property>
|
</property>
|
||||||
</activation>
|
</activation>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
@ -559,8 +559,8 @@
|
||||||
<id>hadoop-3.0</id>
|
<id>hadoop-3.0</id>
|
||||||
<activation>
|
<activation>
|
||||||
<property>
|
<property>
|
||||||
<name>hadoop.profile</name>
|
<name>hadoop.version</name>
|
||||||
<value>3.0</value>
|
<value>3.0.0-SNAPSHOT</value>
|
||||||
</property>
|
</property>
|
||||||
</activation>
|
</activation>
|
||||||
<properties>
|
<properties>
|
||||||
|
|
12
pom.xml
12
pom.xml
|
@ -1106,7 +1106,7 @@
|
||||||
<id>hadoop-1.0</id>
|
<id>hadoop-1.0</id>
|
||||||
<activation>
|
<activation>
|
||||||
<property>
|
<property>
|
||||||
<name>!hadoop.profile</name>
|
<name>!hadoop.version</name>
|
||||||
</property>
|
</property>
|
||||||
</activation>
|
</activation>
|
||||||
<properties>
|
<properties>
|
||||||
|
@ -1160,13 +1160,12 @@
|
||||||
<id>hadoop-2.0</id>
|
<id>hadoop-2.0</id>
|
||||||
<activation>
|
<activation>
|
||||||
<property>
|
<property>
|
||||||
<name>hadoop.profile</name>
|
<name>hadoop.version</name>
|
||||||
<value>2.0</value>
|
<value>2.0.0-alpha</value>
|
||||||
</property>
|
</property>
|
||||||
</activation>
|
</activation>
|
||||||
<properties>
|
<properties>
|
||||||
<slf4j.version>1.6.1</slf4j.version>
|
<slf4j.version>1.6.1</slf4j.version>
|
||||||
<hadoop.version>2.0.0-SNAPSHOT</hadoop.version>
|
|
||||||
</properties>
|
</properties>
|
||||||
<dependencyManagement>
|
<dependencyManagement>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
@ -1199,13 +1198,12 @@
|
||||||
<id>hadoop-3.0</id>
|
<id>hadoop-3.0</id>
|
||||||
<activation>
|
<activation>
|
||||||
<property>
|
<property>
|
||||||
<name>hadoop.profile</name>
|
<name>hadoop.version</name>
|
||||||
<value>3.0</value>
|
<value>3.0.0-SNAPSHOT</value>
|
||||||
</property>
|
</property>
|
||||||
</activation>
|
</activation>
|
||||||
<properties>
|
<properties>
|
||||||
<slf4j.version>1.6.1</slf4j.version>
|
<slf4j.version>1.6.1</slf4j.version>
|
||||||
<hadoop.version>3.0.0-SNAPSHOT</hadoop.version>
|
|
||||||
</properties>
|
</properties>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|
Loading…
Reference in New Issue