You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by il...@apache.org on 2019/01/10 12:17:58 UTC
[ignite] branch master updated: IGNITE-10856 Upgrade cassandra
driver version to fix Guava conflict - Fixes #5780.
This is an automated email from the ASF dual-hosted git repository.
ilyak pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new ad6a7ee IGNITE-10856 Upgrade cassandra driver version to fix Guava conflict - Fixes #5780.
ad6a7ee is described below
commit ad6a7ee5840d84bc5603a753006efc521c381727
Author: samaitra <sa...@gmail.com>
AuthorDate: Thu Jan 10 12:29:38 2019 +0300
IGNITE-10856 Upgrade cassandra driver version to fix Guava conflict - Fixes #5780.
Signed-off-by: Ilya Kasnacheev <il...@gmail.com>
---
modules/cassandra/store/pom.xml | 4 ++--
.../src/test/java/org/apache/ignite/tests/utils/CassandraHelper.java | 4 +++-
.../java/org/apache/ignite/tests/utils/CassandraLifeCycleBean.java | 1 +
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/modules/cassandra/store/pom.xml b/modules/cassandra/store/pom.xml
index f90951f..364adaf 100644
--- a/modules/cassandra/store/pom.xml
+++ b/modules/cassandra/store/pom.xml
@@ -36,8 +36,8 @@
<properties>
<commons-beanutils.version>1.9.2</commons-beanutils.version>
- <cassandra-driver.version>3.0.0</cassandra-driver.version>
- <cassandra-all.version>3.3</cassandra-all.version>
+ <cassandra-driver.version>3.2.0</cassandra-driver.version>
+ <cassandra-all.version>3.11.3</cassandra-all.version>
<netty.version>4.1.27.Final</netty.version>
<metrics-core.version>3.0.2</metrics-core.version>
</properties>
diff --git a/modules/cassandra/store/src/test/java/org/apache/ignite/tests/utils/CassandraHelper.java b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/utils/CassandraHelper.java
index 2f9c6de..74e9783 100644
--- a/modules/cassandra/store/src/test/java/org/apache/ignite/tests/utils/CassandraHelper.java
+++ b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/utils/CassandraHelper.java
@@ -326,7 +326,9 @@ public class CassandraHelper {
}
}
- /** */
+ /**
+ * Note that setting of cassandra.storagedir property is expected.
+ */
public static void startEmbeddedCassandra(Logger log) {
ClassLoader clsLdr = CassandraHelper.class.getClassLoader();
URL url = clsLdr.getResource(EMBEDDED_CASSANDRA_YAML);
diff --git a/modules/cassandra/store/src/test/java/org/apache/ignite/tests/utils/CassandraLifeCycleBean.java b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/utils/CassandraLifeCycleBean.java
index d70d71e..6ddc754 100644
--- a/modules/cassandra/store/src/test/java/org/apache/ignite/tests/utils/CassandraLifeCycleBean.java
+++ b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/utils/CassandraLifeCycleBean.java
@@ -107,6 +107,7 @@ public class CassandraLifeCycleBean implements LifecycleBean {
System.setProperty(CASSANDRA_CONFIG_PROP, FILE_PREFIX + cassandraCfgFile);
embeddedCassandraDaemon = new CassandraDaemon(true);
+ embeddedCassandraDaemon.applyConfig();
embeddedCassandraDaemon.init(null);
embeddedCassandraDaemon.start();
}