JAMES-2107 Drop assertj version prior Java 8
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/fc6536ef Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/fc6536ef Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/fc6536ef Branch: refs/heads/master Commit: fc6536ef71be8bbac9940aa499026441e82f811c Parents: 24270c4 Author: benwa <btell...@linagora.com> Authored: Tue Aug 1 11:13:52 2017 +0700 Committer: benwa <btell...@linagora.com> Committed: Wed Aug 16 16:31:42 2017 +0700 ---------------------------------------------------------------------- backends-common/cassandra/pom.xml | 1 - backends-common/elasticsearch/pom.xml | 1 - backends-common/pom.xml | 5 ++ mailbox/api/pom.xml | 1 - mailbox/cassandra/pom.xml | 1 - .../mail/CassandraApplicableFlagDAOTest.java | 36 +++++------ .../cassandra/mail/CassandraBlobsDAOTest.java | 9 +-- .../mail/CassandraFirstUnseenDAOTest.java | 41 +++++-------- .../mail/CassandraMailboxCounterDAOTest.java | 63 +++++++++----------- .../cassandra/mail/CassandraMailboxDAOTest.java | 11 ++-- .../mail/CassandraMailboxPathDAOTest.java | 16 ++--- mailbox/elasticsearch/pom.xml | 1 - mailbox/hbase/pom.xml | 1 - mailbox/jcr/pom.xml | 1 - mailbox/jpa/pom.xml | 1 - mailbox/kafka/pom.xml | 1 - mailbox/lucene/pom.xml | 1 - mailbox/maildir/pom.xml | 1 - mailbox/memory/pom.xml | 1 - mailbox/pom.xml | 10 +++- mailbox/scanning-search/pom.xml | 1 - mailbox/store/pom.xml | 1 - .../model/impl/SimpleMailboxMessageTest.java | 10 ++-- mailbox/tika/pom.xml | 1 - mailbox/tool/pom.xml | 1 - mailet/icalendar/pom.xml | 1 - mailet/pom.xml | 7 +-- .../transport/mailets/StripAttachmentTest.java | 2 +- mpt/core/pom.xml | 1 - mpt/pom.xml | 1 - protocols/imap/pom.xml | 1 - protocols/lmtp/pom.xml | 1 - protocols/managesieve/pom.xml | 1 - protocols/pom.xml | 6 +- protocols/pop3/pom.xml | 1 - protocols/smtp/pom.xml | 1 - server/container/cli-integration/pom.xml | 1 - server/container/cli/pom.xml | 1 - server/container/core/pom.xml | 1 - server/container/filesystem-api/pom.xml | 1 - server/container/guice/cassandra-guice/pom.xml | 1 - .../guice/cassandra-ldap-guice/pom.xml | 1 - server/container/guice/guice-common/pom.xml | 1 - server/container/guice/jpa-guice/pom.xml | 1 - server/container/guice/jpa-smtp/pom.xml | 1 - server/container/guice/mailet/pom.xml | 1 - server/container/guice/memory-guice/pom.xml | 1 - server/container/jetty/pom.xml | 1 - server/container/mailbox-adapter/pom.xml | 1 - .../metrics/metrics-es-reporter/pom.xml | 1 - server/container/spring/pom.xml | 1 - server/container/util-java8/pom.xml | 1 - server/container/util/pom.xml | 1 - server/data/data-cassandra/pom.xml | 1 - server/data/data-file/pom.xml | 1 - server/data/data-hbase/pom.xml | 1 - server/data/data-jcr/pom.xml | 1 - server/data/data-jdbc/pom.xml | 1 - server/data/data-jmap-cassandra/pom.xml | 1 - server/data/data-jmap/pom.xml | 1 - server/data/data-jpa/pom.xml | 1 - .../data/data-ldap-integration-testing/pom.xml | 1 - server/data/data-ldap/pom.xml | 1 - server/data/data-library/pom.xml | 2 - server/data/data-memory/pom.xml | 1 - server/mailet/integration-testing/pom.xml | 1 - server/mailet/mailetcontainer-camel/pom.xml | 1 - server/mailet/mailets/pom.xml | 2 - server/pom.xml | 13 +++- .../cassandra-jmap-integration-testing/pom.xml | 1 - .../jmap-integration-testing-common/pom.xml | 1 - .../memory-jmap-integration-testing/pom.xml | 1 - server/protocols/jmap/pom.xml | 1 - server/protocols/jwt/pom.xml | 1 - server/protocols/protocols-imap4/pom.xml | 1 - server/protocols/protocols-smtp/pom.xml | 1 - .../protocols/webadmin-integration-test/pom.xml | 1 - .../webadmin/webadmin-cassandra/pom.xml | 1 - server/protocols/webadmin/webadmin-core/pom.xml | 1 - server/protocols/webadmin/webadmin-data/pom.xml | 1 - .../protocols/webadmin/webadmin-mailbox/pom.xml | 1 - server/queue/queue-api/pom.xml | 1 - 82 files changed, 111 insertions(+), 189 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/backends-common/cassandra/pom.xml ---------------------------------------------------------------------- diff --git a/backends-common/cassandra/pom.xml b/backends-common/cassandra/pom.xml index f65b3e6..0d237f8 100644 --- a/backends-common/cassandra/pom.xml +++ b/backends-common/cassandra/pom.xml @@ -165,7 +165,6 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>${assertj-3.version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/backends-common/elasticsearch/pom.xml ---------------------------------------------------------------------- diff --git a/backends-common/elasticsearch/pom.xml b/backends-common/elasticsearch/pom.xml index 0dd2f46..e418616 100644 --- a/backends-common/elasticsearch/pom.xml +++ b/backends-common/elasticsearch/pom.xml @@ -144,7 +144,6 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>${assertj-3.version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/backends-common/pom.xml ---------------------------------------------------------------------- diff --git a/backends-common/pom.xml b/backends-common/pom.xml index bdca169..f0444c0 100644 --- a/backends-common/pom.xml +++ b/backends-common/pom.xml @@ -68,6 +68,11 @@ <version>${junit.version}</version> </dependency> <dependency> + <groupId>org.assertj</groupId> + <artifactId>assertj-core</artifactId> + <version>${assertj-3.version}</version> + </dependency> + <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> <version>${slf4j.version}</version> http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/mailbox/api/pom.xml ---------------------------------------------------------------------- diff --git a/mailbox/api/pom.xml b/mailbox/api/pom.xml index 62e7aec..46a532c 100644 --- a/mailbox/api/pom.xml +++ b/mailbox/api/pom.xml @@ -75,7 +75,6 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>${assertj-1.version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/mailbox/cassandra/pom.xml ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/pom.xml b/mailbox/cassandra/pom.xml index 1e39812..e65e8de 100644 --- a/mailbox/cassandra/pom.xml +++ b/mailbox/cassandra/pom.xml @@ -242,7 +242,6 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>${assertj-1.version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraApplicableFlagDAOTest.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraApplicableFlagDAOTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraApplicableFlagDAOTest.java index 4c7f736..fd380db 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraApplicableFlagDAOTest.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraApplicableFlagDAOTest.java @@ -21,8 +21,6 @@ package org.apache.james.mailbox.cassandra.mail; import static org.assertj.core.api.Assertions.assertThat; -import java.util.Optional; - import javax.mail.Flags; import org.apache.james.backends.cassandra.CassandraCluster; @@ -61,25 +59,24 @@ public class CassandraApplicableFlagDAOTest { @Test public void updateApplicableFlagsShouldReturnEmptyByDefault() throws Exception { - Optional<Flags> actual = testee.retrieveApplicableFlag(CASSANDRA_ID).join(); - assertThat(actual.isPresent()).isFalse(); + assertThat(testee.retrieveApplicableFlag(CASSANDRA_ID).join()) + .isEmpty(); } @Test public void updateApplicableFlagsShouldSupportEmptyUserFlags() throws Exception { testee.updateApplicableFlags(CASSANDRA_ID, ImmutableSet.of()).join(); - Optional<Flags> actual = testee.retrieveApplicableFlag(CASSANDRA_ID).join(); - assertThat(actual.isPresent()).isFalse(); + assertThat(testee.retrieveApplicableFlag(CASSANDRA_ID).join()) + .isEmpty(); } @Test public void updateApplicableFlagsShouldUpdateUserFlag() throws Exception { testee.updateApplicableFlags(CASSANDRA_ID, ImmutableSet.of(USER_FLAG)).join(); - Optional<Flags> actual = testee.retrieveApplicableFlag(CASSANDRA_ID).join(); - assertThat(actual.isPresent()).isTrue(); - assertThat(actual.get()).isEqualTo(new Flags(USER_FLAG)); + assertThat(testee.retrieveApplicableFlag(CASSANDRA_ID).join()) + .contains(new Flags(USER_FLAG)); } @Test @@ -87,9 +84,8 @@ public class CassandraApplicableFlagDAOTest { testee.updateApplicableFlags(CASSANDRA_ID, ImmutableSet.of(USER_FLAG)).join(); testee.updateApplicableFlags(CASSANDRA_ID, ImmutableSet.of(USER_FLAG2)).join(); - Optional<Flags> actual = testee.retrieveApplicableFlag(CASSANDRA_ID).join(); - assertThat(actual.isPresent()).isTrue(); - assertThat(actual.get()).isEqualTo(FlagsBuilder.builder().add(USER_FLAG, USER_FLAG2).build()); + assertThat(testee.retrieveApplicableFlag(CASSANDRA_ID).join()) + .contains(FlagsBuilder.builder().add(USER_FLAG, USER_FLAG2).build()); } @Test @@ -97,9 +93,8 @@ public class CassandraApplicableFlagDAOTest { testee.updateApplicableFlags(CASSANDRA_ID, ImmutableSet.of(USER_FLAG)).join(); testee.updateApplicableFlags(CASSANDRA_ID, ImmutableSet.of(USER_FLAG)).join(); - Optional<Flags> actual = testee.retrieveApplicableFlag(CASSANDRA_ID).join(); - assertThat(actual.isPresent()).isTrue(); - assertThat(actual.get()).isEqualTo(new Flags(USER_FLAG)); + assertThat(testee.retrieveApplicableFlag(CASSANDRA_ID).join()) + .contains(new Flags(USER_FLAG)); } @Test @@ -107,19 +102,16 @@ public class CassandraApplicableFlagDAOTest { testee.updateApplicableFlags(CASSANDRA_ID, ImmutableSet.of(USER_FLAG)).join(); testee.updateApplicableFlags(CASSANDRA_ID, ImmutableSet.of(USER_FLAG, USER_FLAG2)).join(); - - Optional<Flags> actual = testee.retrieveApplicableFlag(CASSANDRA_ID).join(); - assertThat(actual.isPresent()).isTrue(); - assertThat(actual.get()).isEqualTo(FlagsBuilder.builder().add(USER_FLAG, USER_FLAG2).build()); + assertThat(testee.retrieveApplicableFlag(CASSANDRA_ID).join()) + .contains(FlagsBuilder.builder().add(USER_FLAG, USER_FLAG2).build()); } @Test public void updateApplicableFlagsShouldUpdateMultiFlags() throws Exception { testee.updateApplicableFlags(CASSANDRA_ID, ImmutableSet.of(USER_FLAG, USER_FLAG2)).join(); - Optional<Flags> actual = testee.retrieveApplicableFlag(CASSANDRA_ID).join(); - assertThat(actual.isPresent()).isTrue(); - assertThat(actual.get()).isEqualTo(FlagsBuilder.builder().add(USER_FLAG, USER_FLAG2).build()); + assertThat(testee.retrieveApplicableFlag(CASSANDRA_ID).join()) + .contains(FlagsBuilder.builder().add(USER_FLAG, USER_FLAG2).build()); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraBlobsDAOTest.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraBlobsDAOTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraBlobsDAOTest.java index 96275e2..f398b9b 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraBlobsDAOTest.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraBlobsDAOTest.java @@ -62,7 +62,8 @@ public class CassandraBlobsDAOTest { public void saveShouldReturnEmptyWhenNullData() throws Exception { Optional<BlobId> blobId = testee.save(null).join(); - assertThat(blobId.isPresent()).isFalse(); + + assertThat(blobId).isEmpty(); } @Test @@ -71,7 +72,7 @@ public class CassandraBlobsDAOTest { byte[] bytes = testee.read(blobId.get()).join(); - assertThat(blobId.isPresent()).isTrue(); + assertThat(blobId).isPresent(); assertThat(new String(bytes, Charsets.UTF_8)).isEmpty(); } @@ -81,7 +82,7 @@ public class CassandraBlobsDAOTest { byte[] bytes = testee.read(blobId.get()).join(); - assertThat(blobId.isPresent()).isTrue(); + assertThat(blobId).isPresent(); assertThat(new String(bytes, Charsets.UTF_8)).isEmpty(); } @@ -89,7 +90,7 @@ public class CassandraBlobsDAOTest { public void saveShouldReturnBlobId() throws Exception { Optional<BlobId> blobId = testee.save("toto".getBytes(Charsets.UTF_8)).join(); - assertThat(blobId.isPresent()).isTrue(); + assertThat(blobId).isPresent(); } @Test http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraFirstUnseenDAOTest.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraFirstUnseenDAOTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraFirstUnseenDAOTest.java index d9fb0df..45d8e20 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraFirstUnseenDAOTest.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraFirstUnseenDAOTest.java @@ -21,8 +21,6 @@ package org.apache.james.mailbox.cassandra.mail; import static org.assertj.core.api.Assertions.assertThat; -import java.util.Optional; - import org.apache.james.backends.cassandra.CassandraCluster; import org.apache.james.mailbox.MessageUid; import org.apache.james.mailbox.cassandra.ids.CassandraId; @@ -64,10 +62,8 @@ public class CassandraFirstUnseenDAOTest { public void addUnreadShouldThenBeReportedAsFirstUnseen() { testee.addUnread(MAILBOX_ID, UID_1).join(); - Optional<MessageUid> firstUnseen = testee.retrieveFirstUnread(MAILBOX_ID).join(); - - assertThat(firstUnseen.isPresent()).isTrue(); - assertThat(firstUnseen.get()).isEqualTo(UID_1); + assertThat(testee.retrieveFirstUnread(MAILBOX_ID).join()) + .contains(UID_1); } @Test @@ -76,9 +72,8 @@ public class CassandraFirstUnseenDAOTest { testee.addUnread(MAILBOX_ID, UID_2).join(); - Optional<MessageUid> firstUnseen = testee.retrieveFirstUnread(MAILBOX_ID).join(); - assertThat(firstUnseen.isPresent()).isTrue(); - assertThat(firstUnseen.get()).isEqualTo(UID_1); + assertThat(testee.retrieveFirstUnread(MAILBOX_ID).join()) + .contains(UID_1); } @Test @@ -87,9 +82,8 @@ public class CassandraFirstUnseenDAOTest { testee.addUnread(MAILBOX_ID, UID_1).join(); - Optional<MessageUid> firstUnseen = testee.retrieveFirstUnread(MAILBOX_ID).join(); - assertThat(firstUnseen.isPresent()).isTrue(); - assertThat(firstUnseen.get()).isEqualTo(UID_1); + assertThat(testee.retrieveFirstUnread(MAILBOX_ID).join()) + .contains(UID_1); } @Test @@ -98,9 +92,8 @@ public class CassandraFirstUnseenDAOTest { testee.addUnread(MAILBOX_ID, UID_1).join(); - Optional<MessageUid> firstUnseen = testee.retrieveFirstUnread(MAILBOX_ID).join(); - assertThat(firstUnseen.isPresent()).isTrue(); - assertThat(firstUnseen.get()).isEqualTo(UID_1); + assertThat(testee.retrieveFirstUnread(MAILBOX_ID).join()) + .contains(UID_1); } @@ -108,8 +101,8 @@ public class CassandraFirstUnseenDAOTest { public void removeUnreadShouldReturnWhenNoData() { testee.removeUnread(MAILBOX_ID, UID_1).join(); - Optional<MessageUid> firstUnseen = testee.retrieveFirstUnread(MAILBOX_ID).join(); - assertThat(firstUnseen.isPresent()).isFalse(); + assertThat(testee.retrieveFirstUnread(MAILBOX_ID).join()) + .isEmpty(); } @Test @@ -118,8 +111,8 @@ public class CassandraFirstUnseenDAOTest { testee.removeUnread(MAILBOX_ID, UID_1).join(); - Optional<MessageUid> firstUnseen = testee.retrieveFirstUnread(MAILBOX_ID).join(); - assertThat(firstUnseen.isPresent()).isFalse(); + assertThat(testee.retrieveFirstUnread(MAILBOX_ID).join()) + .isEmpty(); } @Test @@ -129,9 +122,8 @@ public class CassandraFirstUnseenDAOTest { testee.removeUnread(MAILBOX_ID, UID_2).join(); - Optional<MessageUid> firstUnseen = testee.retrieveFirstUnread(MAILBOX_ID).join(); - assertThat(firstUnseen.isPresent()).isTrue(); - assertThat(firstUnseen.get()).isEqualTo(UID_1); + assertThat(testee.retrieveFirstUnread(MAILBOX_ID).join()) + .contains(UID_1); } @Test @@ -141,8 +133,7 @@ public class CassandraFirstUnseenDAOTest { testee.removeUnread(MAILBOX_ID, UID_1).join(); - Optional<MessageUid> firstUnseen = testee.retrieveFirstUnread(MAILBOX_ID).join(); - assertThat(firstUnseen.isPresent()).isTrue(); - assertThat(firstUnseen.get()).isEqualTo(UID_2); + assertThat(testee.retrieveFirstUnread(MAILBOX_ID).join()) + .contains(UID_2); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxCounterDAOTest.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxCounterDAOTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxCounterDAOTest.java index dd774ca..4964d9a 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxCounterDAOTest.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxCounterDAOTest.java @@ -21,8 +21,6 @@ package org.apache.james.mailbox.cassandra.mail; import static org.assertj.core.api.Assertions.assertThat; -import java.util.Optional; - import org.apache.james.backends.cassandra.CassandraCluster; import org.apache.james.mailbox.cassandra.ids.CassandraId; import org.apache.james.mailbox.cassandra.modules.CassandraMailboxCounterModule; @@ -59,42 +57,39 @@ public class CassandraMailboxCounterDAOTest { @Test public void countMessagesInMailboxShouldReturnEmptyByDefault() throws Exception { - assertThat(testee.countMessagesInMailbox(mailbox).join().isPresent()).isFalse(); + assertThat(testee.countMessagesInMailbox(mailbox).join()).isEmpty(); } @Test public void countUnseenMessagesInMailboxShouldReturnEmptyByDefault() throws Exception { - assertThat(testee.countUnseenMessagesInMailbox(mailbox).join().isPresent()).isFalse(); + assertThat(testee.countUnseenMessagesInMailbox(mailbox).join()).isEmpty(); } @Test public void retrieveMailboxCounterShouldReturnEmptyByDefault() throws Exception { - assertThat(testee.retrieveMailboxCounters(mailbox).join().isPresent()).isFalse(); + assertThat(testee.retrieveMailboxCounters(mailbox).join()).isEmpty(); } @Test public void incrementCountShouldAddOneWhenAbsent() throws Exception { testee.incrementCount(MAILBOX_ID).join(); - assertThat(testee.countMessagesInMailbox(mailbox).join().get()).isEqualTo(1); + assertThat(testee.countMessagesInMailbox(mailbox).join()).contains(1L); } @Test public void incrementUnseenShouldAddOneWhenAbsent() throws Exception { testee.incrementUnseen(MAILBOX_ID).join(); - assertThat(testee.countUnseenMessagesInMailbox(mailbox).join().isPresent()).isTrue(); - assertThat(testee.countUnseenMessagesInMailbox(mailbox).join().get()).isEqualTo(1); + assertThat(testee.countUnseenMessagesInMailbox(mailbox).join()).contains(1L); } @Test public void incrementUnseenShouldAddOneWhenAbsentOnMailboxCounters() throws Exception { testee.incrementUnseen(MAILBOX_ID).join(); - Optional<MailboxCounters> mailboxCounters = testee.retrieveMailboxCounters(mailbox).join(); - assertThat(mailboxCounters.isPresent()).isTrue(); - assertThat(mailboxCounters.get()) - .isEqualTo(MailboxCounters.builder() + assertThat(testee.retrieveMailboxCounters(mailbox).join()) + .contains(MailboxCounters.builder() .count(0L) .unseen(1L) .build()); @@ -104,10 +99,8 @@ public class CassandraMailboxCounterDAOTest { public void incrementCountShouldAddOneWhenAbsentOnMailboxCounters() throws Exception { testee.incrementCount(MAILBOX_ID).join(); - Optional<MailboxCounters> mailboxCounters = testee.retrieveMailboxCounters(mailbox).join(); - assertThat(mailboxCounters.isPresent()).isTrue(); - assertThat(mailboxCounters.get()) - .isEqualTo(MailboxCounters.builder() + assertThat(testee.retrieveMailboxCounters(mailbox).join()) + .contains(MailboxCounters.builder() .count(1L) .unseen(0L) .build()); @@ -118,10 +111,8 @@ public class CassandraMailboxCounterDAOTest { testee.incrementCount(MAILBOX_ID).join(); testee.incrementUnseen(MAILBOX_ID).join(); - Optional<MailboxCounters> mailboxCounters = testee.retrieveMailboxCounters(mailbox).join(); - assertThat(mailboxCounters.isPresent()).isTrue(); - assertThat(mailboxCounters.get()) - .isEqualTo(MailboxCounters.builder() + assertThat(testee.retrieveMailboxCounters(mailbox).join()) + .contains(MailboxCounters.builder() .count(1L) .unseen(1L) .build()); @@ -133,8 +124,8 @@ public class CassandraMailboxCounterDAOTest { testee.decrementCount(MAILBOX_ID).join(); - assertThat(testee.countMessagesInMailbox(mailbox).join().isPresent()).isTrue(); - assertThat(testee.countMessagesInMailbox(mailbox).join().get()).isEqualTo(0); + assertThat(testee.countMessagesInMailbox(mailbox).join()) + .contains(0L); } @Test @@ -143,24 +134,24 @@ public class CassandraMailboxCounterDAOTest { testee.decrementUnseen(MAILBOX_ID).join(); - assertThat(testee.countUnseenMessagesInMailbox(mailbox).join().isPresent()).isTrue(); - assertThat(testee.countUnseenMessagesInMailbox(mailbox).join().get()).isEqualTo(0); + assertThat(testee.countUnseenMessagesInMailbox(mailbox).join()) + .contains(0L); } @Test public void incrementUnseenShouldHaveNoImpactOnMessageCount() throws Exception { testee.incrementUnseen(MAILBOX_ID).join(); - assertThat(testee.countMessagesInMailbox(mailbox).join().isPresent()).isTrue(); - assertThat(testee.countMessagesInMailbox(mailbox).join().get()).isEqualTo(0); + assertThat(testee.countMessagesInMailbox(mailbox).join()) + .contains(0L); } @Test public void incrementCountShouldHaveNoEffectOnUnseenCount() throws Exception { testee.incrementCount(MAILBOX_ID).join(); - assertThat(testee.countUnseenMessagesInMailbox(mailbox).join().isPresent()).isTrue(); - assertThat(testee.countUnseenMessagesInMailbox(mailbox).join().get()).isEqualTo(0); + assertThat(testee.countUnseenMessagesInMailbox(mailbox).join()) + .contains(0L); } @Test @@ -169,8 +160,8 @@ public class CassandraMailboxCounterDAOTest { testee.decrementUnseen(MAILBOX_ID).join(); - assertThat(testee.countMessagesInMailbox(mailbox).join().isPresent()).isTrue(); - assertThat(testee.countMessagesInMailbox(mailbox).join().get()).isEqualTo(1); + assertThat(testee.countMessagesInMailbox(mailbox).join()) + .contains(1L); } @Test @@ -179,23 +170,23 @@ public class CassandraMailboxCounterDAOTest { testee.decrementCount(MAILBOX_ID).join(); - assertThat(testee.countUnseenMessagesInMailbox(mailbox).join().isPresent()).isTrue(); - assertThat(testee.countUnseenMessagesInMailbox(mailbox).join().get()).isEqualTo(1); + assertThat(testee.countUnseenMessagesInMailbox(mailbox).join()) + .contains(1L); } @Test public void decrementCountCanLeadToNegativeValue() throws Exception { testee.decrementCount(MAILBOX_ID).join(); - assertThat(testee.countMessagesInMailbox(mailbox).join().isPresent()).isTrue(); - assertThat(testee.countMessagesInMailbox(mailbox).join().get()).isEqualTo(-1); + assertThat(testee.countMessagesInMailbox(mailbox).join()) + .contains(-1L); } @Test public void decrementUnseenCanLeadToNegativeValue() throws Exception { testee.decrementUnseen(MAILBOX_ID).join(); - assertThat(testee.countUnseenMessagesInMailbox(mailbox).join().isPresent()).isTrue(); - assertThat(testee.countUnseenMessagesInMailbox(mailbox).join().get()).isEqualTo(-1); + assertThat(testee.countUnseenMessagesInMailbox(mailbox).join()) + .contains(-1L); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxDAOTest.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxDAOTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxDAOTest.java index 986794c..b3bbb78 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxDAOTest.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxDAOTest.java @@ -72,8 +72,8 @@ public class CassandraMailboxDAOTest { @Test public void retrieveMailboxShouldReturnEmptyWhenNone() { - Optional<SimpleMailbox> mailboxOptional = testee.retrieveMailbox(CASSANDRA_ID_1).join(); - assertThat(mailboxOptional.isPresent()).isFalse(); + assertThat(testee.retrieveMailbox(CASSANDRA_ID_1).join()) + .isEmpty(); } @Test @@ -143,8 +143,8 @@ public class CassandraMailboxDAOTest { testee.delete(CASSANDRA_ID_1).join(); - Optional<SimpleMailbox> mailboxOptional = testee.retrieveMailbox(CASSANDRA_ID_1).join(); - assertThat(mailboxOptional.isPresent()).isFalse(); + assertThat(testee.retrieveMailbox(CASSANDRA_ID_1).join()) + .isEmpty(); } @Test @@ -161,8 +161,7 @@ public class CassandraMailboxDAOTest { mailbox1.setNamespace(NEW_MAILBOX_PATH.getNamespace()); mailbox1.setUser(NEW_MAILBOX_PATH.getUser()); mailbox1.setName(NEW_MAILBOX_PATH.getName()); - Optional<SimpleMailbox> readMailbox = testee.retrieveMailbox(CASSANDRA_ID_1) - .join(); + Optional<SimpleMailbox> readMailbox = testee.retrieveMailbox(CASSANDRA_ID_1).join(); assertThat(readMailbox.isPresent()).isTrue(); assertThat(readMailbox.get()).isEqualToComparingFieldByField(mailbox1); } http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxPathDAOTest.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxPathDAOTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxPathDAOTest.java index 69d442b..7e42ba1 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxPathDAOTest.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxPathDAOTest.java @@ -22,7 +22,6 @@ package org.apache.james.mailbox.cassandra.mail; import static org.assertj.core.api.Assertions.assertThat; import java.util.List; -import java.util.Optional; import org.apache.james.backends.cassandra.CassandraCluster; import org.apache.james.mailbox.cassandra.ids.CassandraId; @@ -78,9 +77,8 @@ public class CassandraMailboxPathDAOTest { public void saveShouldInsertNewEntry() throws Exception { assertThat(testee.save(USER_INBOX_MAILBOXPATH, INBOX_ID).join()).isTrue(); - Optional<CassandraIdAndPath> cassandraIdAndPath = testee.retrieveId(USER_INBOX_MAILBOXPATH).join(); - assertThat(cassandraIdAndPath.get()) - .isEqualTo(INBOX_ID_AND_PATH); + assertThat(testee.retrieveId(USER_INBOX_MAILBOXPATH).join()) + .contains(INBOX_ID_AND_PATH); } @Test @@ -100,9 +98,8 @@ public class CassandraMailboxPathDAOTest { public void retrieveIdShouldReturnStoredData() throws Exception { testee.save(USER_INBOX_MAILBOXPATH, INBOX_ID).join(); - Optional<CassandraIdAndPath> cassandraIdAndPath = testee.retrieveId(USER_INBOX_MAILBOXPATH).join(); - assertThat(cassandraIdAndPath.get()) - .isEqualTo(INBOX_ID_AND_PATH); + assertThat(testee.retrieveId(USER_INBOX_MAILBOXPATH).join()) + .contains(INBOX_ID_AND_PATH); } @Test @@ -132,8 +129,7 @@ public class CassandraMailboxPathDAOTest { testee.delete(USER_INBOX_MAILBOXPATH).join(); - assertThat(testee.retrieveId(USER_INBOX_MAILBOXPATH).join() - .isPresent()) - .isFalse(); + assertThat(testee.retrieveId(USER_INBOX_MAILBOXPATH).join()) + .isEmpty(); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/mailbox/elasticsearch/pom.xml ---------------------------------------------------------------------- diff --git a/mailbox/elasticsearch/pom.xml b/mailbox/elasticsearch/pom.xml index b564a86..6215fd0 100644 --- a/mailbox/elasticsearch/pom.xml +++ b/mailbox/elasticsearch/pom.xml @@ -248,7 +248,6 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>${assertj-3.version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/mailbox/hbase/pom.xml ---------------------------------------------------------------------- diff --git a/mailbox/hbase/pom.xml b/mailbox/hbase/pom.xml index d8b0fa7..b5a83f0 100644 --- a/mailbox/hbase/pom.xml +++ b/mailbox/hbase/pom.xml @@ -120,7 +120,6 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>${assertj-1.version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/mailbox/jcr/pom.xml ---------------------------------------------------------------------- diff --git a/mailbox/jcr/pom.xml b/mailbox/jcr/pom.xml index 69e0cae..ed19b51 100644 --- a/mailbox/jcr/pom.xml +++ b/mailbox/jcr/pom.xml @@ -101,7 +101,6 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>${assertj-1.version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/mailbox/jpa/pom.xml ---------------------------------------------------------------------- diff --git a/mailbox/jpa/pom.xml b/mailbox/jpa/pom.xml index b1e3f0f..59c8c7a 100644 --- a/mailbox/jpa/pom.xml +++ b/mailbox/jpa/pom.xml @@ -83,7 +83,6 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>${assertj-1.version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/mailbox/kafka/pom.xml ---------------------------------------------------------------------- diff --git a/mailbox/kafka/pom.xml b/mailbox/kafka/pom.xml index 0931c47..d524f1b 100644 --- a/mailbox/kafka/pom.xml +++ b/mailbox/kafka/pom.xml @@ -161,7 +161,6 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>${assertj-3.version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/mailbox/lucene/pom.xml ---------------------------------------------------------------------- diff --git a/mailbox/lucene/pom.xml b/mailbox/lucene/pom.xml index e5a3053..f230561 100644 --- a/mailbox/lucene/pom.xml +++ b/mailbox/lucene/pom.xml @@ -92,7 +92,6 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>${assertj-1.version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/mailbox/maildir/pom.xml ---------------------------------------------------------------------- diff --git a/mailbox/maildir/pom.xml b/mailbox/maildir/pom.xml index fc15c3a..823e760 100644 --- a/mailbox/maildir/pom.xml +++ b/mailbox/maildir/pom.xml @@ -89,7 +89,6 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>${assertj-1.version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/mailbox/memory/pom.xml ---------------------------------------------------------------------- diff --git a/mailbox/memory/pom.xml b/mailbox/memory/pom.xml index 48eaea9..2a2c23b 100644 --- a/mailbox/memory/pom.xml +++ b/mailbox/memory/pom.xml @@ -87,7 +87,6 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>${assertj-1.version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/mailbox/pom.xml ---------------------------------------------------------------------- diff --git a/mailbox/pom.xml b/mailbox/pom.xml index 07246d5..e75159b 100644 --- a/mailbox/pom.xml +++ b/mailbox/pom.xml @@ -104,10 +104,8 @@ <mockito-core.version>1.9.0</mockito-core.version> <jasypt.version>1.9.0</jasypt.version> <guava.version>18.0</guava.version> - <assertj.version>1.7.1</assertj.version> <jackson-databinding.version>2.6.3</jackson-databinding.version> <cassandra-unit.version>2.1.9.2</cassandra-unit.version> - <assertj-1.version>1.7.1</assertj-1.version> <assertj-3.version>3.2.0</assertj-3.version> <logback.version>1.1.7</logback.version> </properties> @@ -482,6 +480,12 @@ <artifactId>equalsverifier</artifactId> <version>1.7.6</version> </dependency> + + <dependency> + <groupId>org.assertj</groupId> + <artifactId>assertj-core</artifactId> + <version>${assertj-3.version}</version> + </dependency> <!-- END Testing --> @@ -631,7 +635,7 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-guava</artifactId> - <version>1.3.1</version> + <version>3.1.0</version> </dependency> <dependency> <groupId>org.testcontainers</groupId> http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/mailbox/scanning-search/pom.xml ---------------------------------------------------------------------- diff --git a/mailbox/scanning-search/pom.xml b/mailbox/scanning-search/pom.xml index 4d7297a..b512463 100644 --- a/mailbox/scanning-search/pom.xml +++ b/mailbox/scanning-search/pom.xml @@ -185,7 +185,6 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>${assertj-3.version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/mailbox/store/pom.xml ---------------------------------------------------------------------- diff --git a/mailbox/store/pom.xml b/mailbox/store/pom.xml index 95af179..7459362 100644 --- a/mailbox/store/pom.xml +++ b/mailbox/store/pom.xml @@ -126,7 +126,6 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>${assertj-1.version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMailboxMessageTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMailboxMessageTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMailboxMessageTest.java index 9cd77a1..91e7c1a 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMailboxMessageTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMailboxMessageTest.java @@ -32,7 +32,6 @@ import org.apache.commons.io.IOUtils; import org.apache.commons.io.output.ByteArrayOutputStream; import org.apache.james.mailbox.FlagsBuilder; import org.apache.james.mailbox.MessageUid; -import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.model.Attachment; import org.apache.james.mailbox.model.MessageAttachment; import org.apache.james.mailbox.model.MessageId; @@ -40,7 +39,6 @@ import org.apache.james.mailbox.model.TestId; import org.apache.james.mailbox.model.TestMessageId; import org.apache.james.mailbox.store.mail.model.DefaultMessageId; import org.assertj.core.api.JUnitSoftAssertions; -import org.assertj.core.internal.FieldByFieldComparator; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -113,7 +111,7 @@ public class SimpleMailboxMessageTest { } @Test - public void copyShouldReturnFieldByFieldEqualsObject() throws MailboxException { + public void copyShouldReturnFieldByFieldEqualsObject() throws Exception { long textualLineCount = 42L; String text = "text"; String plain = "plain"; @@ -132,7 +130,11 @@ public class SimpleMailboxMessageTest { SimpleMailboxMessage copy = SimpleMailboxMessage.copy(TestId.of(1337), original); assertThat((Object)copy).isEqualToIgnoringGivenFields(original, "message", "mailboxId").isNotSameAs(original); - assertThat(copy.getMessage()).usingComparator(new FieldByFieldComparator()).isEqualTo(original.getMessage()); + assertThat(copy.getMessage()) + .isEqualToIgnoringGivenFields(original.getMessage(), "content") + .isNotSameAs(original.getMessage()); + assertThat(IOUtils.toString(copy.getMessage().getFullContent(), Charsets.UTF_8)) + .isEqualTo(IOUtils.toString(original.getMessage().getFullContent(), Charsets.UTF_8)); assertThat(SimpleMailboxMessage.copy(TEST_ID, original).getTextualLineCount()).isEqualTo(textualLineCount); assertThat(SimpleMailboxMessage.copy(TEST_ID, original).getMediaType()).isEqualTo(text); assertThat(SimpleMailboxMessage.copy(TEST_ID, original).getSubType()).isEqualTo(plain); http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/mailbox/tika/pom.xml ---------------------------------------------------------------------- diff --git a/mailbox/tika/pom.xml b/mailbox/tika/pom.xml index 5598582..67ca3f1 100644 --- a/mailbox/tika/pom.xml +++ b/mailbox/tika/pom.xml @@ -198,7 +198,6 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>${assertj-3.version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/mailbox/tool/pom.xml ---------------------------------------------------------------------- diff --git a/mailbox/tool/pom.xml b/mailbox/tool/pom.xml index 52f7328..fad66dc 100644 --- a/mailbox/tool/pom.xml +++ b/mailbox/tool/pom.xml @@ -84,7 +84,6 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>${assertj-1.version}</version> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/mailet/icalendar/pom.xml ---------------------------------------------------------------------- diff --git a/mailet/icalendar/pom.xml b/mailet/icalendar/pom.xml index 46817d1..85dd622 100644 --- a/mailet/icalendar/pom.xml +++ b/mailet/icalendar/pom.xml @@ -216,7 +216,6 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>${assertj-3.version}</version><!--$NO-MVN-MAN-VER$--> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/mailet/pom.xml ---------------------------------------------------------------------- diff --git a/mailet/pom.xml b/mailet/pom.xml index dbb7ec1..4d99c62 100644 --- a/mailet/pom.xml +++ b/mailet/pom.xml @@ -55,9 +55,8 @@ <maven-reporting-api.version>3.0</maven-reporting-api.version> <mime4j.version>0.8.1</mime4j.version> <qdox.version>1.12.1</qdox.version> - <assertj-1.version>1.7.1</assertj-1.version> <assertj-3.version>3.3.0</assertj-3.version> - <assertj-1-guava.version>1.3.1</assertj-1-guava.version> + <assertj-3-guava.version>3.1.0</assertj-3-guava.version> <slf4j.version>1.7.7</slf4j.version> <jackson-data.version>2.6.3</jackson-data.version> <ical4j.version>2.0.2</ical4j.version> @@ -188,13 +187,13 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>${assertj-1.version}</version> + <version>${assertj-3.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-guava</artifactId> - <version>${assertj-1-guava.version}</version> + <version>${assertj-3-guava.version}</version> </dependency> <dependency> <groupId>com.thoughtworks.qdox</groupId> http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/mailet/standard/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java b/mailet/standard/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java index 271e45e..1ded296 100644 --- a/mailet/standard/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java +++ b/mailet/standard/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java @@ -123,7 +123,7 @@ public class StripAttachmentTest { mailet.service(mail); - assertThat(mail).isEqualToComparingFieldByField(expectedMail); + assertThat(mail).isEqualToIgnoringGivenFields(expectedMail, "msg"); assertThat(mail.getMessage().getContent()).isEqualTo("simple text"); } http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/mpt/core/pom.xml ---------------------------------------------------------------------- diff --git a/mpt/core/pom.xml b/mpt/core/pom.xml index 34e2705..f42c9bf 100644 --- a/mpt/core/pom.xml +++ b/mpt/core/pom.xml @@ -87,7 +87,6 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>${assertj-1.version}</version><!--$NO-MVN-MAN-VER$--> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/mpt/pom.xml ---------------------------------------------------------------------- diff --git a/mpt/pom.xml b/mpt/pom.xml index 65607ed..52100eb 100644 --- a/mpt/pom.xml +++ b/mpt/pom.xml @@ -67,7 +67,6 @@ <log4j.version>1.2.16</log4j.version> <lucene-core.version>3.6.0</lucene-core.version> <slf4j.version>1.6.6</slf4j.version> - <assertj-1.version>1.7.1</assertj-1.version> <assertj-3.version>3.2.0</assertj-3.version> <logback.version>1.1.7</logback.version> http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/protocols/imap/pom.xml ---------------------------------------------------------------------- diff --git a/protocols/imap/pom.xml b/protocols/imap/pom.xml index ca0175a..fe69297 100644 --- a/protocols/imap/pom.xml +++ b/protocols/imap/pom.xml @@ -102,7 +102,6 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>${assertj-1.version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/protocols/lmtp/pom.xml ---------------------------------------------------------------------- diff --git a/protocols/lmtp/pom.xml b/protocols/lmtp/pom.xml index 6e2478c..fcf4824 100644 --- a/protocols/lmtp/pom.xml +++ b/protocols/lmtp/pom.xml @@ -76,7 +76,6 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>${assertj-1.version}</version> <scope>test</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/protocols/managesieve/pom.xml ---------------------------------------------------------------------- diff --git a/protocols/managesieve/pom.xml b/protocols/managesieve/pom.xml index 15afd6a..20a6d80 100644 --- a/protocols/managesieve/pom.xml +++ b/protocols/managesieve/pom.xml @@ -63,7 +63,6 @@ <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> <scope>test</scope> - <version>${assertj-1.version}</version> </dependency> <dependency> <groupId>org.mockito</groupId> http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/protocols/pom.xml ---------------------------------------------------------------------- diff --git a/protocols/pom.xml b/protocols/pom.xml index e3830c5..c845e58 100644 --- a/protocols/pom.xml +++ b/protocols/pom.xml @@ -60,7 +60,6 @@ <slf4j.version>1.6.3</slf4j.version> <jsieve.version>0.7</jsieve.version> <mockito-core.version>1.9.0</mockito-core.version> - <assertj-1.version>1.7.1</assertj-1.version> <assertj-3.version>3.2.0</assertj-3.version> </properties> @@ -265,6 +264,11 @@ </dependency> <dependency> <groupId>org.assertj</groupId> + <artifactId>assertj-core</artifactId> + <version>${assertj-3.version}</version> + </dependency> + <dependency> + <groupId>org.assertj</groupId> <artifactId>assertj-guava</artifactId> <version>1.3.1</version> </dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/protocols/pop3/pom.xml ---------------------------------------------------------------------- diff --git a/protocols/pop3/pom.xml b/protocols/pop3/pom.xml index 57790e2..3872ff3 100644 --- a/protocols/pop3/pom.xml +++ b/protocols/pop3/pom.xml @@ -62,7 +62,6 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>${assertj-1.version}</version> <scope>test</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/protocols/smtp/pom.xml ---------------------------------------------------------------------- diff --git a/protocols/smtp/pom.xml b/protocols/smtp/pom.xml index 423eb42..b1dcfd7 100644 --- a/protocols/smtp/pom.xml +++ b/protocols/smtp/pom.xml @@ -91,7 +91,6 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>${assertj-1.version}</version> <scope>test</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/server/container/cli-integration/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/cli-integration/pom.xml b/server/container/cli-integration/pom.xml index 6a4bcd7..cf458d6 100644 --- a/server/container/cli-integration/pom.xml +++ b/server/container/cli-integration/pom.xml @@ -171,7 +171,6 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>${assertj-3.version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/server/container/cli/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/cli/pom.xml b/server/container/cli/pom.xml index 01123f6..f71576e 100644 --- a/server/container/cli/pom.xml +++ b/server/container/cli/pom.xml @@ -61,7 +61,6 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>${assertj-1.version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/server/container/core/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/core/pom.xml b/server/container/core/pom.xml index cf4cf9e..a0b315e 100644 --- a/server/container/core/pom.xml +++ b/server/container/core/pom.xml @@ -98,7 +98,6 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>${assertj-1.version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/server/container/filesystem-api/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/filesystem-api/pom.xml b/server/container/filesystem-api/pom.xml index 19be087..9d69a2f 100644 --- a/server/container/filesystem-api/pom.xml +++ b/server/container/filesystem-api/pom.xml @@ -48,7 +48,6 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>${assertj-1.version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/server/container/guice/cassandra-guice/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/guice/cassandra-guice/pom.xml b/server/container/guice/cassandra-guice/pom.xml index 67d4889..a53097d 100644 --- a/server/container/guice/cassandra-guice/pom.xml +++ b/server/container/guice/cassandra-guice/pom.xml @@ -363,7 +363,6 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>${assertj-3.version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/server/container/guice/cassandra-ldap-guice/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/guice/cassandra-ldap-guice/pom.xml b/server/container/guice/cassandra-ldap-guice/pom.xml index ff3acae..47a6dd1 100644 --- a/server/container/guice/cassandra-ldap-guice/pom.xml +++ b/server/container/guice/cassandra-ldap-guice/pom.xml @@ -261,7 +261,6 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>${assertj-3.version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/server/container/guice/guice-common/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/guice/guice-common/pom.xml b/server/container/guice/guice-common/pom.xml index 44632f0..73247d6 100644 --- a/server/container/guice/guice-common/pom.xml +++ b/server/container/guice/guice-common/pom.xml @@ -278,7 +278,6 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>${assertj-3.version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/server/container/guice/jpa-guice/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/guice/jpa-guice/pom.xml b/server/container/guice/jpa-guice/pom.xml index e85a154..1d75ea8 100644 --- a/server/container/guice/jpa-guice/pom.xml +++ b/server/container/guice/jpa-guice/pom.xml @@ -289,7 +289,6 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>${assertj-3.version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/server/container/guice/jpa-smtp/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/guice/jpa-smtp/pom.xml b/server/container/guice/jpa-smtp/pom.xml index 7e3206b..7a5fbaa 100644 --- a/server/container/guice/jpa-smtp/pom.xml +++ b/server/container/guice/jpa-smtp/pom.xml @@ -265,7 +265,6 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>${assertj-3.version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/server/container/guice/mailet/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/guice/mailet/pom.xml b/server/container/guice/mailet/pom.xml index 98f31f1..0b3ed81 100644 --- a/server/container/guice/mailet/pom.xml +++ b/server/container/guice/mailet/pom.xml @@ -195,7 +195,6 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>${assertj-3.version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/server/container/guice/memory-guice/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/guice/memory-guice/pom.xml b/server/container/guice/memory-guice/pom.xml index 7b6b687..109609e 100644 --- a/server/container/guice/memory-guice/pom.xml +++ b/server/container/guice/memory-guice/pom.xml @@ -274,7 +274,6 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>${assertj-3.version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/server/container/jetty/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/jetty/pom.xml b/server/container/jetty/pom.xml index 819b785..367f455 100644 --- a/server/container/jetty/pom.xml +++ b/server/container/jetty/pom.xml @@ -152,7 +152,6 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>3.2.0</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/server/container/mailbox-adapter/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/mailbox-adapter/pom.xml b/server/container/mailbox-adapter/pom.xml index 44d18f1..4a1ee3e 100644 --- a/server/container/mailbox-adapter/pom.xml +++ b/server/container/mailbox-adapter/pom.xml @@ -88,7 +88,6 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>${assertj-1.version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/server/container/metrics/metrics-es-reporter/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/metrics/metrics-es-reporter/pom.xml b/server/container/metrics/metrics-es-reporter/pom.xml index 9edd1f8..fa04f95 100644 --- a/server/container/metrics/metrics-es-reporter/pom.xml +++ b/server/container/metrics/metrics-es-reporter/pom.xml @@ -159,7 +159,6 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>${assertj-3.version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/server/container/spring/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/spring/pom.xml b/server/container/spring/pom.xml index 5b49ada..1be665a 100644 --- a/server/container/spring/pom.xml +++ b/server/container/spring/pom.xml @@ -173,7 +173,6 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>${assertj-1.version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/server/container/util-java8/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/util-java8/pom.xml b/server/container/util-java8/pom.xml index 9b1c871..a7e2a0e 100644 --- a/server/container/util-java8/pom.xml +++ b/server/container/util-java8/pom.xml @@ -162,7 +162,6 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>3.2.0</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/server/container/util/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/util/pom.xml b/server/container/util/pom.xml index b60d76e..48f4e75 100644 --- a/server/container/util/pom.xml +++ b/server/container/util/pom.xml @@ -53,7 +53,6 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>${assertj-1.version}</version> <scope>test</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/server/data/data-cassandra/pom.xml ---------------------------------------------------------------------- diff --git a/server/data/data-cassandra/pom.xml b/server/data/data-cassandra/pom.xml index c72aab8..170e12f 100644 --- a/server/data/data-cassandra/pom.xml +++ b/server/data/data-cassandra/pom.xml @@ -48,7 +48,6 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>${assertj-1.version}</version> <scope>test</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/server/data/data-file/pom.xml ---------------------------------------------------------------------- diff --git a/server/data/data-file/pom.xml b/server/data/data-file/pom.xml index 73b5386..b93dadc 100644 --- a/server/data/data-file/pom.xml +++ b/server/data/data-file/pom.xml @@ -124,7 +124,6 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>${assertj-1.version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/server/data/data-hbase/pom.xml ---------------------------------------------------------------------- diff --git a/server/data/data-hbase/pom.xml b/server/data/data-hbase/pom.xml index c25617a..c094c21 100644 --- a/server/data/data-hbase/pom.xml +++ b/server/data/data-hbase/pom.xml @@ -164,7 +164,6 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>${assertj-1.version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/server/data/data-jcr/pom.xml ---------------------------------------------------------------------- diff --git a/server/data/data-jcr/pom.xml b/server/data/data-jcr/pom.xml index 20e509b..1738188 100644 --- a/server/data/data-jcr/pom.xml +++ b/server/data/data-jcr/pom.xml @@ -89,7 +89,6 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>${assertj-1.version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/server/data/data-jdbc/pom.xml ---------------------------------------------------------------------- diff --git a/server/data/data-jdbc/pom.xml b/server/data/data-jdbc/pom.xml index 90972a2..1c5b149 100644 --- a/server/data/data-jdbc/pom.xml +++ b/server/data/data-jdbc/pom.xml @@ -111,7 +111,6 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>${assertj-1.version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/server/data/data-jmap-cassandra/pom.xml ---------------------------------------------------------------------- diff --git a/server/data/data-jmap-cassandra/pom.xml b/server/data/data-jmap-cassandra/pom.xml index fd87b70..efe6b7c 100644 --- a/server/data/data-jmap-cassandra/pom.xml +++ b/server/data/data-jmap-cassandra/pom.xml @@ -214,7 +214,6 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>${assertj-3.version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/server/data/data-jmap/pom.xml ---------------------------------------------------------------------- diff --git a/server/data/data-jmap/pom.xml b/server/data/data-jmap/pom.xml index 34df764..aaeb88f 100644 --- a/server/data/data-jmap/pom.xml +++ b/server/data/data-jmap/pom.xml @@ -205,7 +205,6 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>${assertj-3.version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/server/data/data-jpa/pom.xml ---------------------------------------------------------------------- diff --git a/server/data/data-jpa/pom.xml b/server/data/data-jpa/pom.xml index a9af4c8..d649896 100644 --- a/server/data/data-jpa/pom.xml +++ b/server/data/data-jpa/pom.xml @@ -112,7 +112,6 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>${assertj-1.version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/server/data/data-ldap-integration-testing/pom.xml ---------------------------------------------------------------------- diff --git a/server/data/data-ldap-integration-testing/pom.xml b/server/data/data-ldap-integration-testing/pom.xml index 305a987..47a5349 100644 --- a/server/data/data-ldap-integration-testing/pom.xml +++ b/server/data/data-ldap-integration-testing/pom.xml @@ -163,7 +163,6 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>${assertj-3.version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/server/data/data-ldap/pom.xml ---------------------------------------------------------------------- diff --git a/server/data/data-ldap/pom.xml b/server/data/data-ldap/pom.xml index 21a7a4a..da79b91 100644 --- a/server/data/data-ldap/pom.xml +++ b/server/data/data-ldap/pom.xml @@ -65,7 +65,6 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>${assertj-1.version}</version> </dependency> <dependency> <groupId>org.slf4j</groupId> http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/server/data/data-library/pom.xml ---------------------------------------------------------------------- diff --git a/server/data/data-library/pom.xml b/server/data/data-library/pom.xml index bd32102..1d33e2e 100644 --- a/server/data/data-library/pom.xml +++ b/server/data/data-library/pom.xml @@ -93,13 +93,11 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>${assertj-1.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-guava</artifactId> - <version>${assertj-1-guava.version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/server/data/data-memory/pom.xml ---------------------------------------------------------------------- diff --git a/server/data/data-memory/pom.xml b/server/data/data-memory/pom.xml index 80ae179..e2e2015 100644 --- a/server/data/data-memory/pom.xml +++ b/server/data/data-memory/pom.xml @@ -76,7 +76,6 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>${assertj-1.version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/server/mailet/integration-testing/pom.xml ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/pom.xml b/server/mailet/integration-testing/pom.xml index 7c68390..2c3557c 100644 --- a/server/mailet/integration-testing/pom.xml +++ b/server/mailet/integration-testing/pom.xml @@ -231,7 +231,6 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>${assertj-3.version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/server/mailet/mailetcontainer-camel/pom.xml ---------------------------------------------------------------------- diff --git a/server/mailet/mailetcontainer-camel/pom.xml b/server/mailet/mailetcontainer-camel/pom.xml index 5c357c8..0ec7778 100644 --- a/server/mailet/mailetcontainer-camel/pom.xml +++ b/server/mailet/mailetcontainer-camel/pom.xml @@ -139,7 +139,6 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>${assertj-1.version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/server/mailet/mailets/pom.xml ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/pom.xml b/server/mailet/mailets/pom.xml index e31b4ac..10040b3 100644 --- a/server/mailet/mailets/pom.xml +++ b/server/mailet/mailets/pom.xml @@ -209,13 +209,11 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>${assertj-1.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-guava</artifactId> - <version>${assertj-1-guava.version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/server/pom.xml ---------------------------------------------------------------------- diff --git a/server/pom.xml b/server/pom.xml index e02ddd4..24f734d 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -182,8 +182,7 @@ <jackson-data.version>2.6.3</jackson-data.version> <jetty.version>9.3.5.v20151012</jetty.version> <cassandra-unit.version>2.1.9.2</cassandra-unit.version> - <assertj-1.version>1.7.1</assertj-1.version> - <assertj-1-guava.version>1.3.1</assertj-1-guava.version> + <assertj-3-guava.version>3.1.0</assertj-3-guava.version> <assertj-3.version>3.3.0</assertj-3.version> <testcontainers-version>1.3.1</testcontainers-version> <guavate.version>1.0.0</guavate.version> @@ -1190,6 +1189,16 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.assertj</groupId> + <artifactId>assertj-core</artifactId> + <version>${assertj-3.version}</version> + </dependency> + <dependency> + <groupId>org.assertj</groupId> + <artifactId>assertj-guava</artifactId> + <version>${assertj-3-guava.version}</version> + </dependency> + <dependency> <groupId>org.jmock</groupId> <artifactId>jmock</artifactId> <version>${jmock.version}</version> http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml index 51782d0..b97a690 100644 --- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml +++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml @@ -245,7 +245,6 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>${assertj-3.version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml index 008158e..614da80 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml @@ -227,7 +227,6 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>${assertj-3.version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml index 0033d17..a890a21 100644 --- a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml +++ b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml @@ -226,7 +226,6 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>${assertj-3.version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/server/protocols/jmap/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/pom.xml b/server/protocols/jmap/pom.xml index f13a49a..37d67a3 100644 --- a/server/protocols/jmap/pom.xml +++ b/server/protocols/jmap/pom.xml @@ -344,7 +344,6 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>${assertj-3.version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/server/protocols/jwt/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/jwt/pom.xml b/server/protocols/jwt/pom.xml index a4d7065..53d834e 100644 --- a/server/protocols/jwt/pom.xml +++ b/server/protocols/jwt/pom.xml @@ -166,7 +166,6 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>${assertj-3.version}</version> </dependency> <dependency> <groupId>org.bouncycastle</groupId> http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/server/protocols/protocols-imap4/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-imap4/pom.xml b/server/protocols/protocols-imap4/pom.xml index e5c1df7..c38e647 100644 --- a/server/protocols/protocols-imap4/pom.xml +++ b/server/protocols/protocols-imap4/pom.xml @@ -94,7 +94,6 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>${assertj-1.version}</version> <scope>test</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/server/protocols/protocols-smtp/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/pom.xml b/server/protocols/protocols-smtp/pom.xml index 1079d4b..5dd26e6 100644 --- a/server/protocols/protocols-smtp/pom.xml +++ b/server/protocols/protocols-smtp/pom.xml @@ -218,7 +218,6 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>${assertj-1.version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/server/protocols/webadmin-integration-test/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin-integration-test/pom.xml b/server/protocols/webadmin-integration-test/pom.xml index 642a2ca..2bbe714 100644 --- a/server/protocols/webadmin-integration-test/pom.xml +++ b/server/protocols/webadmin-integration-test/pom.xml @@ -210,7 +210,6 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>${assertj-3.version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/server/protocols/webadmin/webadmin-cassandra/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-cassandra/pom.xml b/server/protocols/webadmin/webadmin-cassandra/pom.xml index 0d68ced..f8fd612 100644 --- a/server/protocols/webadmin/webadmin-cassandra/pom.xml +++ b/server/protocols/webadmin/webadmin-cassandra/pom.xml @@ -178,7 +178,6 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>${assertj-3.version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/server/protocols/webadmin/webadmin-core/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-core/pom.xml b/server/protocols/webadmin/webadmin-core/pom.xml index 7bd6d8b..f46804e 100644 --- a/server/protocols/webadmin/webadmin-core/pom.xml +++ b/server/protocols/webadmin/webadmin-core/pom.xml @@ -211,7 +211,6 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>${assertj-3.version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/server/protocols/webadmin/webadmin-data/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-data/pom.xml b/server/protocols/webadmin/webadmin-data/pom.xml index f02709c..d0542ee 100644 --- a/server/protocols/webadmin/webadmin-data/pom.xml +++ b/server/protocols/webadmin/webadmin-data/pom.xml @@ -197,7 +197,6 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>${assertj-3.version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/server/protocols/webadmin/webadmin-mailbox/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-mailbox/pom.xml b/server/protocols/webadmin/webadmin-mailbox/pom.xml index fe0d72b..28cd458 100644 --- a/server/protocols/webadmin/webadmin-mailbox/pom.xml +++ b/server/protocols/webadmin/webadmin-mailbox/pom.xml @@ -209,7 +209,6 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>${assertj-3.version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/fc6536ef/server/queue/queue-api/pom.xml ---------------------------------------------------------------------- diff --git a/server/queue/queue-api/pom.xml b/server/queue/queue-api/pom.xml index 515ea89..218f159 100644 --- a/server/queue/queue-api/pom.xml +++ b/server/queue/queue-api/pom.xml @@ -63,7 +63,6 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>${assertj-1.version}</version> <scope>test</scope> </dependency> <dependency> --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
