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 2014/12/23 12:25:05 UTC
[5/5] camel git commit: CAMEL-2939: Added to kit
CAMEL-2939: Added to kit
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bf4ddfe8
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bf4ddfe8
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bf4ddfe8
Branch: refs/heads/master
Commit: bf4ddfe8bb689f726089ef4db894f796fc9eaf85
Parents: e0b14cd
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Dec 23 12:22:39 2014 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Dec 23 12:22:39 2014 +0100
----------------------------------------------------------------------
apache-camel/pom.xml | 4 +++
.../src/main/descriptors/common-bin.xml | 1 +
components/camel-cassandraql/pom.xml | 36 +++++++++++---------
parent/pom.xml | 9 +++++
4 files changed, 34 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/bf4ddfe8/apache-camel/pom.xml
----------------------------------------------------------------------
diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index c0ca486..0e4dcfb 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -125,6 +125,10 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-cassandraql</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-castor</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/bf4ddfe8/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 d5d2e1b..ee5bcbf 100644
--- a/apache-camel/src/main/descriptors/common-bin.xml
+++ b/apache-camel/src/main/descriptors/common-bin.xml
@@ -42,6 +42,7 @@
<include>org.apache.camel:camel-box</include>
<include>org.apache.camel:camel-blueprint</include>
<include>org.apache.camel:camel-cache</include>
+ <include>org.apache.camel:camel-cassandraql</include>
<include>org.apache.camel:camel-castor</include>
<include>org.apache.camel:camel-cdi</include>
<include>org.apache.camel:camel-chunk</include>
http://git-wip-us.apache.org/repos/asf/camel/blob/bf4ddfe8/components/camel-cassandraql/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-cassandraql/pom.xml b/components/camel-cassandraql/pom.xml
index 88d6e84..de6cd4e 100644
--- a/components/camel-cassandraql/pom.xml
+++ b/components/camel-cassandraql/pom.xml
@@ -17,17 +17,28 @@
<properties>
<camel.osgi.export.pkg>
- org.apache.camel.component.cassandraql.*
+ org.apache.camel.component.cassandra.*,
+ org.apache.camel.processor.aggregate.cassandra,
+ org.apache.camel.processor.idempotent.cassandra,
+ org.apache.camel.utils.cassandra
</camel.osgi.export.pkg>
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=cql</camel.osgi.export.service>
</properties>
<dependencies>
+
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core</artifactId>
</dependency>
+ <!-- cassandra -->
+ <dependency>
+ <groupId>com.datastax.cassandra</groupId>
+ <artifactId>cassandra-driver-core</artifactId>
+ <version>${cassandra-driver-version}</version>
+ </dependency>
+
<!-- logging -->
<dependency>
<groupId>org.slf4j</groupId>
@@ -51,21 +62,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <scope>test</scope>
- </dependency>
-
- <!-- cassandra -->
- <dependency>
- <groupId>com.datastax.cassandra</groupId>
- <artifactId>cassandra-driver-core</artifactId>
- <version>2.1.2</version>
- </dependency>
- <dependency>
<groupId>org.cassandraunit</groupId>
<artifactId>cassandra-unit</artifactId>
- <version>2.0.2.2</version>
+ <version>${cassandra-unit-version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -77,13 +76,18 @@
<dependency>
<groupId>org.apache.cassandra</groupId>
<artifactId>cassandra-all</artifactId>
- <version>2.1.2</version>
+ <version>${cassandra-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
- <version>1.14</version>
+ <version>${snakeyaml-version}</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/camel/blob/bf4ddfe8/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 1ea6515..23e02b2 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -75,6 +75,9 @@
<build-helper-maven-plugin-version>1.8</build-helper-maven-plugin-version>
<c3p0-version>0.9.1.2</c3p0-version>
<camel-test-spring-artifactId>camel-test-spring</camel-test-spring-artifactId>
+ <cassandra-driver-version>2.1.2</cassandra-driver-version>
+ <cassandra-version>2.1.2</cassandra-version>
+ <cassandra-unit-version>2.0.2.2</cassandra-unit-version>
<castor-bundle-version>1.3.2_2</castor-bundle-version>
<cdi-api-version>1.2</cdi-api-version>
<cglib-bundle-version>2.1_3_7</cglib-bundle-version>
@@ -400,6 +403,7 @@
<slf4j-version>1.7.7</slf4j-version>
<smack-bundle-version>3.2.1_1</smack-bundle-version>
<smack-version>3.2.1</smack-version>
+ <snakeyaml-version>1.14</snakeyaml-version>
<snappy-version>1.1.0.1</snappy-version>
<snmp4j-version>2.3.0_1</snmp4j-version>
<solr-bundle-version>4.9.0_1</solr-bundle-version>
@@ -645,6 +649,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-cassandraql</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-castor</artifactId>
<version>${project.version}</version>
</dependency>