Skip to content
Permalink
Browse files
FLUME-2658. Upgrade to Hbase 1.0
(Roshan via Hari)
  • Loading branch information
harishreedharan committed Apr 15, 2015
1 parent 364752a commit 019ab5207f2d2f0e7b9113b855b37d20dce664bf
Showing 7 changed files with 32 additions and 32 deletions.
@@ -68,7 +68,7 @@
<id>hadoop-2</id>
<activation>
<property>
<name>hadoop.profile</name>
<name>flume.hadoop.profile</name>
<value>2</value>
</property>
</activation>
@@ -84,11 +84,11 @@
</dependencies>
</profile>
<profile>
<id>hbase-98</id>
<id>hbase-1</id>
<activation>
<property>
<name>hadoop.profile</name>
<value>hbase-98</value>
<name>flume.hadoop.profile</name>
<value>hbase-1</value>
</property>
</activation>
<dependencies>
@@ -108,7 +108,7 @@ limitations under the License.
<id>hadoop-1.0</id>
<activation>
<property>
<name>!hadoop.profile</name>
<name>!flume.hadoop.profile</name>
</property>
</activation>
<dependencies>
@@ -134,7 +134,7 @@ limitations under the License.
<id>hadoop-2</id>
<activation>
<property>
<name>hadoop.profile</name>
<name>flume.hadoop.profile</name>
<value>2</value>
</property>
</activation>
@@ -162,11 +162,11 @@ limitations under the License.
</profile>

<profile>
<id>hbase-98</id>
<id>hbase-1</id>
<activation>
<property>
<name>hadoop.profile</name>
<value>hbase-98</value>
<name>flume.hadoop.profile</name>
<value>hbase-1</value>
</property>
</activation>
<dependencies>
@@ -44,7 +44,7 @@ limitations under the License.
<id>hadoop-1.0</id>
<activation>
<property>
<name>!hadoop.profile</name>
<name>!flume.hadoop.profile</name>
</property>
</activation>

@@ -61,7 +61,7 @@ limitations under the License.
<id>hadoop-2</id>
<activation>
<property>
<name>hadoop.profile</name>
<name>flume.hadoop.profile</name>
<value>2</value>
</property>
</activation>
@@ -84,11 +84,11 @@ limitations under the License.
</profile>

<profile>
<id>hbase-98</id>
<id>hbase-1</id>
<activation>
<property>
<name>hadoop.profile</name>
<value>hbase-98</value>
<name>flume.hadoop.profile</name>
<value>hbase-1</value>
</property>
</activation>
<dependencies>
@@ -114,7 +114,7 @@
<id>hadoop-1.0</id>
<activation>
<property>
<name>!hadoop.profile</name>
<name>!flume.hadoop.profile</name>
</property>
</activation>
<dependencies>
@@ -154,7 +154,7 @@
<id>hadoop-2</id>
<activation>
<property>
<name>hadoop.profile</name>
<name>flume.hadoop.profile</name>
<value>2</value>
</property>
</activation>
@@ -185,11 +185,11 @@
</dependencies>
</profile>
<profile>
<id>hbase-98</id>
<id>hbase-1</id>
<activation>
<property>
<name>hadoop.profile</name>
<value>hbase-98</value>
<name>flume.hadoop.profile</name>
<value>hbase-1</value>
</property>
</activation>
<dependencies>
@@ -55,7 +55,7 @@ limitations under the License.
<id>hadoop-1.0</id>
<activation>
<property>
<name>!hadoop.profile</name>
<name>!flume.hadoop.profile</name>
</property>
</activation>
</profile>
@@ -64,7 +64,7 @@ limitations under the License.
<id>hadoop-2</id>
<activation>
<property>
<name>hadoop.profile</name>
<name>flume.hadoop.profile</name>
<value>2</value>
</property>
</activation>
@@ -77,11 +77,11 @@ limitations under the License.
</profile>

<profile>
<id>hbase-98</id>
<id>hbase-1</id>
<activation>
<property>
<name>hadoop.profile</name>
<value>hbase-98</value>
<name>flume.hadoop.profile</name>
<value>hbase-1</value>
</property>
</activation>
<!-- add the flume-dataset-sink, which is only compatible with hadoop-2
@@ -77,7 +77,7 @@ limitations under the License.
<id>hadoop-1.0</id>
<activation>
<property>
<name>!hadoop.profile</name>
<name>!flume.hadoop.profile</name>
</property>
</activation>
<dependencies>
@@ -103,7 +103,7 @@ limitations under the License.
<id>hadoop-2</id>
<activation>
<property>
<name>hadoop.profile</name>
<name>flume.hadoop.profile</name>
<value>2</value>
</property>
</activation>
12 pom.xml
@@ -79,7 +79,7 @@ limitations under the License.
<id>hadoop-1.0</id>
<activation>
<property>
<name>!hadoop.profile</name>
<name>!flume.hadoop.profile</name>
</property>
</activation>
<properties>
@@ -127,7 +127,7 @@ limitations under the License.
<id>hadoop-2</id>
<activation>
<property>
<name>hadoop.profile</name>
<name>flume.hadoop.profile</name>
<value>2</value>
</property>
</activation>
@@ -207,16 +207,16 @@ limitations under the License.
</profile>

<profile>
<id>hbase-98</id>
<id>hbase-1</id>
<activation>
<property>
<name>hadoop.profile</name>
<value>hbase-98</value>
<name>flume.hadoop.profile</name>
<value>hbase-1</value>
</property>
</activation>
<properties>
<hadoop.version>${hadoop2.version}</hadoop.version>
<hbase.version>0.98.2-hadoop2</hbase.version>
<hbase.version>1.0.0</hbase.version>
<hadoop.common.artifact.id>hadoop-common</hadoop.common.artifact.id>
<thrift.version>0.9.0</thrift.version>
</properties>

0 comments on commit 019ab52

Please sign in to comment.