summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortalig <talig@amdocs.com>2019-11-17 09:34:45 +0200
committertalig <talig@amdocs.com>2019-11-17 09:34:45 +0200
commitcb4dca5c0fb48e4766b3041ac7751ca60547539d (patch)
tree4f89331d68f6cdfbbb5437e350277e9fab6a9565
parente6d807840818020bd18260703a16e6c36cf3b9c2 (diff)
Upgrade to cassandra zusammen 1.0.3 which uses datastax 3.6.0
Issue-ID: SDC-2541 Signed-off-by: talig <talig@amdocs.com> Change-Id: Idaf3ec4794caf228b616941a977d3e7d9924ee1e
-rw-r--r--pom.xml4
-rw-r--r--zusammen-lib/pom.xml4
-rw-r--r--zusammen-lib/src/main/java/org/onap/sdc/common/zusammen/config/ZusammenConfig.java2
3 files changed, 5 insertions, 5 deletions
diff --git a/pom.xml b/pom.xml
index fc2333b..e02213c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,6 +36,7 @@
<snapshots.path>snapshots</snapshots.path>
<releases.path>releases</releases.path>
<sitePath>/content/sites/site/org/onap/sdc/sdc-be-common/${project.version}</sitePath>
+ <nexus.proxy>https://nexus.onap.org</nexus.proxy>
<docker.username>docker</docker.username>
<docker.password>docker</docker.password>
</properties>
@@ -57,8 +58,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
- <!--<version>2.1.5.RELEASE</version>-->
- <version>2.0.3.RELEASE</version>
+ <version>2.1.5.RELEASE</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git a/zusammen-lib/pom.xml b/zusammen-lib/pom.xml
index f76b377..6a63470 100644
--- a/zusammen-lib/pom.xml
+++ b/zusammen-lib/pom.xml
@@ -30,8 +30,8 @@
<properties>
<zusammen.version>1.0.1</zusammen.version>
- <zusammen-state-store.version>1.0.1</zusammen-state-store.version>
- <zusammen-collaboration-store.version>1.0.1</zusammen-collaboration-store.version>
+ <zusammen-state-store.version>1.0.3</zusammen-state-store.version>
+ <zusammen-collaboration-store.version>1.0.3</zusammen-collaboration-store.version>
<zusammen-index-store.version>1.0.0</zusammen-index-store.version>
</properties>
diff --git a/zusammen-lib/src/main/java/org/onap/sdc/common/zusammen/config/ZusammenConfig.java b/zusammen-lib/src/main/java/org/onap/sdc/common/zusammen/config/ZusammenConfig.java
index 920b07a..2a37f89 100644
--- a/zusammen-lib/src/main/java/org/onap/sdc/common/zusammen/config/ZusammenConfig.java
+++ b/zusammen-lib/src/main/java/org/onap/sdc/common/zusammen/config/ZusammenConfig.java
@@ -50,7 +50,7 @@ public class ZusammenConfig {
@PostConstruct
public void init() {
System.setProperty("cassandra.nodes", provider.getCassandraAddresses());
- System.setProperty("cassandra.ssl.port", provider.getCassandraPort());
+ System.setProperty("cassandra.port", provider.getCassandraPort());
System.setProperty("cassandra.keyspace", KEYSPACE);
System.setProperty("cassandra.authenticate", Boolean.toString(Boolean.valueOf(provider.getCassandraAuth())));