You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2015/10/07 17:12:25 UTC
[1/2] camel git commit: Upgrade Cassandra to version 2.1.8
Repository: camel
Updated Branches:
refs/heads/master c7a4146d0 -> fac23bd7d
Upgrade Cassandra to version 2.1.8
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/80c2cd3a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/80c2cd3a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/80c2cd3a
Branch: refs/heads/master
Commit: 80c2cd3acf1a1c14b7eaf3a09f62b8de29ff1c8e
Parents: c7a4146
Author: Andrea Cosentino <an...@gmail.com>
Authored: Wed Oct 7 17:02:54 2015 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Wed Oct 7 17:02:54 2015 +0200
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/80c2cd3a/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index b292e1f..2034b05 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -80,7 +80,7 @@
<c3p0-version>0.9.5.1</c3p0-version>
<californium-version>1.0.0-M3</californium-version>
<camel-test-spring-artifactId>camel-test-spring</camel-test-spring-artifactId>
- <cassandra-driver-version>2.1.7.1</cassandra-driver-version>
+ <cassandra-driver-version>2.1.8</cassandra-driver-version>
<cassandra-driver-guava-version>16.0.1</cassandra-driver-guava-version>
<cassandra-version>2.1.8</cassandra-version>
<cassandra-unit-version>2.1.3.1</cassandra-unit-version>
[2/2] camel git commit: Upgrade Cassandra Unit to version 2.1.9.2 and
set reuseForks to false to avoid side effects
Posted by ac...@apache.org.
Upgrade Cassandra Unit to version 2.1.9.2 and set reuseForks to false to avoid side effects
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fac23bd7
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fac23bd7
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fac23bd7
Branch: refs/heads/master
Commit: fac23bd7de175ba1345d191a1c5e1edfad0a16a5
Parents: 80c2cd3
Author: Andrea Cosentino <an...@gmail.com>
Authored: Wed Oct 7 17:03:02 2015 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Wed Oct 7 17:03:02 2015 +0200
----------------------------------------------------------------------
components/camel-cassandraql/pom.xml | 12 ++++++++++++
.../camel/component/cassandra/CassandraUnitUtils.java | 2 +-
parent/pom.xml | 2 +-
3 files changed, 14 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/fac23bd7/components/camel-cassandraql/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-cassandraql/pom.xml b/components/camel-cassandraql/pom.xml
index f329118..aafadb8 100644
--- a/components/camel-cassandraql/pom.xml
+++ b/components/camel-cassandraql/pom.xml
@@ -113,4 +113,16 @@
<scope>test</scope>
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkCount>1</forkCount>
+ <reuseForks>false</reuseForks>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/fac23bd7/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraUnitUtils.java
----------------------------------------------------------------------
diff --git a/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraUnitUtils.java b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraUnitUtils.java
index 30d6c43..5730d19 100644
--- a/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraUnitUtils.java
+++ b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraUnitUtils.java
@@ -60,7 +60,7 @@ public final class CassandraUnitUtils {
}
public static CassandraCQLUnit cassandraCQLUnit(CQLDataSet dataset) {
- return new CassandraCQLUnit(dataset, "/camel-cassandra.yaml", HOST, 9042);
+ return new CassandraCQLUnit(dataset, "/camel-cassandra.yaml");
}
/**
http://git-wip-us.apache.org/repos/asf/camel/blob/fac23bd7/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 2034b05..f11a6ad 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -83,7 +83,7 @@
<cassandra-driver-version>2.1.8</cassandra-driver-version>
<cassandra-driver-guava-version>16.0.1</cassandra-driver-guava-version>
<cassandra-version>2.1.8</cassandra-version>
- <cassandra-unit-version>2.1.3.1</cassandra-unit-version>
+ <cassandra-unit-version>2.1.9.2</cassandra-unit-version>
<castor-version>1.3.3</castor-version>
<castor-bundle-version>1.3.3_1</castor-bundle-version>
<cdi-api-version>1.1</cdi-api-version>