You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2015/10/23 07:45:15 UTC
[2/4] camel git commit: [CAMEL-9145] update hbase version to 1.1.1
and hadoop2 to 2.7.1
[CAMEL-9145] update hbase version to 1.1.1 and hadoop2 to 2.7.1
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3cf6a8f0
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3cf6a8f0
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3cf6a8f0
Branch: refs/heads/master
Commit: 3cf6a8f0811eb415274c736151b9f8e410f60dae
Parents: c202533
Author: woj-i <wo...@gmail.com>
Authored: Fri Oct 9 16:23:29 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Oct 23 06:45:01 2015 +0200
----------------------------------------------------------------------
components/camel-hbase/pom.xml | 87 +++++++++++++++++++++++++++++++++++--
parent/pom.xml | 4 +-
2 files changed, 85 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/3cf6a8f0/components/camel-hbase/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-hbase/pom.xml b/components/camel-hbase/pom.xml
index c8dbe0d..eabc9b5 100644
--- a/components/camel-hbase/pom.xml
+++ b/components/camel-hbase/pom.xml
@@ -31,8 +31,8 @@
<properties>
<camel.osgi.import.before.defaults>
- org.apache.hadoop.conf;version="[1,2)",
- org.apache.hadoop.hbase.*;version="[0.9,1)"
+ org.apache.hadoop.conf;version="[2,3)",
+ org.apache.hadoop.hbase.*;version="[1,2)"
</camel.osgi.import.before.defaults>
<camel.osgi.export.pkg>org.apache.camel.component.hbase.*</camel.osgi.export.pkg>
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=hbase</camel.osgi.export.service>
@@ -48,11 +48,33 @@
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-client</artifactId>
<version>${hbase-version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-auth</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-mapreduce-client-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
+ <!-- because hbase-client 1.1.1 use hadoop2.5.1 by default, check is it still required by the next version update -->
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-auth</artifactId>
+ <version>${hadoop2-version}</version>
+ </dependency>
+ <!-- because hbase-client 1.1.1 use hadoop2.5.1 by default, check is it still required by the next version update -->
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-mapreduce-client-core</artifactId>
+ <version>${hadoop2-version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-core</artifactId>
- <version>${hadoop-version}</version>
+ <artifactId>hadoop-common</artifactId>
+ <version>${hadoop2-version}</version>
<exclusions>
<exclusion>
<groupId>commons-codec</groupId>
@@ -130,14 +152,71 @@
<version>${hbase-version}</version>
<classifier>tests</classifier>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-hdfs</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
+ <!-- because hbase-server 1.1.1 use hadoop2.5.1 by default, check is it still required by the next version update -->
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client</artifactId>
+ <version>${hadoop2-version}</version>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ </dependency>
+ <!-- because hbase-server 1.1.1 use hadoop2.5.1 by default, check is it still required by the next version update -->
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-hdfs</artifactId>
+ <version>${hadoop2-version}</version>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-testing-util</artifactId>
<version>${hbase-version}</version>
<classifier>tests</classifier>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-hdfs</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-minicluster</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
+ <!-- because hbase-testing-util 1.1.1 use hadoop2.5.1 by default, check is it still required by the next version update -->
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-hdfs</artifactId>
+ <version>${hadoop2-version}</version>
+ <type>test-jar</type>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ </dependency>
+ <!-- because hbase-testing-util 1.1.1 use hadoop2.5.1 by default, check is it still required by the next version update -->
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-minicluster</artifactId>
+ <version>${hadoop2-version}</version>
+ <scope>test</scope>
+ </dependency>
+
<!-- Using a low version of guava could let the server shutdown quickly -->
<dependency>
<groupId>com.google.guava</groupId>
http://git-wip-us.apache.org/repos/asf/camel/blob/3cf6a8f0/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index df8ca84..3985807 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -210,8 +210,8 @@
<hawtdb-version>1.6</hawtdb-version>
<hawtdispatch-version>1.21</hawtdispatch-version>
<hazelcast-version>3.5.3</hazelcast-version>
- <hbase-version>0.98.5-hadoop2</hbase-version>
- <hbase-bundle-version>0.98.5-hadoop2_2</hbase-bundle-version>
+ <hbase-version>1.1.1</hbase-version>
+ <hbase-bundle-version>1.1.1_1</hbase-bundle-version>
<hibernate-validator-version>5.2.2.Final</hibernate-validator-version>
<!-- Spring 3.2.x and 4.0.x still stick to JPA 2.0. Hibernate 4.3.x upgraded to JPA 2.1. -->
<hibernate-version>4.2.20.Final</hibernate-version>