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 2016/04/25 08:40:40 UTC
[3/5] camel git commit: CAMEL-9869: Add to kit
CAMEL-9869: Add to kit
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c35c835c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c35c835c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c35c835c
Branch: refs/heads/master
Commit: c35c835c81ec4842827c058c78a0eb48524cb815
Parents: 4ca2a64
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Apr 25 08:32:04 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Apr 25 08:32:04 2016 +0200
----------------------------------------------------------------------
apache-camel/pom.xml | 4 +
.../src/main/descriptors/common-bin.xml | 1 +
components/camel-flink/pom.xml | 121 ++++++++++---------
components/pom.xml | 2 +-
parent/pom.xml | 6 +
5 files changed, 74 insertions(+), 60 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/c35c835c/apache-camel/pom.xml
----------------------------------------------------------------------
diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index 8e13c4f..1d9ded5 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -245,6 +245,10 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-flink</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-fop</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/c35c835c/apache-camel/src/main/descriptors/common-bin.xml
----------------------------------------------------------------------
diff --git a/apache-camel/src/main/descriptors/common-bin.xml b/apache-camel/src/main/descriptors/common-bin.xml
index 4677951..9623430 100644
--- a/apache-camel/src/main/descriptors/common-bin.xml
+++ b/apache-camel/src/main/descriptors/common-bin.xml
@@ -74,6 +74,7 @@
<include>org.apache.camel:camel-exec</include>
<include>org.apache.camel:camel-facebook</include>
<include>org.apache.camel:camel-flatpack</include>
+ <include>org.apache.camel:camel-flink</include>
<include>org.apache.camel:camel-fop</include>
<include>org.apache.camel:camel-freemarker</include>
<include>org.apache.camel:camel-ftp</include>
http://git-wip-us.apache.org/repos/asf/camel/blob/c35c835c/components/camel-flink/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-flink/pom.xml b/components/camel-flink/pom.xml
index 24407b6..5185fae 100644
--- a/components/camel-flink/pom.xml
+++ b/components/camel-flink/pom.xml
@@ -18,70 +18,73 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>components</artifactId>
- <groupId>org.apache.camel</groupId>
- <version>2.18-SNAPSHOT</version>
- </parent>
+ <parent>
+ <artifactId>components</artifactId>
+ <groupId>org.apache.camel</groupId>
+ <version>2.18-SNAPSHOT</version>
+ </parent>
- <artifactId>camel-flink</artifactId>
- <packaging>jar</packaging>
- <name>Camel :: Apache Flink</name>
- <description>Camel Apache Flink support</description>
+ <artifactId>camel-flink</artifactId>
+ <packaging>jar</packaging>
+ <name>Camel :: Apache Flink</name>
+ <description>Camel Apache Flink support</description>
- <properties>
- <camel.osgi.export.pkg>org.apache.camel.component.flink.*</camel.osgi.export.pkg>
- <camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=flink</camel.osgi.export.service>
- </properties>
+ <properties>
+ <camel.osgi.export.pkg>org.apache.camel.component.flink.*</camel.osgi.export.pkg>
+ <camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=flink</camel.osgi.export.service>
+ </properties>
- <dependencies>
- <!--camel-->
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
- </dependency>
+ <dependencies>
- <!--flink-->
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-java</artifactId>
- <version>0.10.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-clients</artifactId>
- <version>0.10.2</version>
- </dependency>
+ <!--camel-->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
+ </dependency>
- <!--testing-->
- <dependency>
- <groupId>com.google.truth</groupId>
- <artifactId>truth</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
+ <!--flink-->
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-java</artifactId>
+ <version>${flink-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-clients</artifactId>
+ <version>${flink-version}</version>
+ </dependency>
- <!--optional-->
- <dependency>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-library</artifactId>
- <version>2.10.6</version>
- </dependency>
- </dependencies>
+ <!--testing-->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.google.truth</groupId>
+ <artifactId>truth</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <!--optional-->
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-library</artifactId>
+ <version>2.10.6</version>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/c35c835c/components/pom.xml
----------------------------------------------------------------------
diff --git a/components/pom.xml b/components/pom.xml
index a46a45a..6bf5ff8 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -83,7 +83,7 @@
<module>camel-castor</module>
<module>camel-cdi</module>
<module>camel-chunk</module>
- <module>camel-cm-sms</module>
+ <module>camel-cm-sms</module>
<module>camel-cmis</module>
<module>camel-coap</module>
<module>camel-cometd</module>
http://git-wip-us.apache.org/repos/asf/camel/blob/c35c835c/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 09b322f..383b619 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -174,6 +174,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>
<fop-bundle-version>2.1_1</fop-bundle-version>
<fop-version>2.1</fop-version>
<ftpserver-version>1.0.6</ftpserver-version>
@@ -938,6 +939,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-flink</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-fop</artifactId>
<version>${project.version}</version>
</dependency>