IGNITE-10856 Upgrade cassandra driver version to fix Guava conflict - Fixes #5780.
authorsamaitra <saikat.maitra@gmail.com>
Thu, 10 Jan 2019 09:29:38 +0000 (12:29 +0300)
committerIlya Kasnacheev <ilya.kasnacheev@gmail.com>
Thu, 10 Jan 2019 12:17:24 +0000 (15:17 +0300)
Signed-off-by: Ilya Kasnacheev <ilya.kasnacheev@gmail.com>
modules/cassandra/store/pom.xml
modules/cassandra/store/src/test/java/org/apache/ignite/tests/utils/CassandraHelper.java
modules/cassandra/store/src/test/java/org/apache/ignite/tests/utils/CassandraLifeCycleBean.java

index f90951f..364adaf 100644 (file)
@@ -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>
index 2f9c6de..74e9783 100644 (file)
@@ -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);
index d70d71e..6ddc754 100644 (file)
@@ -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();
         }