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/12/06 06:48:53 UTC
[james-project] branch 3.7.x updated: [BUILD] Fix SpamAssassin container on 3.7.x (#1330)
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch 3.7.x
in repository https://gitbox.apache.org/repos/asf/james-project.git
The following commit(s) were added to refs/heads/3.7.x by this push:
new e45468ec57 [BUILD] Fix SpamAssassin container on 3.7.x (#1330)
e45468ec57 is described below
commit e45468ec57c1151191da69b31ae712f2be6297cf
Author: Benoit TELLIER <bt...@linagora.com>
AuthorDate: Tue Dec 6 13:48:47 2022 +0700
[BUILD] Fix SpamAssassin container on 3.7.x (#1330)
---
.../java/org/apache/james/spamassassin/SpamAssassinWaitStrategy.java | 2 +-
.../spamassassin/src/test/resources/docker/spamassassin/Dockerfile | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/third-party/spamassassin/src/test/java/org/apache/james/spamassassin/SpamAssassinWaitStrategy.java b/third-party/spamassassin/src/test/java/org/apache/james/spamassassin/SpamAssassinWaitStrategy.java
index 8947a2cbfd..7046130994 100644
--- a/third-party/spamassassin/src/test/java/org/apache/james/spamassassin/SpamAssassinWaitStrategy.java
+++ b/third-party/spamassassin/src/test/java/org/apache/james/spamassassin/SpamAssassinWaitStrategy.java
@@ -52,7 +52,7 @@ public class SpamAssassinWaitStrategy implements WaitStrategy {
return spamAssassinContainer
.execInContainer("spamassassin", "-V")
.getStdout()
- .contains("SpamAssassin version 3.4.2");
+ .contains("SpamAssassin version 3.4.6");
} catch (IOException | InterruptedException e) {
return false;
}
diff --git a/third-party/spamassassin/src/test/resources/docker/spamassassin/Dockerfile b/third-party/spamassassin/src/test/resources/docker/spamassassin/Dockerfile
index 3f42b25fff..51ea4af10f 100644
--- a/third-party/spamassassin/src/test/resources/docker/spamassassin/Dockerfile
+++ b/third-party/spamassassin/src/test/resources/docker/spamassassin/Dockerfile
@@ -1,6 +1,6 @@
-FROM postgres:10.3
+FROM postgres:15.1
-ENV SPAMASSASSIN_VERSION 3.4.2
+ENV SPAMASSASSIN_VERSION 3.4.6
RUN apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org