You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by rc...@apache.org on 2024/06/26 02:05:20 UTC
(james-project) branch master updated (6a7395711a -> 5d9d8c8748)
This is an automated email from the ASF dual-hosted git repository.
rcordier pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
from 6a7395711a [Antora] Remove distributed serv doc from distributed app subfolder
new 8ce5ed0796 [UPGRADE] RabbiMQ libraries - Maven com.rabbitmq:amqp-client 5.20.0 -> 5.21.0 - Docker Image rabbitmq:3.12.1-management -> rabbitmq:3.13.3-management
new 85e924d968 [UPGRADE] Tika image 2.8.0.0 -> 2.9.2.1
new a16f3c026c [UPGRADE] Redis libraries
new 2879980669 [UPGRADE] ClamAV image 1.1 -> 1.3
new 5d9d8c8748 [UPGRADE] rspamd image a16bitsysop/rspamd:3.5-r7-alpine3.18.2-r0 -> a16bitsysop/rspamd:3.8.4-r0-alpine3.20.0-r0
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../test/java/org/apache/james/backends/redis/DockerRedis.java | 2 +-
docs/modules/servers/pages/distributed/operate/logging.adoc | 2 +-
docs/modules/servers/pages/distributed/run/run-docker.adoc | 6 +++---
docs/modules/servers/pages/distributed/run/run-java.adoc | 4 ++--
pom.xml | 2 +-
server/apps/cassandra-app/docker-compose.yml | 2 +-
server/apps/distributed-app/README.adoc | 2 +-
server/apps/distributed-app/docker-compose-with-pulsar.yml | 2 +-
server/apps/distributed-app/docker-compose.yml | 4 ++--
server/apps/distributed-pop3-app/README.adoc | 2 +-
server/apps/distributed-pop3-app/docker-compose.yml | 4 ++--
server/mailet/rate-limiter-redis/docker-compose.yml | 2 +-
.../src/main/java/org/apache/james/util/docker/Images.java | 4 ++--
.../markdown/server/install/guice-cassandra-rabbitmq-s3.md | 2 +-
third-party/clamav/docker-compose.yml | 6 +++---
.../src/test/java/org/apache/james/clamav/DockerClamAV.java | 2 +-
third-party/rspamd/docker-compose-distributed.yml | 10 +++++-----
third-party/rspamd/docker-compose.yml | 6 +++---
.../src/test/java/org/apache/james/rspamd/RspamdExtension.java | 6 +++---
19 files changed, 35 insertions(+), 35 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org
(james-project) 01/05: [UPGRADE] RabbiMQ libraries - Maven com.rabbitmq:amqp-client 5.20.0 -> 5.21.0 - Docker Image rabbitmq:3.12.1-management -> rabbitmq:3.13.3-management
Posted by rc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rcordier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 8ce5ed0796c3f7629226190e067869923d16f1bb
Author: Tung Tran <vt...@linagora.com>
AuthorDate: Tue Jun 18 14:19:36 2024 +0700
[UPGRADE] RabbiMQ libraries
- Maven com.rabbitmq:amqp-client 5.20.0 -> 5.21.0
- Docker Image rabbitmq:3.12.1-management -> rabbitmq:3.13.3-management
---
docs/modules/servers/pages/distributed/operate/logging.adoc | 2 +-
docs/modules/servers/pages/distributed/run/run-docker.adoc | 2 +-
docs/modules/servers/pages/distributed/run/run-java.adoc | 4 ++--
server/apps/distributed-app/README.adoc | 2 +-
server/apps/distributed-app/docker-compose-with-pulsar.yml | 2 +-
server/apps/distributed-app/docker-compose.yml | 2 +-
server/apps/distributed-pop3-app/README.adoc | 2 +-
server/apps/distributed-pop3-app/docker-compose.yml | 2 +-
server/testing/src/main/java/org/apache/james/util/docker/Images.java | 2 +-
src/site/markdown/server/install/guice-cassandra-rabbitmq-s3.md | 2 +-
third-party/clamav/docker-compose.yml | 2 +-
third-party/rspamd/docker-compose-distributed.yml | 2 +-
12 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/docs/modules/servers/pages/distributed/operate/logging.adoc b/docs/modules/servers/pages/distributed/operate/logging.adoc
index 892b47cdae..37082fb492 100644
--- a/docs/modules/servers/pages/distributed/operate/logging.adoc
+++ b/docs/modules/servers/pages/distributed/operate/logging.adoc
@@ -205,7 +205,7 @@ services:
- "9042:9042"
rabbitmq:
- image: rabbitmq:3.12.1-management
+ image: rabbitmq:3.13.3-management
ports:
- "5672:5672"
- "15672:15672"
diff --git a/docs/modules/servers/pages/distributed/run/run-docker.adoc b/docs/modules/servers/pages/distributed/run/run-docker.adoc
index ef01632e3e..d442f64e5b 100644
--- a/docs/modules/servers/pages/distributed/run/run-docker.adoc
+++ b/docs/modules/servers/pages/distributed/run/run-docker.adoc
@@ -57,7 +57,7 @@ You need a running *cassandra* in docker which connects to *james* network. To a
You need a running *rabbitmq* in docker which connects to *james* network. To achieve this run:
- $ docker run -d --network james --name=rabbitmq rabbitmq:3.12.1-management
+ $ docker run -d --network james --name=rabbitmq rabbitmq:3.13.3-management
You need a running *Zenko Cloudserver* objectstorage 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
index 6735279c82..3a7df9c30c 100644
--- a/docs/modules/servers/pages/distributed/run/run-java.adoc
+++ b/docs/modules/servers/pages/distributed/run/run-java.adoc
@@ -51,8 +51,8 @@ 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.5
-$ docker run -d --network james -p 9200:9200 --name=opensearch --env 'discovery.type=single-node' opensearchproject/opensearch:2.1.0
-$ docker run -d -p 5672:5672 -p 15672:15672 --name=rabbitmq rabbitmq:3.12.1-management
+$ docker run -d --network james -p 9200:9200 --name=opensearch --env 'discovery.type=single-node' opensearchproject/opensearch:2.14.0
+$ 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 registry.scality.com/cloudserver/cloudserver:8.7.25
----
diff --git a/server/apps/distributed-app/README.adoc b/server/apps/distributed-app/README.adoc
index 0309c2f643..3fc04f3478 100644
--- a/server/apps/distributed-app/README.adoc
+++ b/server/apps/distributed-app/README.adoc
@@ -19,7 +19,7 @@ Third party compulsory dependencies:
----
$ docker run -d --network james -p 9042:9042 --name=cassandra cassandra:4.1.5
$ 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.14.0
-$ docker run -d --network james -p 5672:5672 -p 15672:15672 --name=rabbitmq rabbitmq:3.12.1-management
+$ docker run -d --network james -p 5672:5672 -p 15672:15672 --name=rabbitmq rabbitmq:3.13.3-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 registry.scality.com/cloudserver/cloudserver:8.7.25
----
diff --git a/server/apps/distributed-app/docker-compose-with-pulsar.yml b/server/apps/distributed-app/docker-compose-with-pulsar.yml
index e6cc829cec..ab1c6da3a2 100644
--- a/server/apps/distributed-app/docker-compose-with-pulsar.yml
+++ b/server/apps/distributed-app/docker-compose-with-pulsar.yml
@@ -62,7 +62,7 @@ services:
- james
rabbitmq:
- image: rabbitmq:3.12.1-management
+ image: rabbitmq:3.13.3-management
container_name: rabbitmq
ports:
- "5672:5672"
diff --git a/server/apps/distributed-app/docker-compose.yml b/server/apps/distributed-app/docker-compose.yml
index 9030b1a3f2..2e0e50e7c1 100644
--- a/server/apps/distributed-app/docker-compose.yml
+++ b/server/apps/distributed-app/docker-compose.yml
@@ -62,7 +62,7 @@ services:
- james
rabbitmq:
- image: rabbitmq:3.12.1-management
+ image: rabbitmq:3.13.3-management
ports:
- "5672:5672"
- "15672:15672"
diff --git a/server/apps/distributed-pop3-app/README.adoc b/server/apps/distributed-pop3-app/README.adoc
index 626cf19b0d..953b8bcfe9 100644
--- a/server/apps/distributed-pop3-app/README.adoc
+++ b/server/apps/distributed-pop3-app/README.adoc
@@ -20,7 +20,7 @@ Third party compulsory dependencies:
[source]
----
$ docker run -d --network james -p 9042:9042 --name=cassandra cassandra:4.1.5
-$ docker run -d --network james -p 5672:5672 -p 15672:15672 --name=rabbitmq rabbitmq:3.12.1-management
+$ docker run -d --network james -p 5672:5672 -p 15672:15672 --name=rabbitmq rabbitmq:3.13.3-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 registry.scality.com/cloudserver/cloudserver:8.7.25
----
diff --git a/server/apps/distributed-pop3-app/docker-compose.yml b/server/apps/distributed-pop3-app/docker-compose.yml
index a24e3854cf..a08d78af1f 100644
--- a/server/apps/distributed-pop3-app/docker-compose.yml
+++ b/server/apps/distributed-pop3-app/docker-compose.yml
@@ -62,7 +62,7 @@ services:
- james
rabbitmq:
- image: rabbitmq:3.12.1-management
+ image: rabbitmq:3.13.3-management
ports:
- "5672:5672"
- "15672:15672"
diff --git a/server/testing/src/main/java/org/apache/james/util/docker/Images.java b/server/testing/src/main/java/org/apache/james/util/docker/Images.java
index af2f318988..e1579efbad 100644
--- a/server/testing/src/main/java/org/apache/james/util/docker/Images.java
+++ b/server/testing/src/main/java/org/apache/james/util/docker/Images.java
@@ -21,7 +21,7 @@ package org.apache.james.util.docker;
public interface Images {
String FAKE_SMTP = "quanth99/rest-smtp-sink:1.0"; // Original Dockerfile: https://github.com/ambled/rest-smtp-sink/blob/master/Dockerfile
- String RABBITMQ = "rabbitmq:3.12.1-management";
+ String RABBITMQ = "rabbitmq:3.13.3-management";
String ELASTICSEARCH_2 = "elasticsearch:2.4.6";
String ELASTICSEARCH_6 = "docker.elastic.co/elasticsearch/elasticsearch:6.3.2";
String OPENSEARCH = "opensearchproject/opensearch:2.14.0";
diff --git a/src/site/markdown/server/install/guice-cassandra-rabbitmq-s3.md b/src/site/markdown/server/install/guice-cassandra-rabbitmq-s3.md
index e14df6c84e..a96e8202c4 100644
--- a/src/site/markdown/server/install/guice-cassandra-rabbitmq-s3.md
+++ b/src/site/markdown/server/install/guice-cassandra-rabbitmq-s3.md
@@ -49,7 +49,7 @@ You need to have a Cassandra, OpenSearch, S3 and RabbitMQ instance running. You
```bash
$ docker run -d -p 9042:9042 --name=cassandra cassandra:4.1.5
$ docker run -d --network james -p 9200:9200 --name=opensearch --env 'discovery.type=single-node' opensearchproject/opensearch:2.14.0
-$ docker run -d -p 5672:5672 -p 15672:15672 --name=rabbitmq rabbitmq:3.12.1-management
+$ 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 registry.scality.com/cloudserver/cloudserver:8.7.25
```
diff --git a/third-party/clamav/docker-compose.yml b/third-party/clamav/docker-compose.yml
index bed9d4eb03..c92f9f46f2 100644
--- a/third-party/clamav/docker-compose.yml
+++ b/third-party/clamav/docker-compose.yml
@@ -67,7 +67,7 @@ services:
- james
rabbitmq:
- image: rabbitmq:3.12.1-management
+ image: rabbitmq:3.13.3-management
ports:
- "5672:5672"
- "15672:15672"
diff --git a/third-party/rspamd/docker-compose-distributed.yml b/third-party/rspamd/docker-compose-distributed.yml
index eaf55c481a..9400f159ad 100644
--- a/third-party/rspamd/docker-compose-distributed.yml
+++ b/third-party/rspamd/docker-compose-distributed.yml
@@ -72,7 +72,7 @@ services:
- james
rabbitmq:
- image: rabbitmq:3.12.1-management
+ image: rabbitmq:3.13.3-management
ports:
- "5672:5672"
- "15672:15672"
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org
(james-project) 02/05: [UPGRADE] Tika image 2.8.0.0 -> 2.9.2.1
Posted by rc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rcordier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 85e924d968ae7da8f5644354970c30407a0a342d
Author: Tung Tran <vt...@linagora.com>
AuthorDate: Tue Jun 18 14:22:09 2024 +0700
[UPGRADE] Tika image 2.8.0.0 -> 2.9.2.1
---
docs/modules/servers/pages/distributed/run/run-docker.adoc | 4 ++--
server/apps/cassandra-app/docker-compose.yml | 2 +-
server/apps/distributed-app/docker-compose.yml | 2 +-
server/apps/distributed-pop3-app/docker-compose.yml | 2 +-
server/testing/src/main/java/org/apache/james/util/docker/Images.java | 2 +-
third-party/clamav/docker-compose.yml | 2 +-
third-party/rspamd/docker-compose-distributed.yml | 2 +-
7 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/docs/modules/servers/pages/distributed/run/run-docker.adoc b/docs/modules/servers/pages/distributed/run/run-docker.adoc
index d442f64e5b..986821b29c 100644
--- a/docs/modules/servers/pages/distributed/run/run-docker.adoc
+++ b/docs/modules/servers/pages/distributed/run/run-docker.adoc
@@ -69,7 +69,7 @@ $ docker run -d --network james -p 9200:9200 --name=opensearch --env 'discovery.
If you want to use all the JMAP search capabilities, you may also need to start Tika container which connects to *james* network:
- $ docker run -d --network james --name=tika apache/tika:2.8.0.0
+ $ docker run -d --network james --name=tika apache/tika:2.9.2.1
You can find more explanation on the need of Tika in this xref:distributed/configure/tika.adoc[page].
@@ -122,7 +122,7 @@ You can handle attachment text extraction before indexing in OpenSearch. This ma
Run tika connect to *james* network:
- $ docker run -d --network james --name tika apache/tika:2.8.0.0
+ $ docker run -d --network james --name tika apache/tika:2.9.2.1
Run James:
diff --git a/server/apps/cassandra-app/docker-compose.yml b/server/apps/cassandra-app/docker-compose.yml
index 70f3459c74..b9a4c19af8 100644
--- a/server/apps/cassandra-app/docker-compose.yml
+++ b/server/apps/cassandra-app/docker-compose.yml
@@ -53,7 +53,7 @@ services:
- james
tika:
- image: apache/tika:2.8.0.0
+ image: apache/tika:2.9.2.1
networks:
- james
diff --git a/server/apps/distributed-app/docker-compose.yml b/server/apps/distributed-app/docker-compose.yml
index 2e0e50e7c1..89f2a921bf 100644
--- a/server/apps/distributed-app/docker-compose.yml
+++ b/server/apps/distributed-app/docker-compose.yml
@@ -57,7 +57,7 @@ services:
- james
tika:
- image: apache/tika:2.8.0.0
+ image: apache/tika:2.9.2.1
networks:
- james
diff --git a/server/apps/distributed-pop3-app/docker-compose.yml b/server/apps/distributed-pop3-app/docker-compose.yml
index a08d78af1f..ef932201e8 100644
--- a/server/apps/distributed-pop3-app/docker-compose.yml
+++ b/server/apps/distributed-pop3-app/docker-compose.yml
@@ -57,7 +57,7 @@ services:
- james
tika:
- image: apache/tika:2.8.0.0
+ image: apache/tika:2.9.2.1
networks:
- james
diff --git a/server/testing/src/main/java/org/apache/james/util/docker/Images.java b/server/testing/src/main/java/org/apache/james/util/docker/Images.java
index e1579efbad..a155b7edd0 100644
--- a/server/testing/src/main/java/org/apache/james/util/docker/Images.java
+++ b/server/testing/src/main/java/org/apache/james/util/docker/Images.java
@@ -25,7 +25,7 @@ public interface Images {
String ELASTICSEARCH_2 = "elasticsearch:2.4.6";
String ELASTICSEARCH_6 = "docker.elastic.co/elasticsearch/elasticsearch:6.3.2";
String OPENSEARCH = "opensearchproject/opensearch:2.14.0";
- String TIKA = "apache/tika:2.8.0.0";
+ String TIKA = "apache/tika:2.9.2.1";
String MOCK_SMTP_SERVER = "linagora/mock-smtp-server:0.6";
String OPEN_LDAP = "osixia/openldap:1.5.0";
}
diff --git a/third-party/clamav/docker-compose.yml b/third-party/clamav/docker-compose.yml
index c92f9f46f2..cd2be62584 100644
--- a/third-party/clamav/docker-compose.yml
+++ b/third-party/clamav/docker-compose.yml
@@ -62,7 +62,7 @@ services:
- james
tika:
- image: apache/tika:2.8.0.0
+ image: apache/tika:2.9.2.1
networks:
- james
diff --git a/third-party/rspamd/docker-compose-distributed.yml b/third-party/rspamd/docker-compose-distributed.yml
index 9400f159ad..d9918ebd37 100644
--- a/third-party/rspamd/docker-compose-distributed.yml
+++ b/third-party/rspamd/docker-compose-distributed.yml
@@ -67,7 +67,7 @@ services:
- james
tika:
- image: apache/tika:2.8.0.0
+ image: apache/tika:2.9.2.1
networks:
- james
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org
(james-project) 03/05: [UPGRADE] Redis libraries
Posted by rc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rcordier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit a16f3c026c18323705ebc043a86eb97e4582c2a8
Author: Tung Tran <vt...@linagora.com>
AuthorDate: Tue Jun 18 14:24:55 2024 +0700
[UPGRADE] Redis libraries
- Image: 7.0.12 -> 7.2.5
- lettuce.core.version 6.3.0.RELEASE -> 6.3.2.RELEASE
---
.../src/test/java/org/apache/james/backends/redis/DockerRedis.java | 2 +-
pom.xml | 2 +-
server/mailet/rate-limiter-redis/docker-compose.yml | 2 +-
third-party/rspamd/docker-compose-distributed.yml | 2 +-
third-party/rspamd/docker-compose.yml | 2 +-
.../rspamd/src/test/java/org/apache/james/rspamd/RspamdExtension.java | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/backends-common/redis/src/test/java/org/apache/james/backends/redis/DockerRedis.java b/backends-common/redis/src/test/java/org/apache/james/backends/redis/DockerRedis.java
index 8225e3bf17..375cfc0884 100644
--- a/backends-common/redis/src/test/java/org/apache/james/backends/redis/DockerRedis.java
+++ b/backends-common/redis/src/test/java/org/apache/james/backends/redis/DockerRedis.java
@@ -37,7 +37,7 @@ import io.lettuce.core.RedisClient;
import io.lettuce.core.api.sync.RedisCommands;
public class DockerRedis {
- public static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("redis").withTag("7.0.12");
+ public static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("redis").withTag("7.2.5");
public static final int DEFAULT_PORT = 6379;
private final GenericContainer<?> container;
diff --git a/pom.xml b/pom.xml
index 2286ce0951..48c394d451 100644
--- a/pom.xml
+++ b/pom.xml
@@ -650,7 +650,7 @@
<guice.version>7.0.0</guice.version>
<logback.version>1.4.14</logback.version>
<tink.version>1.9.0</tink.version>
- <lettuce.core.version>6.3.0.RELEASE</lettuce.core.version>
+ <lettuce.core.version>6.3.2.RELEASE</lettuce.core.version>
<bouncycastle.version>1.77</bouncycastle.version>
diff --git a/server/mailet/rate-limiter-redis/docker-compose.yml b/server/mailet/rate-limiter-redis/docker-compose.yml
index 2420c72ada..cffecc2bb4 100644
--- a/server/mailet/rate-limiter-redis/docker-compose.yml
+++ b/server/mailet/rate-limiter-redis/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3'
services:
redis:
- image: redis:7.0.12
+ image: redis:7.2.5
command:
- "--loglevel"
- "debug"
diff --git a/third-party/rspamd/docker-compose-distributed.yml b/third-party/rspamd/docker-compose-distributed.yml
index d9918ebd37..62eb5887cb 100644
--- a/third-party/rspamd/docker-compose-distributed.yml
+++ b/third-party/rspamd/docker-compose-distributed.yml
@@ -92,7 +92,7 @@ services:
- james
redis:
- image: redis:7.0.12
+ image: redis:7.2.5
networks:
- james
diff --git a/third-party/rspamd/docker-compose.yml b/third-party/rspamd/docker-compose.yml
index 3e7a9d514f..84de158c62 100644
--- a/third-party/rspamd/docker-compose.yml
+++ b/third-party/rspamd/docker-compose.yml
@@ -30,7 +30,7 @@ services:
- "8000:8000"
redis:
- image: redis:7.0.12
+ image: redis:7.2.5
command:
- "--loglevel"
- "debug"
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 3d6c89e9db..48c6585f21 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
@@ -41,7 +41,7 @@ public class RspamdExtension implements GuiceModuleTestExtension {
public static final String PASSWORD = "admin";
private static final DockerImageName RSPAMD_IMAGE = DockerImageName.parse("a16bitsysop/rspamd").withTag("3.5-r7-alpine3.18.2-r0");
- private static final DockerImageName REDIS_IMAGE = DockerImageName.parse("redis").withTag("7.0.12");
+ private static final DockerImageName REDIS_IMAGE = DockerImageName.parse("redis").withTag("7.2.5");
private static final DockerImageName CLAMAV_IMAGE = DockerImageName.parse("clamav/clamav").withTag("1.1");
private static final int RSPAMD_DEFAULT_PORT = 11334;
private static final int REDIS_DEFAULT_PORT = 6379;
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org
(james-project) 04/05: [UPGRADE] ClamAV image 1.1 -> 1.3
Posted by rc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rcordier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 2879980669e08f13cd033d9f7e397c08bd38020a
Author: Tung Tran <vt...@linagora.com>
AuthorDate: Tue Jun 18 14:27:12 2024 +0700
[UPGRADE] ClamAV image 1.1 -> 1.3
---
third-party/clamav/docker-compose.yml | 2 +-
.../clamav/src/test/java/org/apache/james/clamav/DockerClamAV.java | 2 +-
third-party/rspamd/docker-compose-distributed.yml | 2 +-
third-party/rspamd/docker-compose.yml | 2 +-
.../rspamd/src/test/java/org/apache/james/rspamd/RspamdExtension.java | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/third-party/clamav/docker-compose.yml b/third-party/clamav/docker-compose.yml
index cd2be62584..036b0719f0 100644
--- a/third-party/clamav/docker-compose.yml
+++ b/third-party/clamav/docker-compose.yml
@@ -87,7 +87,7 @@ services:
- james
clamav:
- image: clamav/clamav:1.1
+ image: clamav/clamav:1.3
networks:
- james
diff --git a/third-party/clamav/src/test/java/org/apache/james/clamav/DockerClamAV.java b/third-party/clamav/src/test/java/org/apache/james/clamav/DockerClamAV.java
index 6fec1c9191..ef7e5d494f 100644
--- a/third-party/clamav/src/test/java/org/apache/james/clamav/DockerClamAV.java
+++ b/third-party/clamav/src/test/java/org/apache/james/clamav/DockerClamAV.java
@@ -27,7 +27,7 @@ import org.testcontainers.containers.wait.strategy.Wait;
import org.testcontainers.utility.DockerImageName;
public class DockerClamAV {
- private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("clamav/clamav").withTag("1.1");
+ private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("clamav/clamav").withTag("1.3");
private static final int DEFAULT_PORT = 3310;
private final GenericContainer<?> container;
diff --git a/third-party/rspamd/docker-compose-distributed.yml b/third-party/rspamd/docker-compose-distributed.yml
index 62eb5887cb..09a9b91e2f 100644
--- a/third-party/rspamd/docker-compose-distributed.yml
+++ b/third-party/rspamd/docker-compose-distributed.yml
@@ -97,7 +97,7 @@ services:
- james
clamav:
- image: clamav/clamav:1.1
+ image: clamav/clamav:1.3
networks:
- james
diff --git a/third-party/rspamd/docker-compose.yml b/third-party/rspamd/docker-compose.yml
index 84de158c62..bb9bbf6142 100644
--- a/third-party/rspamd/docker-compose.yml
+++ b/third-party/rspamd/docker-compose.yml
@@ -36,7 +36,7 @@ services:
- "debug"
clamav:
- image: clamav/clamav:1.1
+ image: clamav/clamav:1.3
rspamd:
depends_on:
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 48c6585f21..e7a44fe56e 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
@@ -42,7 +42,7 @@ public class RspamdExtension implements GuiceModuleTestExtension {
private static final DockerImageName RSPAMD_IMAGE = DockerImageName.parse("a16bitsysop/rspamd").withTag("3.5-r7-alpine3.18.2-r0");
private static final DockerImageName REDIS_IMAGE = DockerImageName.parse("redis").withTag("7.2.5");
- private static final DockerImageName CLAMAV_IMAGE = DockerImageName.parse("clamav/clamav").withTag("1.1");
+ private static final DockerImageName CLAMAV_IMAGE = DockerImageName.parse("clamav/clamav").withTag("1.3");
private static final int RSPAMD_DEFAULT_PORT = 11334;
private static final int REDIS_DEFAULT_PORT = 6379;
private static final int CLAMAV_DEFAULT_PORT = 3310;
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org
(james-project) 05/05: [UPGRADE] rspamd image a16bitsysop/rspamd:3.5-r7-alpine3.18.2-r0 -> a16bitsysop/rspamd:3.8.4-r0-alpine3.20.0-r0
Posted by rc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rcordier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 5d9d8c8748f92372a8d808ac651f58da57ba39a0
Author: Tung Tran <vt...@linagora.com>
AuthorDate: Tue Jun 18 14:28:59 2024 +0700
[UPGRADE] rspamd image a16bitsysop/rspamd:3.5-r7-alpine3.18.2-r0 -> a16bitsysop/rspamd:3.8.4-r0-alpine3.20.0-r0
---
third-party/rspamd/docker-compose-distributed.yml | 2 +-
third-party/rspamd/docker-compose.yml | 2 +-
.../rspamd/src/test/java/org/apache/james/rspamd/RspamdExtension.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/third-party/rspamd/docker-compose-distributed.yml b/third-party/rspamd/docker-compose-distributed.yml
index 09a9b91e2f..2184fc921d 100644
--- a/third-party/rspamd/docker-compose-distributed.yml
+++ b/third-party/rspamd/docker-compose-distributed.yml
@@ -108,7 +108,7 @@ services:
redis:
condition: service_started
container_name: rspamd
- image: a16bitsysop/rspamd:3.5-r7-alpine3.18.2-r0
+ image: a16bitsysop/rspamd:3.8.4-r0-alpine3.20.0-r0
environment:
- REDIS=redis
- CLAMAV=clamav
diff --git a/third-party/rspamd/docker-compose.yml b/third-party/rspamd/docker-compose.yml
index bb9bbf6142..3e4c7a618b 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: a16bitsysop/rspamd:3.5-r7-alpine3.18.2-r0
+ image: a16bitsysop/rspamd:3.8.4-r0-alpine3.20.0-r0
environment:
- REDIS=redis
- CLAMAV=clamav
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 e7a44fe56e..1be9e9c8be 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,7 +40,7 @@ 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("a16bitsysop/rspamd").withTag("3.5-r7-alpine3.18.2-r0");
+ private static final DockerImageName RSPAMD_IMAGE = DockerImageName.parse("a16bitsysop/rspamd").withTag("3.8.4-r0-alpine3.20.0-r0");
private static final DockerImageName REDIS_IMAGE = DockerImageName.parse("redis").withTag("7.2.5");
private static final DockerImageName CLAMAV_IMAGE = DockerImageName.parse("clamav/clamav").withTag("1.3");
private static final int RSPAMD_DEFAULT_PORT = 11334;
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org