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 2020/03/04 13:14:41 UTC
[camel] 01/02: CAMEL-14640: Remove guava and update hadoop
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 315677fce5d272ef0da8f732f96b1d80d5a270d0
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Mar 4 14:10:14 2020 +0100
CAMEL-14640: Remove guava and update hadoop
---
components/camel-spark/pom.xml | 4 ++++
parent/pom.xml | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/components/camel-spark/pom.xml b/components/camel-spark/pom.xml
index 6e4101c..32304f2 100644
--- a/components/camel-spark/pom.xml
+++ b/components/camel-spark/pom.xml
@@ -126,6 +126,10 @@
<version>${hadoop2-version}</version>
<exclusions>
<exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
diff --git a/parent/pom.xml b/parent/pom.xml
index 534bf32..b77db09 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -269,8 +269,8 @@
<guice3-version>3.0</guice3-version>
<guice-bundle-version>3.0_1</guice-bundle-version>
<hadoop-bundle-version>1.2.1_1</hadoop-bundle-version>
- <hadoop2-bundle-version>2.7.2_1</hadoop2-bundle-version>
- <hadoop2-version>2.7.4</hadoop2-version>
+ <hadoop2-bundle-version>2.7.7_1</hadoop2-bundle-version>
+ <hadoop2-version>2.7.7</hadoop2-version>
<hadoop2-protobuf-version>2.5.0</hadoop2-protobuf-version>
<hamcrest-version>2.2</hamcrest-version>
<hapi-version>2.3</hapi-version>