You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by bt...@apache.org on 2022/06/03 15:05:15 UTC

[james-project] branch master updated (7a74b5187a -> 94483dd28e)

This is an automated email from the ASF dual-hosted git repository.

btellier pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git


    from 7a74b5187a JAMES-3756 Implement NaiveDelegationStore for unsupported products
     new 3dafed1caa [UPGRADE] Docker relevant: rabbitmq -> 3.9.18
     new 2a446f3309 [UPGRADE] Docker relevant: tika -> 1.28.2
     new b4444b53bb [UPGRADE] Docker relevant: spamassassin -> 3.4.6-1
     new db977db6b2 [UPGRADE] Docker relevant: nginx -> 1.22
     new 94483dd28e [CHANGELOG] Upgrade docker relevant

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:
 CHANGELOG.md                                                     | 9 ++++++---
 .../elasticsearch-v7/src/test/resources/auth-es/NginxDockerfile  | 2 +-
 server/apps/cassandra-app/docker-compose.yml                     | 2 +-
 server/apps/distributed-app/README.adoc                          | 2 +-
 server/apps/distributed-app/docker-compose.yml                   | 4 ++--
 .../distributed-app/docs/modules/ROOT/pages/operate/logging.adoc | 2 +-
 .../distributed-app/docs/modules/ROOT/pages/run/run-docker.adoc  | 6 +++---
 .../distributed-app/docs/modules/ROOT/pages/run/run-java.adoc    | 2 +-
 server/apps/distributed-pop3-app/README.adoc                     | 2 +-
 server/apps/distributed-pop3-app/docker-compose.yml              | 2 +-
 .../src/main/java/org/apache/james/util/docker/Images.java       | 8 ++++----
 src/site/markdown/server/install/guice-cassandra-rabbitmq-s3.md  | 2 +-
 12 files changed, 23 insertions(+), 20 deletions(-)


---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org


[james-project] 05/05: [CHANGELOG] Upgrade docker relevant

Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit 94483dd28e5f40103a1bffb86c02917f4115d21f
Author: Tung Van TRAN <vt...@linagora.com>
AuthorDate: Fri May 27 14:40:15 2022 +0700

    [CHANGELOG] Upgrade docker relevant
    
    - rabbitmq -> 3.9.18
    - tika -> 1.28.2
    - spamassassin -> 3.4.6-1 T
    - nginx -> 1.22
---
 CHANGELOG.md                                                     | 9 ++++++---
 .../elasticsearch-v7/src/test/resources/auth-es/NginxDockerfile  | 6 +++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d39340dc7b..b177b4bfc0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,8 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 
 ## [Unreleased]
-
-No changes yet.
+### Changed
+- Upgrade docker relevant: rabbitmq -> 3.9.18
+- Upgrade docker relevant: tika -> 1.28.2 
+- Upgrade docker relevant: spamassassin -> 3.4.6-1 T
+- Upgrade docker relevant: nginx -> 1.22 
 
 ## [3.7.0] - 2022-03-01
 
