From 4dc878ccce1219a78cd64c3bdaee78421c68d11d Mon Sep 17 00:00:00 2001
From: talig <talig@amdocs.com>
Date: Mon, 11 Jun 2018 12:28:33 +0300
Subject: Upgrade datastax cassandra driver to 3.4.0

Upgrage zusammen to 1.0.0 which uses datastax cassandra driver 3.4.0

Change-Id: Ie7217986b67cd95de015daedd0f7106c2d0a972d
Issue-ID: SDC-1416
Signed-off-by: talig <talig@amdocs.com>
---
 .../openecomp-nosqldb-lib/openecomp-nosqldb-api/pom.xml          | 9 +++++++--
 .../core/nosqldb/impl/cassandra/CassandraSessionFactory.java     | 3 ++-
 2 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib')

diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-api/pom.xml b/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-api/pom.xml
index 5e50fc69b6..38863bd88f 100644
--- a/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-api/pom.xml
+++ b/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-api/pom.xml
@@ -27,12 +27,17 @@
         <dependency>
             <groupId>com.datastax.cassandra</groupId>
             <artifactId>cassandra-driver-core</artifactId>
-            <version>${datasatx.version}</version>
+            <version>${datastax.cassandra.version}</version>
         </dependency>
         <dependency>
             <groupId>com.datastax.cassandra</groupId>
             <artifactId>cassandra-driver-mapping</artifactId>
-            <version>${datasatx.version}</version>
+            <version>${datastax.cassandra.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.datastax.cassandra</groupId>
+            <artifactId>cassandra-driver-extras</artifactId>
+            <version>${datastax.cassandra.version}</version>
         </dependency>
         <dependency>
             <groupId>org.openecomp.sdc.core</groupId>
diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-core/src/main/java/org/openecomp/core/nosqldb/impl/cassandra/CassandraSessionFactory.java b/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-core/src/main/java/org/openecomp/core/nosqldb/impl/cassandra/CassandraSessionFactory.java
index f06817965b..ee7ef2eef0 100644
--- a/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-core/src/main/java/org/openecomp/core/nosqldb/impl/cassandra/CassandraSessionFactory.java
+++ b/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-core/src/main/java/org/openecomp/core/nosqldb/impl/cassandra/CassandraSessionFactory.java
@@ -19,6 +19,7 @@ package org.openecomp.core.nosqldb.impl.cassandra;
 import com.datastax.driver.core.Cluster;
 import com.datastax.driver.core.ConsistencyLevel;
 import com.datastax.driver.core.QueryOptions;
+import com.datastax.driver.core.RemoteEndpointAwareJdkSSLOptions;
 import com.datastax.driver.core.SSLOptions;
 import com.datastax.driver.core.Session;
 import com.datastax.driver.core.policies.DCAwareRoundRobinPolicy;
@@ -132,7 +133,7 @@ public class CassandraSessionFactory {
 
         SSLContext context = getSslContext(trustStorePath.get(), trustStorePassword.get());
         String[] css = new String[]{"TLS_RSA_WITH_AES_128_CBC_SHA"};
-        return new SSLOptions(context, css);
+        return RemoteEndpointAwareJdkSSLOptions.builder().withSSLContext(context).withCipherSuites(css).build();
     }
 
     private static SSLContext getSslContext(String truststorePath, String trustStorePassword) {
-- 
cgit 1.2.3-korg