This is an automated email from the ASF dual-hosted git repository.
chibenwa pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
The following commit(s) were added to refs/heads/master by this push:
new 6c2283cf40 [UPGRADE] RSpamD 3.12.0 -> 3.14.3 + kvrocks 2.12.1 ->
2.15.0 (#3027)
6c2283cf40 is described below
commit 6c2283cf4096944fd60c75788a30ba6b7d536d2b
Author: Benoit TELLIER <[email protected]>
AuthorDate: Tue Apr 28 07:56:38 2026 +0200
[UPGRADE] RSpamD 3.12.0 -> 3.14.3 + kvrocks 2.12.1 -> 2.15.0 (#3027)
---
.../test/java/org/apache/james/backends/redis/DockerKvrocks.java | 2 +-
.../rspamd/docker-compose-rspamd-with-kvrocks-sentinel.yml | 8 ++++----
.../rspamd/docker-compose-rspamd-with-kvrocks-standalone.yml | 4 ++--
third-party/rspamd/docker-compose.yml | 2 +-
.../src/test/java/org/apache/james/rspamd/RspamdExtension.java | 4 ++--
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git
a/backends-common/redis/src/test/java/org/apache/james/backends/redis/DockerKvrocks.java
b/backends-common/redis/src/test/java/org/apache/james/backends/redis/DockerKvrocks.java
index 4706f9131c..4cdeb71f85 100644
---
a/backends-common/redis/src/test/java/org/apache/james/backends/redis/DockerKvrocks.java
+++
b/backends-common/redis/src/test/java/org/apache/james/backends/redis/DockerKvrocks.java
@@ -39,7 +39,7 @@ import io.lettuce.core.api.sync.RedisCommands;
public class DockerKvrocks {
public static final DockerImageName DEFAULT_IMAGE_NAME =
DockerImageName.parse("apache/kvrocks")
- .withTag("2.12.1");
+ .withTag("2.15.0");
public static final int DEFAULT_PORT = 6666;
private final GenericContainer<?> container;
diff --git a/third-party/rspamd/docker-compose-rspamd-with-kvrocks-sentinel.yml
b/third-party/rspamd/docker-compose-rspamd-with-kvrocks-sentinel.yml
index c897c7e030..f424b87374 100644
--- a/third-party/rspamd/docker-compose-rspamd-with-kvrocks-sentinel.yml
+++ b/third-party/rspamd/docker-compose-rspamd-with-kvrocks-sentinel.yml
@@ -30,7 +30,7 @@ services:
- "8000:8000"
kvrocks-master:
- image: apache/kvrocks:2.12.1
+ image: apache/kvrocks:2.15.0
container_name: kvrocks-master
volumes:
-
./sample-configuration/kvrocks/sentinel/master-node/kvrocks.conf:/var/lib/kvrocks/kvrocks.conf
@@ -42,7 +42,7 @@ services:
retries: 5
kvrocks-replica-1:
- image: apache/kvrocks:2.12.1
+ image: apache/kvrocks:2.15.0
container_name: kvrocks-replica-1
depends_on:
kvrocks-master:
@@ -54,7 +54,7 @@ services:
- kvrocks_replica1_data:/var/lib/kvrocks
kvrocks-replica-2:
- image: apache/kvrocks:2.12.1
+ image: apache/kvrocks:2.15.0
container_name: kvrocks-replica-2
depends_on:
kvrocks-master:
@@ -103,7 +103,7 @@ services:
kvrocks-master:
condition: service_healthy
container_name: rspamd
- image: rspamd/rspamd:3.12.0
+ image: rspamd/rspamd:3.14.3
environment:
- RSPAMD_PASSWORD=admin
volumes:
diff --git
a/third-party/rspamd/docker-compose-rspamd-with-kvrocks-standalone.yml
b/third-party/rspamd/docker-compose-rspamd-with-kvrocks-standalone.yml
index 1e63993f7f..6d8822a74b 100644
--- a/third-party/rspamd/docker-compose-rspamd-with-kvrocks-standalone.yml
+++ b/third-party/rspamd/docker-compose-rspamd-with-kvrocks-standalone.yml
@@ -30,7 +30,7 @@ services:
- "8000:8000"
kvrocks:
- image: apache/kvrocks:2.12.1
+ image: apache/kvrocks:2.15.0
healthcheck:
test: [ "CMD", "redis-cli", "ping", "|", "grep", "PONG" ]
interval: 10s
@@ -54,7 +54,7 @@ services:
kvrocks:
condition: service_started
container_name: rspamd
- image: rspamd/rspamd:3.12.0
+ image: rspamd/rspamd:3.14.3
environment:
- RSPAMD_PASSWORD=admin
volumes:
diff --git a/third-party/rspamd/docker-compose.yml
b/third-party/rspamd/docker-compose.yml
index 05305bb6e7..469e94af77 100644
--- a/third-party/rspamd/docker-compose.yml
+++ b/third-party/rspamd/docker-compose.yml
@@ -45,7 +45,7 @@ services:
redis:
condition: service_started
container_name: rspamd
- image: rspamd/rspamd:3.12.0
+ image: rspamd/rspamd:3.14.3
environment:
- RSPAMD_PASSWORD=admin
volumes:
diff --git
a/third-party/rspamd/src/test/java/org/apache/james/rspamd/RspamdExtension.java
b/third-party/rspamd/src/test/java/org/apache/james/rspamd/RspamdExtension.java
index 59224bce19..4d454a219f 100644
---
a/third-party/rspamd/src/test/java/org/apache/james/rspamd/RspamdExtension.java
+++
b/third-party/rspamd/src/test/java/org/apache/james/rspamd/RspamdExtension.java
@@ -40,8 +40,8 @@ public class RspamdExtension implements
GuiceModuleTestExtension {
public static final Duration STARTUP_TIMEOUT = Duration.ofMinutes(5);
public static final String PASSWORD = "admin";
- private static final DockerImageName RSPAMD_IMAGE =
DockerImageName.parse("rspamd/rspamd").withTag("3.12.0");
- private static final DockerImageName REDIS_IMAGE =
DockerImageName.parse("apache/kvrocks").withTag("2.12.1");
+ private static final DockerImageName RSPAMD_IMAGE =
DockerImageName.parse("rspamd/rspamd").withTag("3.14.3");
+ private static final DockerImageName REDIS_IMAGE =
DockerImageName.parse("apache/kvrocks").withTag("2.15.0");
private static final DockerImageName CLAMAV_IMAGE =
DockerImageName.parse("clamav/clamav").withTag("1.4");
private static final int RSPAMD_DEFAULT_PORT = 11334;
private static final int REDIS_DEFAULT_PORT = 6666;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
