You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by lb...@apache.org on 2016/08/30 10:41:51 UTC
camel git commit: CAMEL-10227: upgrade camel-flink
Repository: camel
Updated Branches:
refs/heads/master 3a26b7ba6 -> c21dc5d4d
CAMEL-10227: upgrade camel-flink
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c21dc5d4
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c21dc5d4
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c21dc5d4
Branch: refs/heads/master
Commit: c21dc5d4d2df560dd0710496852d4eeddab8eee0
Parents: 3a26b7b
Author: lburgazzoli <lb...@gmail.com>
Authored: Tue Aug 30 12:40:49 2016 +0200
Committer: lburgazzoli <lb...@gmail.com>
Committed: Tue Aug 30 12:40:49 2016 +0200
----------------------------------------------------------------------
components-starter/camel-flink-starter/pom.xml | 8 -----
components/camel-flink/pom.xml | 36 ++++++++++++++++++---
parent/pom.xml | 2 +-
3 files changed, 33 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/c21dc5d4/components-starter/camel-flink-starter/pom.xml
----------------------------------------------------------------------
diff --git a/components-starter/camel-flink-starter/pom.xml b/components-starter/camel-flink-starter/pom.xml
index 50b6b91..a5c6180 100644
--- a/components-starter/camel-flink-starter/pom.xml
+++ b/components-starter/camel-flink-starter/pom.xml
@@ -41,14 +41,6 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/c21dc5d4/components/camel-flink/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-flink/pom.xml b/components/camel-flink/pom.xml
index 4827dde..2aa8385 100644
--- a/components/camel-flink/pom.xml
+++ b/components/camel-flink/pom.xml
@@ -48,20 +48,48 @@
<groupId>org.apache.flink</groupId>
<artifactId>flink-java</artifactId>
<version>${flink-version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-clients</artifactId>
+ <artifactId>flink-clients_2.10</artifactId>
<version>${flink-version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-java</artifactId>
+ <artifactId>flink-streaming-java_2.10</artifactId>
<version>${flink-version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
- <!--flink-->
-
<!-- scala -->
<dependency>
<groupId>org.scala-lang</groupId>
http://git-wip-us.apache.org/repos/asf/camel/blob/c21dc5d4/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index b1fb95b..19c14a7 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -188,7 +188,7 @@
<felix-scr-annotations-version>1.9.12</felix-scr-annotations-version>
<findbugs-maven-plugin-version>2.5.2</findbugs-maven-plugin-version>
<flatpack-version>3.4.3</flatpack-version>
- <flink-version>0.10.2</flink-version>
+ <flink-version>1.1.0</flink-version>
<fop-bundle-version>2.1_1</fop-bundle-version>
<fop-version>2.1</fop-version>
<ftpserver-version>1.0.6</ftpserver-version>