flume-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hshreedha...@apache.org
Subject flume git commit: FLUME-2658. Upgrade to Hbase 1.0
Date Wed, 15 Apr 2015 23:18:05 GMT
Repository: flume
Updated Branches:
  refs/heads/trunk 364752a43 -> 019ab5207


FLUME-2658. Upgrade to Hbase 1.0

(Roshan via Hari)


Project: http://git-wip-us.apache.org/repos/asf/flume/repo
Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/019ab520
Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/019ab520
Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/019ab520

Branch: refs/heads/trunk
Commit: 019ab5207f2d2f0e7b9113b855b37d20dce664bf
Parents: 364752a
Author: Hari Shreedharan <hshreedharan@apache.org>
Authored: Wed Apr 15 16:17:25 2015 -0700
Committer: Hari Shreedharan <hshreedharan@apache.org>
Committed: Wed Apr 15 16:17:25 2015 -0700

----------------------------------------------------------------------
 flume-ng-dist/pom.xml                      |  8 ++++----
 flume-ng-sinks/flume-hdfs-sink/pom.xml     | 10 +++++-----
 flume-ng-sinks/flume-hive-sink/pom.xml     | 10 +++++-----
 flume-ng-sinks/flume-ng-hbase-sink/pom.xml | 10 +++++-----
 flume-ng-sinks/pom.xml                     | 10 +++++-----
 flume-tools/pom.xml                        |  4 ++--
 pom.xml                                    | 12 ++++++------
 7 files changed, 32 insertions(+), 32 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flume/blob/019ab520/flume-ng-dist/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-dist/pom.xml b/flume-ng-dist/pom.xml
index 9f7c4f6..c1a7a1b 100644
--- a/flume-ng-dist/pom.xml
+++ b/flume-ng-dist/pom.xml
@@ -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>

http://git-wip-us.apache.org/repos/asf/flume/blob/019ab520/flume-ng-sinks/flume-hdfs-sink/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-sinks/flume-hdfs-sink/pom.xml b/flume-ng-sinks/flume-hdfs-sink/pom.xml
index 83f8bec..f52beae 100644
--- a/flume-ng-sinks/flume-hdfs-sink/pom.xml
+++ b/flume-ng-sinks/flume-hdfs-sink/pom.xml
@@ -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>

http://git-wip-us.apache.org/repos/asf/flume/blob/019ab520/flume-ng-sinks/flume-hive-sink/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-sinks/flume-hive-sink/pom.xml b/flume-ng-sinks/flume-hive-sink/pom.xml
index e5f673a..9e3ab26 100644
--- a/flume-ng-sinks/flume-hive-sink/pom.xml
+++ b/flume-ng-sinks/flume-hive-sink/pom.xml
@@ -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>

http://git-wip-us.apache.org/repos/asf/flume/blob/019ab520/flume-ng-sinks/flume-ng-hbase-sink/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-sinks/flume-ng-hbase-sink/pom.xml b/flume-ng-sinks/flume-ng-hbase-sink/pom.xml
index cc2bbee..f5a6cf0 100644
--- a/flume-ng-sinks/flume-ng-hbase-sink/pom.xml
+++ b/flume-ng-sinks/flume-ng-hbase-sink/pom.xml
@@ -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>

http://git-wip-us.apache.org/repos/asf/flume/blob/019ab520/flume-ng-sinks/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-sinks/pom.xml b/flume-ng-sinks/pom.xml
index de12891..84083f5 100644
--- a/flume-ng-sinks/pom.xml
+++ b/flume-ng-sinks/pom.xml
@@ -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

http://git-wip-us.apache.org/repos/asf/flume/blob/019ab520/flume-tools/pom.xml
----------------------------------------------------------------------
diff --git a/flume-tools/pom.xml b/flume-tools/pom.xml
index b76186e..f2fb25c 100644
--- a/flume-tools/pom.xml
+++ b/flume-tools/pom.xml
@@ -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>

http://git-wip-us.apache.org/repos/asf/flume/blob/019ab520/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index fe7242f..f24ea28 100644
--- a/pom.xml
+++ b/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>


Mime
View raw message