JAMES-4142 Upgrade Docker cassandra image to 5.0.4

Arsnael · Arsnael · commit 1caaea2c2006 · 2025-08-01T15:20:45.000+07:00
diff --git a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/ClusterFactory.java b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/ClusterFactory.java
@@ -92,6 +92,6 @@ private static void createKeyspace(KeyspaceConfiguration keyspaceConfiguration,
     }
 
     private static void ensureContactable(CqlSession session) {
-        session.execute("SELECT dateof(now()) FROM system.local ;");
+        session.execute("SELECT toTimestamp(now()) FROM system.local ;");
     }
 }
diff --git a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandra.java b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandra.java
@@ -137,7 +137,7 @@ private static Optional<String> getFixedBuildId() {
 
     @SuppressWarnings("resource")
     public DockerCassandra() {
-        this("cassandra_4_1_5-" + buildSpecificImageDiscriminator(),
+        this("cassandra_5_0_4-" + buildSpecificImageDiscriminator(),
             getFixedBuildId().isEmpty(),
             AdditionalDockerFileStep.IDENTITY);
     }
@@ -181,7 +181,7 @@ public void close() {
             new ImageFromDockerfile(imageName,deleteImageAfterUsage)
                 .withDockerfileFromBuilder(builder ->
                     additionalSteps.applyStep(builder
-                        .from("cassandra:4.1.9")
+                        .from("cassandra:5.0.4")
                         .env("CASSANDRA_CONFIG", "/etc/cassandra")
                         .run(memorySettingCommand
                             + "&& echo \"-Dcassandra.skip_wait_for_gossip_to_settle=0\" >> " + JVM_OPTIONS
diff --git a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/init/ClusterFactoryTest.java b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/init/ClusterFactoryTest.java
@@ -66,7 +66,7 @@ void createShouldReturnAContactableCluster(DockerCassandra dockerCassandra) {
 
     void assertThatClusterIsContactable(CqlSession session) {
         try {
-            session.execute("SELECT dateof(now()) FROM system.local ;");
+            session.execute("SELECT toTimestamp(now()) FROM system.local ;");
         } catch (Exception e) {
             throw new AssertionError("expecting cluster can be connected but actually not", e);
         }
diff --git a/docs/modules/servers/pages/distributed/operate/logging/docker-compose-block.adoc b/docs/modules/servers/pages/distributed/operate/logging/docker-compose-block.adoc
@@ -35,7 +35,7 @@ services:
       - discovery.type=single-node
 
   cassandra:
-    image: cassandra:4.1.9
+    image: cassandra:5.0.4
     ports:
       - "9042:9042"
 
diff --git a/docs/modules/servers/pages/distributed/run/run-docker.adoc b/docs/modules/servers/pages/distributed/run/run-docker.adoc
@@ -53,7 +53,7 @@ Firstly, create your own user network on Docker for the James environment:
 
 You need a running *cassandra* in docker which connects to *james* network. To achieve this run:
 
-    $ docker run -d --network james --name=cassandra cassandra:4.1.9
+    $ docker run -d --network james --name=cassandra cassandra:5.0.4
 
 You need a running *rabbitmq* in docker which connects to *james* network. To achieve this run:
 
diff --git a/docs/modules/servers/pages/distributed/run/run-java.adoc b/docs/modules/servers/pages/distributed/run/run-java.adoc
@@ -50,7 +50,7 @@ running. You can either install the servers or launch them via docker:
 
 [source,bash]
 ----
-$ docker run -d -p 9042:9042 --name=cassandra cassandra:4.1.9
+$ docker run -d -p 9042:9042 --name=cassandra cassandra:5.0.4
 $ docker run -d --network james -p 9200:9200 --name=opensearch --env 'discovery.type=single-node' opensearchproject/opensearch:2.19.2
 $ docker run -d -p 5672:5672 -p 15672:15672 --name=rabbitmq rabbitmq:4.1.1-management
 $ docker run -d --env 'REMOTE_MANAGEMENT_DISABLE=1' --env 'SCALITY_ACCESS_KEY_ID=accessKey1' --env 'SCALITY_SECRET_ACCESS_KEY=secretKey1' --name=s3 ghcr.io/scality/cloudserver:c1ba296859690c1cbbec609aaae430f6b04b4745
diff --git a/server/apps/cassandra-app/README.adoc b/server/apps/cassandra-app/README.adoc
@@ -26,7 +26,7 @@ Third party compulsory dependencies:
 
 [source]
 ----
-$ docker run -d --network james -p 9042:9042 --name=cassandra cassandra:4.1.9
+$ docker run -d --network james -p 9042:9042 --name=cassandra cassandra:5.0.4
 $ docker run -d --network james -p 9200:9200 --name=opensearch --env 'discovery.type=single-node' opensearchproject/opensearch:2.19.2
 ----
 
diff --git a/server/apps/cassandra-app/docker-compose.yml b/server/apps/cassandra-app/docker-compose.yml
@@ -39,7 +39,7 @@ services:
       - DISABLE_SECURITY_PLUGIN=true
 
   cassandra:
-    image: cassandra:4.1.9
+    image: cassandra:5.0.4
     ports:
       - "9042:9042"
     healthcheck:
diff --git a/server/apps/distributed-app/README.adoc b/server/apps/distributed-app/README.adoc
@@ -17,7 +17,7 @@ Third party compulsory dependencies:
 
 [source]
 ----
-$ docker run -d --network james -p 9042:9042 --name=cassandra cassandra:4.1.9
+$ docker run -d --network james -p 9042:9042 --name=cassandra cassandra:5.0.4
 $ docker run -d --network james -p 9200:9200 --name=opensearch --env 'discovery.type=single-node' --env 'DISABLE_SECURITY_PLUGIN=true' --env 'DISABLE_INSTALL_DEMO_CONFIG=true' opensearchproject/opensearch:2.19.2
 $ docker run -d --network james -p 5672:5672 -p 15672:15672 --name=rabbitmq rabbitmq:4.1.1-management
 $ docker run -d --network james -p 8000:8000 --env 'REMOTE_MANAGEMENT_DISABLE=1' --env 'SCALITY_ACCESS_KEY_ID=accessKey1' --env 'SCALITY_SECRET_ACCESS_KEY=secretKey1' --name=s3 ghcr.io/scality/cloudserver:c1ba296859690c1cbbec609aaae430f6b04b4745
diff --git a/server/apps/distributed-app/docker-compose-with-pulsar.yml b/server/apps/distributed-app/docker-compose-with-pulsar.yml
@@ -48,7 +48,7 @@ services:
 
   cassandra:
     container_name: cassandra
-    image: cassandra:4.1.9
+    image: cassandra:5.0.4
     ports:
       - "9042:9042"
     healthcheck:
diff --git a/server/apps/distributed-app/docker-compose.yml b/server/apps/distributed-app/docker-compose.yml
@@ -43,7 +43,7 @@ services:
           - elasticsearch
 
   cassandra:
-    image: cassandra:4.1.9
+    image: cassandra:5.0.4
     ports:
       - "9042:9042"
     healthcheck:
diff --git a/server/apps/distributed-pop3-app/README.adoc b/server/apps/distributed-pop3-app/README.adoc
@@ -19,7 +19,7 @@ Third party compulsory dependencies:
 
 [source]
 ----
-$ docker run -d --network james -p 9042:9042 --name=cassandra cassandra:4.1.9
+$ docker run -d --network james -p 9042:9042 --name=cassandra cassandra:5.0.4
 $ docker run -d --network james -p 5672:5672 -p 15672:15672 --name=rabbitmq rabbitmq:4.1.1-management
 $ docker run -d --network james --env 'REMOTE_MANAGEMENT_DISABLE=1' --env 'SCALITY_ACCESS_KEY_ID=accessKey1' --env 'SCALITY_SECRET_ACCESS_KEY=secretKey1' --name=s3 ghcr.io/scality/cloudserver:c1ba296859690c1cbbec609aaae430f6b04b4745
 ----
diff --git a/server/apps/distributed-pop3-app/docker-compose.yml b/server/apps/distributed-pop3-app/docker-compose.yml
@@ -43,7 +43,7 @@ services:
           - elasticsearch
 
   cassandra:
-    image: cassandra:4.1.9
+    image: cassandra:5.0.4
     ports:
       - "9042:9042"
     healthcheck:
diff --git a/server/task/task-distributed/src/test/java/org/apache/james/task/eventsourcing/distributed/DistributedTaskManagerTest.java b/server/task/task-distributed/src/test/java/org/apache/james/task/eventsourcing/distributed/DistributedTaskManagerTest.java
@@ -667,14 +667,14 @@ public static TaskDTOModule<CassandraExecutingTask, CassandraExecutingTaskDTO> m
             this.pause = pause;
 
             // Some task requires cassandra query execution upon their creation
-            Mono.from(session.executeReactive("SELECT dateof(now()) FROM system.local ;"))
+            Mono.from(session.executeReactive("SELECT toTimestamp(now()) FROM system.local ;"))
                 .block();
         }
 
         @Override
         public Result run() throws InterruptedException {
             // Task often execute Cassandra logic
-            Mono.from(session.executeReactive("SELECT dateof(now()) FROM system.local ;"))
+            Mono.from(session.executeReactive("SELECT toTimestamp(now()) FROM system.local ;"))
                 .block();
 
             if (pause) {
@@ -692,7 +692,7 @@ public TaskType type() {
         @Override
         public Optional<TaskExecutionDetails.AdditionalInformation> details() {
             // Some task requires cassandra query execution upon detail generation
-            Mono.from(session.executeReactive("SELECT dateof(now()) FROM system.local ;"))
+            Mono.from(session.executeReactive("SELECT toTimestamp(now()) FROM system.local ;"))
                 .block();
 
             return Optional.empty();
diff --git a/src/site/markdown/server/install/guice-cassandra-rabbitmq-s3.md b/src/site/markdown/server/install/guice-cassandra-rabbitmq-s3.md
@@ -47,7 +47,7 @@ $ keytool -genkey -alias james -keyalg RSA -keystore conf/keystore
 You need to have a Cassandra, OpenSearch, S3 and RabbitMQ instance running. You can either install the servers or launch them via docker:
 
 ```bash
-$ docker run -d -p 9042:9042 --name=cassandra cassandra:4.1.9
+$ docker run -d -p 9042:9042 --name=cassandra cassandra:5.0.4
 $ docker run -d --network james -p 9200:9200 --name=opensearch --env 'discovery.type=single-node' opensearchproject/opensearch:2.19.2
 $ docker run -d -p 5672:5672 -p 15672:15672 --name=rabbitmq rabbitmq:3.13.3-management
 $ docker run -d --env 'REMOTE_MANAGEMENT_DISABLE=1' --env 'SCALITY_ACCESS_KEY_ID=accessKey1' --env 'SCALITY_SECRET_ACCESS_KEY=secretKey1' --name=s3 ghcr.io/scality/cloudserver:c1ba296859690c1cbbec609aaae430f6b04b4745
diff --git a/src/site/markdown/server/install/guice-cassandra.md b/src/site/markdown/server/install/guice-cassandra.md
@@ -48,7 +48,7 @@ $ keytool -genkey -alias james -keyalg RSA -keystore conf/keystore
 You need to have a Cassandra and an OpenSearch instance running. You can either install the servers or launch them via docker:
 
 ```bash
-$ docker run -d -p 9042:9042 --name=cassandra cassandra:4.1.9
+$ docker run -d -p 9042:9042 --name=cassandra cassandra:5.0.4
 $ docker run -d --network james -p 9200:9200 --name=opensearch --env 'discovery.type=single-node' opensearchproject/opensearch:2.19.2
 ```
 
diff --git a/src/site/xdoc/server/quick-start-cassandra.xml b/src/site/xdoc/server/quick-start-cassandra.xml
@@ -64,7 +64,7 @@ Step 3: Deploy
 3.1. Deploy Cassandra (optional)
 You may skip this part if you already have a running Cassandra on your network.
 
-<i>$ docker run --detach=true --name=cassandra cassandra:4.1.9</i>
+<i>$ docker run --detach=true --name=cassandra cassandra:5.0.4</i>
 
 3.2. Deploy OpenSearch (optional)
 You may skip this part if you already have a running OpenSearch on your network.
diff --git a/third-party/clamav/docker-compose.yml b/third-party/clamav/docker-compose.yml
@@ -48,7 +48,7 @@ services:
           - elasticsearch
 
   cassandra:
-    image: cassandra:4.1.9
+    image: cassandra:5.0.4
     ports:
       - "9042:9042"
     healthcheck:
diff --git a/third-party/rspamd/docker-compose-distributed.yml b/third-party/rspamd/docker-compose-distributed.yml
@@ -53,7 +53,7 @@ services:
           - elasticsearch
 
   cassandra:
-    image: cassandra:4.1.9
+    image: cassandra:5.0.4
     ports:
       - "9042:9042"
     healthcheck:

Original file line number	Diff line number	Diff line change
`@@ -92,6 +92,6 @@ private static void createKeyspace(KeyspaceConfiguration keyspaceConfiguration,`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`private static void ensureContactable(CqlSession session) {`
`95`		`- session.execute("SELECT dateof(now()) FROM system.local ;");`
	`95`	`+ session.execute("SELECT toTimestamp(now()) FROM system.local ;");`
`96`	`96`	`}`
`97`	`97`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ void createShouldReturnAContactableCluster(DockerCassandra dockerCassandra) {`
`66`	`66`
`67`	`67`	`void assertThatClusterIsContactable(CqlSession session) {`
`68`	`68`	`try {`
`69`		`- session.execute("SELECT dateof(now()) FROM system.local ;");`
	`69`	`+ session.execute("SELECT toTimestamp(now()) FROM system.local ;");`
`70`	`70`	`} catch (Exception e) {`
`71`	`71`	`throw new AssertionError("expecting cluster can be connected but actually not", e);`
`72`	`72`	`}`