[3/5] james-project git commit: JAMES-2558 Tests should rely on SpamAssassin 3.4.2
JAMES-2558 Tests should rely on SpamAssassin 3.4.2
Fixes CVE-2017-15705, CVE-2016-1238, CVE-2018-11780 & CVE-2018-11781
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/acd245f7
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/acd245f7
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/acd245f7
Branch: refs/heads/3.2.x
Commit: acd245f76c72af577e81f4b5e01bea5458c3621d
Parents: 55ab00e
Author: Benoit Tellier
Authored: Wed Oct 10 14:48:25 2018 +0700
Committer: Antoine Duprat
Committed: Tue Dec 11 15:36:05 2018 +0100
--
.../org/apache/james/spamassassin/SpamAssassinWaitStrategy.java | 4 ++--
.../src/test/resources/docker/spamassassin/Dockerfile| 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/james-project/blob/acd245f7/third-party/spamassassin/src/test/java/org/apache/james/spamassassin/SpamAssassinWaitStrategy.java
--
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 c9f1c7a..8947a2c 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
@@ -34,7 +34,7 @@ public class SpamAssassinWaitStrategy implements WaitStrategy
{
private static final Duration DEFAULT_TIMEOUT = Duration.ofMinutes(1);
private final GenericContainer spamAssassinContainer;
-private Duration timeout = DEFAULT_TIMEOUT;
+private final Duration timeout;
public SpamAssassinWaitStrategy(GenericContainer spamAssassinContainer)
{
this(spamAssassinContainer, DEFAULT_TIMEOUT);
@@ -52,7 +52,7 @@ public class SpamAssassinWaitStrategy implements WaitStrategy
{
return spamAssassinContainer
.execInContainer("spamassassin", "-V")
.getStdout()
-.contains("SpamAssassin version 3.4.1");
+.contains("SpamAssassin version 3.4.2");
} catch (IOException | InterruptedException e) {
return false;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/acd245f7/third-party/spamassassin/src/test/resources/docker/spamassassin/Dockerfile
--
diff --git
a/third-party/spamassassin/src/test/resources/docker/spamassassin/Dockerfile
b/third-party/spamassassin/src/test/resources/docker/spamassassin/Dockerfile
index ad1187a..3f42b25 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
-ENV SPAMASSASSIN_VERSION 3.4.1
+ENV SPAMASSASSIN_VERSION 3.4.2
RUN apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
[3/5] james-project git commit: JAMES-2558 Tests should rely on SpamAssassin 3.4.2
JAMES-2558 Tests should rely on SpamAssassin 3.4.2
Fixes CVE-2017-15705, CVE-2016-1238, CVE-2018-11780 & CVE-2018-11781
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/743bc85b
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/743bc85b
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/743bc85b
Branch: refs/heads/master
Commit: 743bc85b3eda9027cb407b99e0ed70f43fa60a65
Parents: 3c52930
Author: Benoit Tellier
Authored: Wed Oct 10 14:48:25 2018 +0700
Committer: Benoit Tellier
Committed: Wed Nov 14 16:22:47 2018 +0700
--
.../org/apache/james/spamassassin/SpamAssassinWaitStrategy.java | 4 ++--
.../src/test/resources/docker/spamassassin/Dockerfile| 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/james-project/blob/743bc85b/third-party/spamassassin/src/test/java/org/apache/james/spamassassin/SpamAssassinWaitStrategy.java
--
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 c9f1c7a..8947a2c 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
@@ -34,7 +34,7 @@ public class SpamAssassinWaitStrategy implements WaitStrategy
{
private static final Duration DEFAULT_TIMEOUT = Duration.ofMinutes(1);
private final GenericContainer spamAssassinContainer;
-private Duration timeout = DEFAULT_TIMEOUT;
+private final Duration timeout;
public SpamAssassinWaitStrategy(GenericContainer spamAssassinContainer)
{
this(spamAssassinContainer, DEFAULT_TIMEOUT);
@@ -52,7 +52,7 @@ public class SpamAssassinWaitStrategy implements WaitStrategy
{
return spamAssassinContainer
.execInContainer("spamassassin", "-V")
.getStdout()
-.contains("SpamAssassin version 3.4.1");
+.contains("SpamAssassin version 3.4.2");
} catch (IOException | InterruptedException e) {
return false;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/743bc85b/third-party/spamassassin/src/test/resources/docker/spamassassin/Dockerfile
--
diff --git
a/third-party/spamassassin/src/test/resources/docker/spamassassin/Dockerfile
b/third-party/spamassassin/src/test/resources/docker/spamassassin/Dockerfile
index ad1187a..3f42b25 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
-ENV SPAMASSASSIN_VERSION 3.4.1
+ENV SPAMASSASSIN_VERSION 3.4.2
RUN apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
