From bf4c7a92041461ef93264614ea8321a6ddbc1de3 Mon Sep 17 00:00:00 2001
From: Stefan Miklosovic <stefan.miklosovic@instaclustr.com>
Date: Thu, 29 Aug 2019 16:15:43 +0200
Subject: [PATCH] update to Cassandra 3.11.4

---
 docker/cassandra/Dockerfile         | 2 +-
 docker/cassandra/Makefile           | 2 +-
 examples/go/example-datacenter.yaml | 2 +-
 java/k8s-addons/pom.xml             | 5 ++---
 java/pom.xml                        | 1 +
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docker/cassandra/Dockerfile b/docker/cassandra/Dockerfile
index 040a6558..b37eca47 100644
--- a/docker/cassandra/Dockerfile
+++ b/docker/cassandra/Dockerfile
@@ -2,7 +2,7 @@ ARG openjre_image
 
 FROM ${openjre_image}
 
-ARG cassandra_version=3.11.2
+ARG cassandra_version=3.11.4
 ARG cassandra_k8s_addons_jar
 
 COPY install-cassandra /tmp/install-cassandra
diff --git a/docker/cassandra/Makefile b/docker/cassandra/Makefile
index 4aa4785a..629504b6 100644
--- a/docker/cassandra/Makefile
+++ b/docker/cassandra/Makefile
@@ -1,6 +1,6 @@
 include ../base-openjre/Makefile
 
-CASSANDRA_VERSION := 3.11.3
+CASSANDRA_VERSION := 3.11.4
 
 CASSANDRA_K8S_ADDONS_VERSION := 1.0-SNAPSHOT
 CASSANDRA_K8S_ADDONS_JAR := cassandra-k8s-addons-$(CASSANDRA_K8S_ADDONS_VERSION).jar
diff --git a/examples/go/example-datacenter.yaml b/examples/go/example-datacenter.yaml
index 3edc64ee..01174256 100644
--- a/examples/go/example-datacenter.yaml
+++ b/examples/go/example-datacenter.yaml
@@ -17,7 +17,7 @@ spec:
     - name: "west1-a"
       labels:
         failure-domain.beta.kubernetes.io/zone: europe-west1-a
-  cassandraImage: "gcr.io/cassandra-operator/cassandra:3.11.3"
+  cassandraImage: "gcr.io/cassandra-operator/cassandra:3.11.4"
   sidecarImage: "gcr.io/cassandra-operator/cassandra-sidecar:latest"
   imagePullPolicy: IfNotPresent
   imagePullSecrets:
diff --git a/java/k8s-addons/pom.xml b/java/k8s-addons/pom.xml
index 6f83821f..f7badf71 100644
--- a/java/k8s-addons/pom.xml
+++ b/java/k8s-addons/pom.xml
@@ -18,18 +18,17 @@
         <dependency>
             <groupId>org.apache.cassandra</groupId>
             <artifactId>cassandra-all</artifactId>
-            <version>3.11.4</version>
+            <version>${cassandra.version}</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
 
-
     <build>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>3.1.0</version>
+                <version>${maven.jar.plugin.version}</version>
             </plugin>
         </plugins>
     </build>
diff --git a/java/pom.xml b/java/pom.xml
index a8409912..c9b7c009 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -17,6 +17,7 @@
     </modules>
 
     <properties>
+        <cassandra.version>3.11.4</cassandra.version>
         <guice.version>4.2.2</guice.version>
         <guice.bridge.version>2.5.0-b42</guice.bridge.version>
         <jersey.version>2.28</jersey.version>