@@ -343,7 +346,7 @@ No changes yet.
      - [CVE-2021-32718](https://github.com/rabbitmq/rabbitmq-server/security/advisories/GHSA-c3hj-rg5h-2772)
      - [CVE-2021-32719](https://github.com/rabbitmq/rabbitmq-server/security/advisories/GHSA-5452-hxj4-773x)
 
-### Miscaleneous
+### Miscellaneous
  - Mock SMTP version 0.5 (#733)
    - report mock email count directly instead of copy+count
    - http GET for mock email count
diff --git a/backends-common/elasticsearch-v7/src/test/resources/auth-es/NginxDockerfile b/backends-common/elasticsearch-v7/src/test/resources/auth-es/NginxDockerfile
index 720464620b..039b00c1bf 100644
--- a/backends-common/elasticsearch-v7/src/test/resources/auth-es/NginxDockerfile
+++ b/backends-common/elasticsearch-v7/src/test/resources/auth-es/NginxDockerfile
@@ -1,5 +1,5 @@
 FROM nginx:1.22
 
-COPY nginx-conf/ /etc/nginx/conf.d/
-COPY default.crt /etc/ssl/certs/default.crt
-COPY default.key /etc/ssl/private/default.key
\ No newline at end of file
+COPY conf/nginx-conf/ /etc/nginx/conf.d/
+COPY conf/default.crt /etc/ssl/certs/default.crt
+COPY conf/default.key /etc/ssl/private/default.key
\ No newline at end of file


---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org


[james-project] 04/05: [UPGRADE] Docker relevant: nginx -> 1.22

Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit db977db6b28603bd6f47e94ee517c48f50365e53
Author: Tung Van TRAN <vt...@linagora.com>
AuthorDate: Fri May 27 10:58:57 2022 +0700

    [UPGRADE] Docker relevant: nginx -> 1.22
---
 .../elasticsearch-v7/src/test/resources/auth-es/NginxDockerfile   | 8 ++++----
 .../src/main/java/org/apache/james/util/docker/Images.java        | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/backends-common/elasticsearch-v7/src/test/resources/auth-es/NginxDockerfile b/backends-common/elasticsearch-v7/src/test/resources/auth-es/NginxDockerfile
index 5a0f97613d..720464620b 100644
--- a/backends-common/elasticsearch-v7/src/test/resources/auth-es/NginxDockerfile
+++ b/backends-common/elasticsearch-v7/src/test/resources/auth-es/NginxDockerfile
@@ -1,5 +1,5 @@
-FROM nginx:1.15.1
+FROM nginx:1.22
 
-COPY conf/nginx-conf/ /etc/nginx/conf.d/
-COPY conf/default.crt /etc/ssl/certs/default.crt
-COPY conf/default.key /etc/ssl/private/default.key
\ No newline at end of file
+COPY nginx-conf/ /etc/nginx/conf.d/
+COPY default.crt /etc/ssl/certs/default.crt
+COPY default.key /etc/ssl/private/default.key
\ No newline at end of file
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 1ca4152d76..f200944867 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 ELASTICSEARCH_7 = "docker.elastic.co/elasticsearch/elasticsearch:7.10.2";
-    String NGINX = "nginx:1.15.1";
+    String NGINX = "nginx:1.22";
     String TIKA = "apache/tika:1.28.2";
     String SPAMASSASSIN = "instantlinux/spamassassin:3.4.6-1";
     String MOCK_SMTP_SERVER = "linagora/mock-smtp-server:0.4";


---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org


[james-project] 02/05: [UPGRADE] Docker relevant: tika -> 1.28.2

Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit 2a446f3309b8f674ab1a302d0bb825c050d86f45
Author: Tung Van TRAN <vt...@linagora.com>
AuthorDate: Fri May 27 10:48:18 2022 +0700

    [UPGRADE] Docker relevant: tika -> 1.28.2
---
 server/apps/cassandra-app/docker-compose.yml                          | 2 +-
 server/apps/distributed-app/docker-compose.yml                        | 2 +-
 .../apps/distributed-app/docs/modules/ROOT/pages/run/run-docker.adoc  | 4 ++--
 server/testing/src/main/java/org/apache/james/util/docker/Images.java | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/server/apps/cassandra-app/docker-compose.yml b/server/apps/cassandra-app/docker-compose.yml
index e805dc7e1d..0bf74f0df6 100644
--- a/server/apps/cassandra-app/docker-compose.yml
+++ b/server/apps/cassandra-app/docker-compose.yml
@@ -31,5 +31,5 @@ services:
       - "9042:9042"
 
   tika:
-    image: apache/tika:1.26
+    image: apache/tika:1.28.2
 
diff --git a/server/apps/distributed-app/docker-compose.yml b/server/apps/distributed-app/docker-compose.yml
index d90d88fb74..6d94fdaf93 100644
--- a/server/apps/distributed-app/docker-compose.yml
+++ b/server/apps/distributed-app/docker-compose.yml
@@ -33,7 +33,7 @@ services:
       - "9042:9042"
 
   tika:
-    image: apache/tika:1.26
+    image: apache/tika:1.28.2
 
   rabbitmq:
     image: rabbitmq:3.9.18-management
diff --git a/server/apps/distributed-app/docs/modules/ROOT/pages/run/run-docker.adoc b/server/apps/distributed-app/docs/modules/ROOT/pages/run/run-docker.adoc
index c4992d2c8f..95b285912a 100644
--- a/server/apps/distributed-app/docs/modules/ROOT/pages/run/run-docker.adoc
+++ b/server/apps/distributed-app/docs/modules/ROOT/pages/run/run-docker.adoc
@@ -69,7 +69,7 @@ You need a running *ElasticSearch* in docker which connects to *james* network.
 
 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:1.24
+    $ docker run -d --network james --name=tika apache/tika:1.28.2
 
 You can find more explanation on the need of Tika in this page http://james.apache.org/server/config-elasticsearch.html
 
@@ -116,7 +116,7 @@ You can handle attachment text extraction before indexing in ElasticSearch. This
 
 Run tika connect to *james* network:
 
-    $ docker run -d --network james --name tika apache/tika:1.24
+    $ docker run -d --network james --name tika apache/tika:1.28.2
 
 Run 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 8d38aa001f..efd25b8777 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
@@ -26,7 +26,7 @@ public interface Images {
     String ELASTICSEARCH_6 = "docker.elastic.co/elasticsearch/elasticsearch:6.3.2";
     String ELASTICSEARCH_7 = "docker.elastic.co/elasticsearch/elasticsearch:7.10.2";
     String NGINX = "nginx:1.15.1";
-    String TIKA = "apache/tika:1.26";
+    String TIKA = "apache/tika:1.28.2";
     String SPAMASSASSIN = "dinkel/spamassassin:3.4.0";
     String MOCK_SMTP_SERVER = "linagora/mock-smtp-server:0.4";
 }


---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org


[james-project] 01/05: [UPGRADE] Docker relevant: rabbitmq -> 3.9.18

Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit 3dafed1caa29f7f5469cb04d5507297a40c08a89
Author: Tung Van TRAN <vt...@linagora.com>
AuthorDate: Fri May 27 10:46:39 2022 +0700

    [UPGRADE] Docker relevant: rabbitmq -> 3.9.18
---
 server/apps/distributed-app/README.adoc                                 | 2 +-
 server/apps/distributed-app/docker-compose.yml                          | 2 +-
 .../apps/distributed-app/docs/modules/ROOT/pages/operate/logging.adoc   | 2 +-
 server/apps/distributed-app/docs/modules/ROOT/pages/run/run-docker.adoc | 2 +-
 server/apps/distributed-app/docs/modules/ROOT/pages/run/run-java.adoc   | 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 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/server/apps/distributed-app/README.adoc b/server/apps/distributed-app/README.adoc
index 930ca11e30..1011c5a241 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:3.11.10
 $ docker run -d --network james -p 9200:9200 --name=elasticsearch --env 'discovery.type=single-node' docker.elastic.co/elasticsearch/elasticsearch:7.10.2
-$ docker run -d --network james -p 5672:5672 -p 15672:15672 --name=rabbitmq rabbitmq:3.8.18-management
+$ docker run -d --network james -p 5672:5672 -p 15672:15672 --name=rabbitmq rabbitmq:3.9.18-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 zenko/cloudserver:8.2.6
 ----
 
diff --git a/server/apps/distributed-app/docker-compose.yml b/server/apps/distributed-app/docker-compose.yml
index f5a0c6e305..d90d88fb74 100644
--- a/server/apps/distributed-app/docker-compose.yml
+++ b/server/apps/distributed-app/docker-compose.yml
@@ -36,7 +36,7 @@ services:
     image: apache/tika:1.26
 
   rabbitmq:
-    image: rabbitmq:3.8.18-management
+    image: rabbitmq:3.9.18-management
     ports:
       - "5672:5672"
       - "15672:15672"
diff --git a/server/apps/distributed-app/docs/modules/ROOT/pages/operate/logging.adoc b/server/apps/distributed-app/docs/modules/ROOT/pages/operate/logging.adoc
index 149dc5e268..87f645cf4a 100644
--- a/server/apps/distributed-app/docs/modules/ROOT/pages/operate/logging.adoc
+++ b/server/apps/distributed-app/docs/modules/ROOT/pages/operate/logging.adoc
@@ -205,7 +205,7 @@ services:
       - "9042:9042"
 
   rabbitmq:
-    image: rabbitmq:3.8.1-management
+    image: rabbitmq:3.9.18-management
     ports:
       - "5672:5672"
       - "15672:15672"
diff --git a/server/apps/distributed-app/docs/modules/ROOT/pages/run/run-docker.adoc b/server/apps/distributed-app/docs/modules/ROOT/pages/run/run-docker.adoc
index 2b42e3d7c9..c4992d2c8f 100644
--- a/server/apps/distributed-app/docs/modules/ROOT/pages/run/run-docker.adoc
+++ b/server/apps/distributed-app/docs/modules/ROOT/pages/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.8.18-management
+    $ docker run -d --network james --name=rabbitmq rabbitmq:3.9.18-management
 
 You need a running *Zenko Cloudserver* objectstorage in docker which connects to *james* network. To achieve this run:
 
diff --git a/server/apps/distributed-app/docs/modules/ROOT/pages/run/run-java.adoc b/server/apps/distributed-app/docs/modules/ROOT/pages/run/run-java.adoc
index 2f5d1ade42..469289d6e9 100644
--- a/server/apps/distributed-app/docs/modules/ROOT/pages/run/run-java.adoc
+++ b/server/apps/distributed-app/docs/modules/ROOT/pages/run/run-java.adoc
@@ -60,7 +60,7 @@ running. You can either install the servers or launch them via docker:
 ----
 $ docker run -d -p 9042:9042 --name=cassandra cassandra:3.11.10
 $ docker run -d -p 9200:9200 --name=elasticsearch --env 'discovery.type=single-node' docker.elastic.co/elasticsearch/elasticsearch:7.10.2
-$ docker run -d -p 5672:5672 -p 15672:15672 --name=rabbitmq rabbitmq:3.8.17-management
+$ docker run -d -p 5672:5672 -p 15672:15672 --name=rabbitmq rabbitmq:3.9.18-management
 $ docker run -d --env 'REMOTE_MANAGEMENT_DISABLE=1' --env 'SCALITY_ACCESS_KEY_ID=accessKey1' --env 'SCALITY_SECRET_ACCESS_KEY=secretKey1' --name=s3 zenko/cloudserver:8.2.6
 ----
 
diff --git a/server/apps/distributed-pop3-app/README.adoc b/server/apps/distributed-pop3-app/README.adoc
index fbc4709cf0..54d776b563 100644
--- a/server/apps/distributed-pop3-app/README.adoc
+++ b/server/apps/distributed-pop3-app/README.adoc
@@ -22,7 +22,7 @@ Third party compulsory dependencies:
 ----
 $ docker run -d --network james -p 9042:9042 --name=cassandra cassandra:3.11.10
 $ docker run -d --network james -p 9200:9200 --name=elasticsearch --env 'discovery.type=single-node' docker.elastic.co/elasticsearch/elasticsearch:7.10.2
-$ docker run -d --network james -p 5672:5672 -p 15672:15672 --name=rabbitmq rabbitmq:3.8.18-management
+$ docker run -d --network james -p 5672:5672 -p 15672:15672 --name=rabbitmq rabbitmq:3.9.18-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 zenko/cloudserver:8.2.6
 ----
 
diff --git a/server/apps/distributed-pop3-app/docker-compose.yml b/server/apps/distributed-pop3-app/docker-compose.yml
index 16488682ad..49a13d2343 100644
--- a/server/apps/distributed-pop3-app/docker-compose.yml
+++ b/server/apps/distributed-pop3-app/docker-compose.yml
@@ -28,7 +28,7 @@ services:
       - "9042:9042"
 
   rabbitmq:
-    image: rabbitmq:3.8.18-management
+    image: rabbitmq:3.9.18-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 704bc34969..8d38aa001f 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 = "weave/rest-smtp-sink:latest";
-    String RABBITMQ = "rabbitmq:3.8.18-management";
+    String RABBITMQ = "rabbitmq:3.9.18-management";
     String ELASTICSEARCH_2 = "elasticsearch:2.4.6";
     String ELASTICSEARCH_6 = "docker.elastic.co/elasticsearch/elasticsearch:6.3.2";
     String ELASTICSEARCH_7 = "docker.elastic.co/elasticsearch/elasticsearch:7.10.2";
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 70270a85f2..7bac6574de 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, ElasticSearch, S3 and RabbitMQ instance running. Y
 ```bash
 $ docker run -d -p 9042:9042 --name=cassandra cassandra:3.11.10
 $ docker run -d -p 9200:9200 --name=elasticsearch --env 'discovery.type=single-node' docker.elastic.co/elasticsearch/elasticsearch:7.10.2
-$ docker run -d -p 5672:5672 -p 15672:15672 --name=rabbitmq rabbitmq:3.8.18-management
+$ docker run -d -p 5672:5672 -p 15672:15672 --name=rabbitmq rabbitmq:3.9.18-management
 $ docker run -d --env 'REMOTE_MANAGEMENT_DISABLE=1' --env 'SCALITY_ACCESS_KEY_ID=accessKey1' --env 'SCALITY_SECRET_ACCESS_KEY=secretKey1' --name=s3 zenko/cloudserver:8.2.6
 ```
 


---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org


[james-project] 03/05: [UPGRADE] Docker relevant: spamassassin -> 3.4.6-1

Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit b4444b53bb52d0d24f34a0a5afc9417dd6bff67c
Author: Tung Van TRAN <vt...@linagora.com>
AuthorDate: Fri May 27 10:49:34 2022 +0700

    [UPGRADE] Docker relevant: spamassassin -> 3.4.6-1
    
    Co-authored-by: Trần Hồng Quân <55...@users.noreply.github.com>
---
 server/testing/src/main/java/org/apache/james/util/docker/Images.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 efd25b8777..1ca4152d76 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
@@ -27,6 +27,6 @@ public interface Images {
     String ELASTICSEARCH_7 = "docker.elastic.co/elasticsearch/elasticsearch:7.10.2";
     String NGINX = "nginx:1.15.1";
     String TIKA = "apache/tika:1.28.2";
-    String SPAMASSASSIN = "dinkel/spamassassin:3.4.0";
+    String SPAMASSASSIN = "instantlinux/spamassassin:3.4.6-1";
     String MOCK_SMTP_SERVER = "linagora/mock-smtp-server:0.4";
 }


---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org