Upgrade to Cassandra 3.11.13/4.0.4 (#191)

* Upgrade to Cassandra 3.11.13/4.0.4 * Change Cassandra binary download to archives
k8ssandra · Jun 1, 2022 · b52908e · b52908e
1 parent 7793116
commit b52908e
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 15 deletions.
diff --git a/.github/workflows/docker-release.yaml b/.github/workflows/docker-release.yaml
@@ -87,7 +87,7 @@ jobs:
             --file Dockerfile-4_0 \
             --target oss40 \
             --platform linux/amd64,linux/arm64 .
-  build-oss-4_0_3:
+  build-oss-4_0_4:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@master
@@ -104,10 +104,10 @@ jobs:
         run: |
           RELEASE_VERSION="${GITHUB_REF##*/}"
           docker buildx build --push \
-            --build-arg CASSANDRA_VERSION=4.0.3 \
+            --build-arg CASSANDRA_VERSION=4.0.4 \
             --tag k8ssandra/cass-management-api:4.0 \
-            --tag k8ssandra/cass-management-api:4.0.3 \
-            --tag k8ssandra/cass-management-api:4.0.3-$RELEASE_VERSION \
+            --tag k8ssandra/cass-management-api:4.0.4 \
+            --tag k8ssandra/cass-management-api:4.0.4-$RELEASE_VERSION \
             --file Dockerfile-4_0 \
             --target oss40 \
             --platform linux/amd64,linux/arm64 .
@@ -180,7 +180,7 @@ jobs:
             --file Dockerfile-oss \
             --target oss311 \
             --platform linux/amd64,linux/arm64 .
-  build-oss-3_11_12:
+  build-oss-3_11_13:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@master
@@ -197,10 +197,10 @@ jobs:
         run: |
           RELEASE_VERSION="${GITHUB_REF##*/}"
           docker buildx build --push \
-            --build-arg CASSANDRA_VERSION=3.11.12 \
+            --build-arg CASSANDRA_VERSION=3.11.13 \
             --tag k8ssandra/cass-management-api:3.11 \
-            --tag k8ssandra/cass-management-api:3.11.12 \
-            --tag k8ssandra/cass-management-api:3.11.12-$RELEASE_VERSION \
+            --tag k8ssandra/cass-management-api:3.11.13 \
+            --tag k8ssandra/cass-management-api:3.11.13-$RELEASE_VERSION \
             --file Dockerfile-oss \
             --target oss311 \
             --platform linux/amd64,linux/arm64 .
diff --git a/Dockerfile-4_0 b/Dockerfile-4_0
@@ -1,4 +1,4 @@
-ARG CASSANDRA_VERSION=4.0.3
+ARG CASSANDRA_VERSION=4.0.4
 
 FROM --platform=$BUILDPLATFORM maven:3.6.3-jdk-8-slim as builder
 

diff --git a/Dockerfile-oss b/Dockerfile-oss
@@ -1,4 +1,4 @@
-ARG CASSANDRA_VERSION=3.11.12
+ARG CASSANDRA_VERSION=3.11.13
 
 FROM --platform=$BUILDPLATFORM maven:3.6.3-jdk-8-slim as builder
 

diff --git a/management-api-agent-3.x/pom.xml b/management-api-agent-3.x/pom.xml
@@ -12,7 +12,6 @@
     <artifactId>datastax-mgmtapi-agent-3.x</artifactId>
 
     <properties>
-        <cassandra3.version>3.11.12</cassandra3.version>
         <bytebuddy.version>1.10.10</bytebuddy.version>
         <docker.java.version>3.1.5</docker.java.version>
         <build.version.file>build_version.sh</build.version.file>

diff --git a/management-api-agent-4.x/pom.xml b/management-api-agent-4.x/pom.xml
@@ -12,7 +12,6 @@
     <artifactId>datastax-mgmtapi-agent-4.x</artifactId>
 
     <properties>
-        <cassandra4.version>4.0.3</cassandra4.version>
         <bytebuddy.version>1.10.10</bytebuddy.version>
         <docker.java.version>3.1.5</docker.java.version>
         <build.version.file>build_version.sh</build.version.file>

diff --git a/management-api-agent-common/pom.xml b/management-api-agent-common/pom.xml
@@ -12,7 +12,6 @@
     <artifactId>datastax-mgmtapi-agent-common</artifactId>
 
     <properties>
-        <cassandra3.version>3.11.12</cassandra3.version>
         <bytebuddy.version>1.10.10</bytebuddy.version>
         <docker.java.version>3.1.5</docker.java.version>
         <build.version.file>build_version.sh</build.version.file>

diff --git a/management-api-common/pom.xml b/management-api-common/pom.xml
@@ -15,7 +15,6 @@
         <slf4j.version>1.7.25</slf4j.version>
         <logback.version>1.2.3</logback.version>
         <netty.version>4.1.50.Final</netty.version>
-        <cassandra3.version>3.11.12</cassandra3.version>
         <junit.version>4.13.1</junit.version>
         <mockito.version>3.5.13</mockito.version>
     </properties>

diff --git a/management-api-server/pom.xml b/management-api-server/pom.xml
@@ -20,7 +20,6 @@
         <jaxrs.version>2.1.6</jaxrs.version>
         <resteasy.version>4.5.9.Final</resteasy.version>
         <netty.version>4.1.50.Final</netty.version>
-        <cassandra3.version>3.11.12</cassandra3.version>
         <docker.java.version>3.2.8</docker.java.version>
         <awaitility.version>4.0.3</awaitility.version>
         <assertj.version>3.17.2</assertj.version>

diff --git a/pom.xml b/pom.xml
@@ -12,6 +12,8 @@
         <build.version.file>build_version.sh</build.version.file>
         <revision>0.1.0-SNAPSHOT</revision>
         <driver.version>4.11.1</driver.version>
+        <cassandra3.version>3.11.13</cassandra3.version>
+        <cassandra4.version>4.0.4</cassandra4.version>
     </properties>
 
     <dependencies>