diff --git a/.github/workflows/docker-release.yaml b/.github/workflows/docker-release.yaml
index 057686c7..94d256b2 100644
--- a/.github/workflows/docker-release.yaml
+++ b/.github/workflows/docker-release.yaml
@@ -10,10 +10,10 @@ jobs:
strategy:
fail-fast: false
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]
+ 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]
image-base: [jdk8, jdk11]
include:
- - dse-version: 6.8.39
+ - dse-version: 6.8.40
latest: true
runs-on: ubuntu-latest
steps:
@@ -106,10 +106,10 @@ jobs:
strategy:
fail-fast: false
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]
+ 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]
image-base: [ubi8]
include:
- - dse-version: 6.8.39
+ - dse-version: 6.8.40
latest: true
runs-on: ubuntu-latest
steps:
@@ -244,9 +244,9 @@ jobs:
strategy:
fail-fast: false
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]
+ 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]
include:
- - cassandra-version: 4.0.10
+ - cassandra-version: 4.0.11
latest: true
runs-on: ubuntu-latest
steps:
@@ -314,9 +314,9 @@ jobs:
strategy:
fail-fast: false
matrix:
- cassandra-version: [4.1.0, 4.1.1, 4.1.2]
+ cassandra-version: [4.1.0, 4.1.1, 4.1.2, 4.1.3]
include:
- - cassandra-version: 4.1.2
+ - cassandra-version: 4.1.3
latest: true
runs-on: ubuntu-latest
steps:
@@ -384,9 +384,9 @@ jobs:
strategy:
fail-fast: false
matrix:
- cassandra-version: [5.0-alpha1]
+ cassandra-version: [5.0-alpha2]
include:
- - cassandra-version: 5.0-alpha1
+ - cassandra-version: 5.0-alpha2
latest: true
runs-on: ubuntu-latest
steps:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 169833fb..c3311e75 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,8 @@ Changelog for Management API, new PRs should update the `main / unreleased` sect
* [BUGFIX] [#413](https://github.com/k8ssandra/management-api-for-apache-cassandra/issues/413) UBI8 images do not terminate correctly
* [BUGFIX] [#360](https://github.com/k8ssandra/management-api-for-apache-cassandra/issues/360) Support Cassandra 5.0-alpha1
* [FEATURE] [#398](https://github.com/k8ssandra/management-api-for-apache-cassandra/issues/398) Make Management API port configurable
+* [FEATURE] [#419](https://github.com/k8ssandra/management-api-for-apache-cassandra/issues/419) Add DSE 6.8.40 to the build matrix
+* [FEATURE] [#397](https://github.com/k8ssandra/management-api-for-apache-cassandra/issues/397) Add Cassandra 4.0.11, 4.1.3 5.0-alpha2
## v0.1.70 (2023-10-17)
* [BUGFIX] [#411](https://github.com/k8ssandra/management-api-for-apache-cassandra/pull/411) Serialize long types as Strings to avoid float64 conversion
diff --git a/Dockerfile-4_0 b/Dockerfile-4_0
index 612f1e5e..ff5a9c13 100644
--- a/Dockerfile-4_0
+++ b/Dockerfile-4_0
@@ -1,4 +1,4 @@
-ARG CASSANDRA_VERSION=4.0.10
+ARG CASSANDRA_VERSION=4.0.11
FROM --platform=$BUILDPLATFORM maven:3.8.7-eclipse-temurin-11 as builder
diff --git a/Dockerfile-4_0.ubi8 b/Dockerfile-4_0.ubi8
index 5c70a699..84759cd7 100644
--- 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.10
+ARG CASSANDRA_VERSION=4.0.11
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
index 311e461c..94f484ff 100644
--- a/Dockerfile-4_1
+++ b/Dockerfile-4_1
@@ -1,4 +1,4 @@
-ARG CASSANDRA_VERSION=4.1.2
+ARG CASSANDRA_VERSION=4.1.3
FROM --platform=$BUILDPLATFORM maven:3.8.7-eclipse-temurin-11 as builder
diff --git a/Dockerfile-4_1.ubi8 b/Dockerfile-4_1.ubi8
index c9b8f02e..ca549261 100644
--- 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.2
+ARG CASSANDRA_VERSION=4.1.3
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
index f769d285..501e0576 100644
--- a/README.md
+++ b/README.md
@@ -59,17 +59,18 @@ The following versions of Cassandra and DSE are published to Docker and supporte
| 3.11.7 | 4.0.0 | 4.1.0 | 6.8.25 |
| 3.11.8 | 4.0.1 | 4.1.1 | 6.8.26 |
| 3.11.11 | 4.0.3 | 4.1.2 | 6.8.28 |
-| 3.11.12 | 4.0.4 | | 6.8.29 |
+| 3.11.12 | 4.0.4 | 4.1.3 | 6.8.29 |
| 3.11.13 | 4.0.5 | | 6.8.30 |
| 3.11.14 | 4.0.6 | | 6.8.31 |
| 3.11.15 | 4.0.7 | | 6.8.32 |
| 3.11.16 | 4.0.8 | | 6.8.33 |
| | 4.0.9 | | 6.8.34 |
| | 4.0.10 | | 6.8.35 |
-| | | | 6.8.36 |
+| | 4.0.11 | | 6.8.36 |
| | | | 6.8.37 |
| | | | 6.8.38 |
| | | | 6.8.39 |
+| | | | 6.8.40 |
- All supported images are available in `linux/amd64` or `linux/arm64` formats.
- 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
index 8ebde3aa..93ba3bc0 100644
--- 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.39
+ARG DSE_VERSION=6.8.40
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
index 081fc50e..b30d0af4 100644
--- 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.39
+ARG DSE_VERSION=6.8.40
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
index 9bf0b24a..40f720fc 100644
--- a/dse-68/Dockerfile.ubi8
+++ b/dse-68/Dockerfile.ubi8
@@ -1,4 +1,4 @@
-ARG DSE_VERSION=6.8.39
+ARG DSE_VERSION=6.8.40
ARG UBI_MAJOR=8
ARG UBI_BASETAG=latest
diff --git a/management-api-agent-5.0.x/pom.xml b/management-api-agent-5.0.x/pom.xml
index 04816c02..b898486d 100644
--- a/management-api-agent-5.0.x/pom.xml
+++ b/management-api-agent-5.0.x/pom.xml
@@ -16,7 +16,7 @@
${revision}
datastax-mgmtapi-agent-5.0.x
- 5.0-alpha1
+ 5.0-alpha2
diff --git a/management-api-agent-dse-6.8/pom.xml b/management-api-agent-dse-6.8/pom.xml
index 2dfc60c8..20fb47a0 100644
--- a/management-api-agent-dse-6.8/pom.xml
+++ b/management-api-agent-dse-6.8/pom.xml
@@ -30,7 +30,7 @@
- 6.8.39
+ 6.8.40