You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ma...@apache.org on 2018/07/27 08:19:16 UTC
[5/6] james-project git commit: JAMES-2479 upgrade assertj
JAMES-2479 upgrade assertj
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/acf75a38
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/acf75a38
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/acf75a38
Branch: refs/heads/master
Commit: acf75a3816d6922320942db95f407419779719ba
Parents: af080a4
Author: Matthieu Baechler <ma...@apache.org>
Authored: Thu Jul 19 17:14:54 2018 +0200
Committer: Matthieu Baechler <ma...@apache.org>
Committed: Fri Jul 27 10:16:54 2018 +0200
----------------------------------------------------------------------
pom.xml | 6 +++---
.../james/transport/mailets/ICSAttachmentWorkflowTest.java | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/acf75a38/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 267f5d9..f6f4594 100644
--- a/pom.xml
+++ b/pom.xml
@@ -629,8 +629,8 @@
<karaf.version>2.3.0</karaf.version>
<karaf.tooling.exam.container.version>2.3.0</karaf.tooling.exam.container.version>
<pax-logging-api.version>1.6.4</pax-logging-api.version>
+ <jackson.version>2.9.6</jackson.version>
<jetty.version>9.4.11.v20180605</jetty.version>
- <assertj-guava.version>3.1.0</assertj-guava.version>
<testcontainers.version>1.8.1</testcontainers.version>
<metrics.version>3.2.6</metrics.version>
<joda.version>2.9.4</joda.version>
@@ -2247,12 +2247,12 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
- <version>3.8.0</version>
+ <version>3.10.0</version>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-guava</artifactId>
- <version>${assertj-guava.version}</version>
+ <version>3.2.0</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/acf75a38/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ICSAttachmentWorkflowTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ICSAttachmentWorkflowTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ICSAttachmentWorkflowTest.java
index 997251e..e8ecd93 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ICSAttachmentWorkflowTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ICSAttachmentWorkflowTest.java
@@ -785,6 +785,6 @@ public class ICSAttachmentWorkflowTest {
.select(IMAPMessageReader.INBOX)
.awaitMessage(awaitAtMostOneMinute);
assertThat(imapMessageReader.readFirstMessage())
- .containsSequence("Content-Type: multipart/mixed", "Content-Disposition: attachment");
+ .containsSubsequence("Content-Type: multipart/mixed", "Content-Disposition: attachment");
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org