Add DSE 6.8.48, Cassandra 4.1.5 and Cassandra 4.0.13 to the build mat…

…rix (#490)
k8ssandra · May 31, 2024 · 539b251 · 539b251
1 parent 3706fbb
commit 539b251
Show file tree

Hide file tree

Showing 13 changed files with 22 additions and 20 deletions.
diff --git a/.github/workflows/docker-release.yaml b/.github/workflows/docker-release.yaml
@@ -11,10 +11,10 @@ jobs:
       fail-fast: false
       max-parallel: 4
       matrix:
-        dse-version: [6.8.25, 6.8.26, 6.8.28, 6.8.29, 6.8.30, 6.8.31, 6.8.32, 6.8.33, 6.8.34, 6.8.35, 6.8.36, 6.8.37, 6.8.38, 6.8.39, 6.8.40, 6.8.41, 6.8.42, 6.8.43, 6.8.44, 6.8.46, 6.8.47]
+        dse-version: [6.8.25, 6.8.26, 6.8.28, 6.8.29, 6.8.30, 6.8.31, 6.8.32, 6.8.33, 6.8.34, 6.8.35, 6.8.36, 6.8.37, 6.8.38, 6.8.39, 6.8.40, 6.8.41, 6.8.42, 6.8.43, 6.8.44, 6.8.46, 6.8.47, 6.8.48]
         image-base: [jdk8, jdk11]
         include:
-          - dse-version: 6.8.47
+          - dse-version: 6.8.48
             latest: true
     runs-on: ubuntu-latest
     steps:
@@ -108,10 +108,10 @@ jobs:
       fail-fast: false
       max-parallel: 4
       matrix:
-        dse-version: [6.8.25, 6.8.26, 6.8.28, 6.8.29, 6.8.30, 6.8.31, 6.8.32, 6.8.33, 6.8.34, 6.8.35, 6.8.36, 6.8.37, 6.8.38, 6.8.39, 6.8.40, 6.8.41, 6.8.42, 6.8.43, 6.8.44, 6.8.46, 6.8.47]
+        dse-version: [6.8.25, 6.8.26, 6.8.28, 6.8.29, 6.8.30, 6.8.31, 6.8.32, 6.8.33, 6.8.34, 6.8.35, 6.8.36, 6.8.37, 6.8.38, 6.8.39, 6.8.40, 6.8.41, 6.8.42, 6.8.43, 6.8.44, 6.8.46, 6.8.47, 6.8.48]
         image-base: [ubi8]
         include:
-          - dse-version: 6.8.47
+          - dse-version: 6.8.48
             latest: true
     runs-on: ubuntu-latest
     steps:
@@ -248,9 +248,9 @@ jobs:
       fail-fast: false
       max-parallel: 4
       matrix:
-        cassandra-version: [4.0.0, 4.0.1, 4.0.3, 4.0.4, 4.0.5, 4.0.6, 4.0.7, 4.0.8, 4.0.9, 4.0.10, 4.0.11, 4.0.12]
+        cassandra-version: [4.0.0, 4.0.1, 4.0.3, 4.0.4, 4.0.5, 4.0.6, 4.0.7, 4.0.8, 4.0.9, 4.0.10, 4.0.11, 4.0.12, 4.0.13]
         include:
-          - cassandra-version: 4.0.11
+          - cassandra-version: 4.0.13
             latest: true
     runs-on: ubuntu-latest
     steps:
@@ -319,9 +319,9 @@ jobs:
       fail-fast: false
       max-parallel: 4
       matrix:
-        cassandra-version: [4.1.0, 4.1.1, 4.1.2, 4.1.3, 4.1.4]
+        cassandra-version: [4.1.0, 4.1.1, 4.1.2, 4.1.3, 4.1.4, 4.1.5]
         include:
-          - cassandra-version: 4.1.4
+          - cassandra-version: 4.1.5
             latest: true
     runs-on: ubuntu-latest
     steps:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@ Changelog for Management API, new PRs should update the `main / unreleased` sect
 ```
 
 ## unreleased
+* [FEATURE] [#487](https://github.com/k8ssandra/management-api-for-apache-cassandra/issues/487) Add DSE 6.8.48, Cassandra 4.1.5 and Cassandra 4.0.13 to the build matrix
 
 ## v0.1.78 (2024-05-16)
 * [CHANGE] [#486](https://github.com/k8ssandra/management-api-for-apache-cassandra/issues/486) Support HCD

diff --git a/Dockerfile-4_0 b/Dockerfile-4_0
@@ -1,4 +1,4 @@
-ARG CASSANDRA_VERSION=4.0.12
+ARG CASSANDRA_VERSION=4.0.13
 
 FROM --platform=$BUILDPLATFORM maven:3.8.7-eclipse-temurin-11 as builder
 

diff --git a/Dockerfile-4_0.ubi8 b/Dockerfile-4_0.ubi8
@@ -1,6 +1,6 @@
 ARG UBI_MAJOR=8
 ARG UBI_BASETAG=latest
-ARG CASSANDRA_VERSION=4.0.12
+ARG CASSANDRA_VERSION=4.0.13
 FROM registry.access.redhat.com/ubi${UBI_MAJOR}/ubi-minimal:${UBI_BASETAG} AS builder
 
 ARG URL_PREFIX=https://dlcdn.apache.org/cassandra

diff --git a/Dockerfile-4_1 b/Dockerfile-4_1
@@ -1,4 +1,4 @@
-ARG CASSANDRA_VERSION=4.1.4
+ARG CASSANDRA_VERSION=4.1.5
 
 FROM --platform=$BUILDPLATFORM maven:3.8.7-eclipse-temurin-11 as builder
 

diff --git a/Dockerfile-4_1.ubi8 b/Dockerfile-4_1.ubi8
@@ -1,6 +1,6 @@
 ARG UBI_MAJOR=8
 ARG UBI_BASETAG=latest
-ARG CASSANDRA_VERSION=4.1.4
+ARG CASSANDRA_VERSION=4.1.5
 FROM registry.access.redhat.com/ubi${UBI_MAJOR}/ubi-minimal:${UBI_BASETAG} AS builder
 
 ARG URL_PREFIX=https://dlcdn.apache.org/cassandra

diff --git a/README.md b/README.md
@@ -61,14 +61,14 @@ The following versions of Cassandra and DSE are published to Docker and supporte
 | 3.11.11          | 4.0.3           | 4.1.2           | 6.8.28    |
 | 3.11.12          | 4.0.4           | 4.1.3           | 6.8.29    |
 | 3.11.13          | 4.0.5           | 4.1.4           | 6.8.30    |
-| 3.11.14          | 4.0.6           |                 | 6.8.31    |
+| 3.11.14          | 4.0.6           | 4.1.5           | 6.8.31    |
 | 3.11.15          | 4.0.7           |                 | 6.8.32    |
 | 3.11.16          | 4.0.8           |                 | 6.8.33    |
 | 3.11.17          | 4.0.9           |                 | 6.8.34    |
 |                  | 4.0.10          |                 | 6.8.35    |
 |                  | 4.0.11          |                 | 6.8.36    |
 |                  | 4.0.12          |                 | 6.8.37    |
-|                  |                 |                 | 6.8.38    |
+|                  | 4.0.13          |                 | 6.8.38    |
 |                  |                 |                 | 6.8.39    |
 |                  |                 |                 | 6.8.40    |
 |                  |                 |                 | 6.8.41    |
@@ -77,6 +77,7 @@ The following versions of Cassandra and DSE are published to Docker and supporte
 |                  |                 |                 | 6.8.44    |
 |                  |                 |                 | 6.8.46    |
 |                  |                 |                 | 6.8.47    |
+|                  |                 |                 | 6.8.48    |
 
 - Apache Cassandra images are available in `linux/amd64` or `linux/arm64` formats. The DSE images are available only in the `linux/amd64` format.
 - All images (with the exception of Cassandra trunk) are available as an Ubuntu based image or a RedHat UBI 8 based image.

diff --git a/dse-68/Dockerfile.jdk11 b/dse-68/Dockerfile.jdk11
@@ -10,7 +10,7 @@ ENV DSE_HOME /opt/dse
 ENV DSE_AGENT_HOME /opt/agent
 
 # Get commandline parameters
-ARG DSE_VERSION=6.8.47
+ARG DSE_VERSION=6.8.48
 ARG URL_PREFIX=https://downloads.datastax.com/enterprise
 ARG TARBALL=dse-${DSE_VERSION}-bin.tar.gz
 ARG DOWNLOAD_URL=${URL_PREFIX}/${TARBALL}

diff --git a/dse-68/Dockerfile.jdk8 b/dse-68/Dockerfile.jdk8
@@ -10,7 +10,7 @@ ENV DSE_HOME /opt/dse
 ENV DSE_AGENT_HOME /opt/agent
 
 # Get commandline parameters
-ARG DSE_VERSION=6.8.47
+ARG DSE_VERSION=6.8.48
 ARG URL_PREFIX=https://downloads.datastax.com/enterprise
 ARG TARBALL=dse-${DSE_VERSION}-bin.tar.gz
 ARG DOWNLOAD_URL=${URL_PREFIX}/${TARBALL}

diff --git a/dse-68/Dockerfile.ubi8 b/dse-68/Dockerfile.ubi8
@@ -1,4 +1,4 @@
-ARG DSE_VERSION=6.8.47
+ARG DSE_VERSION=6.8.48
 ARG UBI_MAJOR=8
 ARG UBI_BASETAG=latest
 

diff --git a/management-api-agent-4.1.x/pom.xml b/management-api-agent-4.1.x/pom.xml
@@ -16,7 +16,7 @@
   <version>${revision}</version>
   <artifactId>datastax-mgmtapi-agent-4.1.x</artifactId>
   <properties>
-    <cassandra4.version>4.1.4</cassandra4.version>
+    <cassandra4.version>4.1.5</cassandra4.version>
   </properties>
   <dependencies>
     <dependency>

diff --git a/management-api-agent-dse-6.8/pom.xml b/management-api-agent-dse-6.8/pom.xml
@@ -30,7 +30,7 @@
     </repository>
   </repositories>
   <properties>
-    <dse.version>6.8.47</dse.version>
+    <dse.version>6.8.48</dse.version>
   </properties>
   <dependencies>
     <dependency>

diff --git a/pom.xml b/pom.xml
@@ -18,7 +18,7 @@
     <revision>0.1.0-SNAPSHOT</revision>
     <driver.version>4.15.0</driver.version>
     <cassandra3.version>3.11.17</cassandra3.version>
-    <cassandra4.version>4.0.12</cassandra4.version>
+    <cassandra4.version>4.0.13</cassandra4.version>
     <docker.java.version>3.3.6</docker.java.version>
     <junit.version>4.13.2</junit.version>
     <assertj.version>3.17.2</assertj.version>