JAMES-2198 Upgrade vulnerable commons-lang 2.6 to commons-lang 3.6
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/9d4af1dd Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/9d4af1dd Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/9d4af1dd Branch: refs/heads/master Commit: 9d4af1ddcc5ffd3f993532e4eb1817098d5066c0 Parents: 34d11a2 Author: benwa <[email protected]> Authored: Fri Oct 20 16:12:55 2017 +0700 Committer: Matthieu Baechler <[email protected]> Committed: Mon Oct 23 12:09:24 2017 +0200 ---------------------------------------------------------------------- backends-common/cassandra/pom.xml | 8 +++--- mailbox/api/pom.xml | 8 +++--- .../org/apache/james/mailbox/model/Cid.java | 2 +- .../mailbox/model/MailboxAnnotationKey.java | 2 +- .../CachingMailboxSessionMapperFactory.java | 6 ++--- .../jcr/JCRMailboxSessionMapperFactory.java | 6 ++--- .../mailbox/jcr/mail/JCRModSeqProvider.java | 4 +-- .../jcr/mail/model/JCRMailboxMessage.java | 2 +- mailbox/maildir/pom.xml | 8 +++--- .../james/mailbox/maildir/MaildirFolder.java | 4 +-- .../MaildirMailboxSessionMapperFactory.java | 10 +++---- .../james/mailbox/maildir/MaildirStore.java | 6 ++--- .../maildir/mail/model/MaildirMessage.java | 2 +- .../inmemory/mail/InMemoryAnnotationMapper.java | 2 +- mailbox/store/pom.xml | 8 +++--- .../mailbox/store/ImmutableMailboxMessage.java | 10 +++---- .../mail/AbstractLockingModSeqProvider.java | 4 +-- .../store/mail/AbstractLockingUidProvider.java | 4 +-- .../store/mail/model/DefaultMessageId.java | 2 +- .../search/comparator/CombinedComparator.java | 2 +- .../mailbox/store/SimpleMailboxMembership.java | 2 +- .../StoreMailboxMessageResultIteratorTest.java | 6 +++-- .../store/StoreMessageIdManagerTestSystem.java | 8 +++--- .../store/TestMailboxSessionMapperFactory.java | 28 ++++++++++---------- .../store/mail/model/ListMailboxAssertTest.java | 4 +-- mailbox/zoo-seq-provider/pom.xml | 4 +++ .../mailbox/store/mail/ZooUidProvider.java | 4 +-- mailet/base/pom.xml | 8 +++--- .../org/apache/mailet/base/DateFormats.java | 2 +- .../org/apache/mailet/base/GenericMailet.java | 3 ++- mpt/core/pom.xml | 8 +++--- mpt/impl/imap-mailbox/core/pom.xml | 8 +++--- pom.xml | 7 +---- protocols/imap/pom.xml | 8 +++--- .../james/imap/api/ImapConfiguration.java | 2 +- .../apache/james/imap/encode/EncoderUtils.java | 2 +- .../imap/processor/GetAnnotationProcessor.java | 4 +-- server/mailet/mailets/pom.xml | 4 +++ .../james/transport/mailets/DSNBounce.java | 2 +- 39 files changed, 110 insertions(+), 104 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/9d4af1dd/backends-common/cassandra/pom.xml ---------------------------------------------------------------------- diff --git a/backends-common/cassandra/pom.xml b/backends-common/cassandra/pom.xml index 8647f80..d295c70 100644 --- a/backends-common/cassandra/pom.xml +++ b/backends-common/cassandra/pom.xml @@ -68,10 +68,6 @@ <artifactId>guava</artifactId> </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> - <dependency> <groupId>javax.inject</groupId> <artifactId>javax.inject</artifactId> </dependency> @@ -91,6 +87,10 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/james-project/blob/9d4af1dd/mailbox/api/pom.xml ---------------------------------------------------------------------- diff --git a/mailbox/api/pom.xml b/mailbox/api/pom.xml index d34d3ba..364d019 100644 --- a/mailbox/api/pom.xml +++ b/mailbox/api/pom.xml @@ -62,10 +62,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> @@ -76,6 +72,10 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/james-project/blob/9d4af1dd/mailbox/api/src/main/java/org/apache/james/mailbox/model/Cid.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/model/Cid.java b/mailbox/api/src/main/java/org/apache/james/mailbox/model/Cid.java index c6694ce..24eaa5e 100644 --- a/mailbox/api/src/main/java/org/apache/james/mailbox/model/Cid.java +++ b/mailbox/api/src/main/java/org/apache/james/mailbox/model/Cid.java @@ -22,7 +22,7 @@ package org.apache.james.mailbox.model; import java.util.Optional; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import com.google.common.base.Objects; import com.google.common.base.Preconditions; http://git-wip-us.apache.org/repos/asf/james-project/blob/9d4af1dd/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxAnnotationKey.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxAnnotationKey.java b/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxAnnotationKey.java index f5932d9..8bb500e 100644 --- a/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxAnnotationKey.java +++ b/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxAnnotationKey.java @@ -21,7 +21,7 @@ package org.apache.james.mailbox.model; import java.util.Locale; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import com.google.common.base.CharMatcher; import com.google.common.base.Objects; http://git-wip-us.apache.org/repos/asf/james-project/blob/9d4af1dd/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/CachingMailboxSessionMapperFactory.java ---------------------------------------------------------------------- diff --git a/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/CachingMailboxSessionMapperFactory.java b/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/CachingMailboxSessionMapperFactory.java index 19f6cb2..071e028 100644 --- a/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/CachingMailboxSessionMapperFactory.java +++ b/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/CachingMailboxSessionMapperFactory.java @@ -1,6 +1,6 @@ package org.apache.james.mailbox.caching; -import org.apache.commons.lang.NotImplementedException; +import org.apache.commons.lang3.NotImplementedException; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.exception.SubscriptionException; @@ -53,7 +53,7 @@ public class CachingMailboxSessionMapperFactory extends @Override public AnnotationMapper createAnnotationMapper(MailboxSession session) throws MailboxException { - throw new NotImplementedException(); + throw new NotImplementedException("Not implemented"); } @Override @@ -68,6 +68,6 @@ public class CachingMailboxSessionMapperFactory extends @Override public MessageIdMapper createMessageIdMapper(MailboxSession session) throws MailboxException { - throw new NotImplementedException(); + throw new NotImplementedException("Not implemented"); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/9d4af1dd/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMailboxSessionMapperFactory.java ---------------------------------------------------------------------- diff --git a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMailboxSessionMapperFactory.java b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMailboxSessionMapperFactory.java index 47e8535..41ee0f8 100644 --- a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMailboxSessionMapperFactory.java +++ b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMailboxSessionMapperFactory.java @@ -18,7 +18,7 @@ ****************************************************************/ package org.apache.james.mailbox.jcr; -import org.apache.commons.lang.NotImplementedException; +import org.apache.commons.lang3.NotImplementedException; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.exception.SubscriptionException; @@ -72,7 +72,7 @@ public class JCRMailboxSessionMapperFactory extends MailboxSessionMapperFactory @Override public MessageIdMapper createMessageIdMapper(MailboxSession session) throws MailboxException { - throw new NotImplementedException(); + throw new NotImplementedException("Not implemented"); } @Override @@ -87,7 +87,7 @@ public class JCRMailboxSessionMapperFactory extends MailboxSessionMapperFactory @Override public AnnotationMapper createAnnotationMapper(MailboxSession session) throws MailboxException { - throw new NotImplementedException(); + throw new NotImplementedException("Not implemented"); } @Override http://git-wip-us.apache.org/repos/asf/james-project/blob/9d4af1dd/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRModSeqProvider.java ---------------------------------------------------------------------- diff --git a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRModSeqProvider.java b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRModSeqProvider.java index 97a37e0..2490f0a 100644 --- a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRModSeqProvider.java +++ b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRModSeqProvider.java @@ -22,7 +22,7 @@ import javax.jcr.Node; import javax.jcr.RepositoryException; import javax.jcr.Session; -import org.apache.commons.lang.NotImplementedException; +import org.apache.commons.lang3.NotImplementedException; import org.apache.james.mailbox.MailboxPathLocker; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.exception.MailboxException; @@ -69,7 +69,7 @@ public class JCRModSeqProvider extends AbstractLockingModSeqProvider{ @Override public long highestModSeq(MailboxSession session, MailboxId mailboxId) throws MailboxException { - throw new NotImplementedException(); + throw new NotImplementedException("Not implemented"); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/9d4af1dd/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMailboxMessage.java ---------------------------------------------------------------------- diff --git a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMailboxMessage.java b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMailboxMessage.java index 9bc69f3..606ef61 100644 --- a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMailboxMessage.java +++ b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMailboxMessage.java @@ -36,7 +36,7 @@ import javax.mail.util.SharedByteArrayInputStream; import org.apache.commons.io.IOUtils; import org.apache.commons.io.input.BoundedInputStream; -import org.apache.commons.lang.NotImplementedException; +import org.apache.commons.lang3.NotImplementedException; import org.apache.jackrabbit.JcrConstants; import org.apache.jackrabbit.commons.JcrUtils; import org.apache.james.mailbox.MessageUid; http://git-wip-us.apache.org/repos/asf/james-project/blob/9d4af1dd/mailbox/maildir/pom.xml ---------------------------------------------------------------------- diff --git a/mailbox/maildir/pom.xml b/mailbox/maildir/pom.xml index 173dbc2..f4eb742 100644 --- a/mailbox/maildir/pom.xml +++ b/mailbox/maildir/pom.xml @@ -69,15 +69,15 @@ <artifactId>commons-io</artifactId> </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> </dependency> <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/james-project/blob/9d4af1dd/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirFolder.java ---------------------------------------------------------------------- diff --git a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirFolder.java b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirFolder.java index 7a45a80..0d3f4cb 100644 --- a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirFolder.java +++ b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirFolder.java @@ -42,7 +42,7 @@ import java.util.TreeMap; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.ArrayUtils; +import org.apache.commons.lang3.ArrayUtils; import org.apache.james.mailbox.MailboxPathLocker; import org.apache.james.mailbox.MailboxPathLocker.LockAwareExecution; import org.apache.james.mailbox.MailboxSession; @@ -469,7 +469,7 @@ public class MaildirFolder { String[] curFiles = curFolder.list(); String[] newFiles = newFolder.list(); messageCount = curFiles.length + newFiles.length; - String[] allFiles = (String[]) ArrayUtils.addAll(curFiles, newFiles); + String[] allFiles = ArrayUtils.addAll(curFiles, newFiles); for (String file : allFiles) lines.add(String.valueOf(getNextUid().asLong()) + " " + file); PrintWriter pw = new PrintWriter(uidList); http://git-wip-us.apache.org/repos/asf/james-project/blob/9d4af1dd/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirMailboxSessionMapperFactory.java ---------------------------------------------------------------------- diff --git a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirMailboxSessionMapperFactory.java b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirMailboxSessionMapperFactory.java index 8175a23..811bde6 100644 --- a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirMailboxSessionMapperFactory.java +++ b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirMailboxSessionMapperFactory.java @@ -18,7 +18,7 @@ ****************************************************************/ package org.apache.james.mailbox.maildir; -import org.apache.commons.lang.NotImplementedException; +import org.apache.commons.lang3.NotImplementedException; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.exception.SubscriptionException; @@ -59,7 +59,7 @@ public class MaildirMailboxSessionMapperFactory extends @Override public MessageIdMapper createMessageIdMapper(MailboxSession session) throws MailboxException { - throw new NotImplementedException(); + throw new NotImplementedException("Not implemented"); } @Override @@ -71,17 +71,17 @@ public class MaildirMailboxSessionMapperFactory extends @Override public AnnotationMapper createAnnotationMapper(MailboxSession session) throws MailboxException { - throw new NotImplementedException(); + throw new NotImplementedException("Not implemented"); } @Override public UidProvider getUidProvider() { - throw new NotImplementedException(); + throw new NotImplementedException("Not implemented"); } @Override public ModSeqProvider getModSeqProvider() { - throw new NotImplementedException(); + throw new NotImplementedException("Not implemented"); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/9d4af1dd/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirStore.java ---------------------------------------------------------------------- diff --git a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirStore.java b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirStore.java index 2ebb5e6..2cb9402 100644 --- a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirStore.java +++ b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirStore.java @@ -23,6 +23,7 @@ import java.io.IOException; import java.util.Locale; import java.util.Optional; +import org.apache.commons.lang3.NotImplementedException; import org.apache.james.mailbox.MailboxPathLocker; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.MessageUid; @@ -36,7 +37,6 @@ import org.apache.james.mailbox.store.mail.ModSeqProvider; import org.apache.james.mailbox.store.mail.UidProvider; import org.apache.james.mailbox.store.mail.model.Mailbox; import org.apache.james.mailbox.store.mail.model.impl.SimpleMailbox; -import org.apache.commons.lang.NotImplementedException; public class MaildirStore implements UidProvider, ModSeqProvider { @@ -301,11 +301,11 @@ public class MaildirStore implements UidProvider, ModSeqProvider { @Override public MessageUid nextUid(MailboxSession session, MailboxId mailboxId) throws MailboxException { - throw new NotImplementedException(); + throw new NotImplementedException("Not implemented"); } @Override public long highestModSeq(MailboxSession session, MailboxId mailboxId) throws MailboxException { - throw new NotImplementedException(); + throw new NotImplementedException("Not implemented"); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/9d4af1dd/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirMessage.java ---------------------------------------------------------------------- diff --git a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirMessage.java b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirMessage.java index 514cb70..2d8c041 100644 --- a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirMessage.java +++ b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirMessage.java @@ -29,7 +29,7 @@ import java.util.List; import javax.mail.util.SharedFileInputStream; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.NotImplementedException; +import org.apache.commons.lang3.NotImplementedException; import org.apache.james.mailbox.maildir.MaildirMessageName; import org.apache.james.mailbox.model.MessageAttachment; import org.apache.james.mailbox.model.MessageId; http://git-wip-us.apache.org/repos/asf/james-project/blob/9d4af1dd/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryAnnotationMapper.java ---------------------------------------------------------------------- diff --git a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryAnnotationMapper.java b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryAnnotationMapper.java index 383249d..ae63cbf 100644 --- a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryAnnotationMapper.java +++ b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryAnnotationMapper.java @@ -25,6 +25,7 @@ import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.function.Predicate; +import org.apache.commons.lang3.StringUtils; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.inmemory.InMemoryId; import org.apache.james.mailbox.model.MailboxAnnotation; @@ -32,7 +33,6 @@ import org.apache.james.mailbox.model.MailboxAnnotationKey; import org.apache.james.mailbox.model.MailboxId; import org.apache.james.mailbox.store.mail.AnnotationMapper; import org.apache.james.util.streams.Iterators; -import org.apache.commons.lang.StringUtils; import com.github.steveash.guavate.Guavate; import com.google.common.base.Preconditions; http://git-wip-us.apache.org/repos/asf/james-project/blob/9d4af1dd/mailbox/store/pom.xml ---------------------------------------------------------------------- diff --git a/mailbox/store/pom.xml b/mailbox/store/pom.xml index 9106f09..3049c2e 100644 --- a/mailbox/store/pom.xml +++ b/mailbox/store/pom.xml @@ -83,10 +83,6 @@ <artifactId>commons-io</artifactId> </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> - <dependency> <groupId>javax.inject</groupId> <artifactId>javax.inject</artifactId> </dependency> @@ -112,6 +108,10 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/james-project/blob/9d4af1dd/mailbox/store/src/main/java/org/apache/james/mailbox/store/ImmutableMailboxMessage.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/ImmutableMailboxMessage.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/ImmutableMailboxMessage.java index eb8757a..19d7f11 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/ImmutableMailboxMessage.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/ImmutableMailboxMessage.java @@ -27,7 +27,7 @@ import javax.mail.Flags; import javax.mail.util.SharedByteArrayInputStream; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.NotImplementedException; +import org.apache.commons.lang3.NotImplementedException; import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.MessageUid; import org.apache.james.mailbox.exception.MailboxException; @@ -246,22 +246,22 @@ public class ImmutableMailboxMessage implements MailboxMessage { @Override public int compareTo(MailboxMessage o) { - throw new NotImplementedException(); + throw new NotImplementedException("Not implemented"); } @Override public void setUid(MessageUid uid) { - throw new NotImplementedException(); + throw new NotImplementedException("Not implemented"); } @Override public void setModSeq(long modSeq) { - throw new NotImplementedException(); + throw new NotImplementedException("Not implemented"); } @Override public void setFlags(Flags flags) { - throw new NotImplementedException(); + throw new NotImplementedException("Not implemented"); } @Override http://git-wip-us.apache.org/repos/asf/james-project/blob/9d4af1dd/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/AbstractLockingModSeqProvider.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/AbstractLockingModSeqProvider.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/AbstractLockingModSeqProvider.java index e5d8103..5cef27d 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/AbstractLockingModSeqProvider.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/AbstractLockingModSeqProvider.java @@ -18,7 +18,7 @@ ****************************************************************/ package org.apache.james.mailbox.store.mail; -import org.apache.commons.lang.NotImplementedException; +import org.apache.commons.lang3.NotImplementedException; import org.apache.james.mailbox.MailboxPathLocker; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.exception.MailboxException; @@ -50,7 +50,7 @@ public abstract class AbstractLockingModSeqProvider implements ModSeqProvider{ @Override public long nextModSeq(final MailboxSession session, final MailboxId mailboxId) throws MailboxException { - throw new NotImplementedException(); + throw new NotImplementedException("Not implemented"); } /** http://git-wip-us.apache.org/repos/asf/james-project/blob/9d4af1dd/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/AbstractLockingUidProvider.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/AbstractLockingUidProvider.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/AbstractLockingUidProvider.java index d3d5c8e..b6d365a 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/AbstractLockingUidProvider.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/AbstractLockingUidProvider.java @@ -18,7 +18,7 @@ ****************************************************************/ package org.apache.james.mailbox.store.mail; -import org.apache.commons.lang.NotImplementedException; +import org.apache.commons.lang3.NotImplementedException; import org.apache.james.mailbox.MailboxPathLocker; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.MessageUid; @@ -57,6 +57,6 @@ public abstract class AbstractLockingUidProvider implements UidProvider{ @Override public MessageUid nextUid(MailboxSession session, MailboxId mailboxId) throws MailboxException { - throw new NotImplementedException(); + throw new NotImplementedException("Not implemented"); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/9d4af1dd/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/DefaultMessageId.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/DefaultMessageId.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/DefaultMessageId.java index de69f08..38a7ce0 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/DefaultMessageId.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/DefaultMessageId.java @@ -1,6 +1,6 @@ package org.apache.james.mailbox.store.mail.model; -import org.apache.commons.lang.NotImplementedException; +import org.apache.commons.lang3.NotImplementedException; import org.apache.james.mailbox.model.MessageId; public class DefaultMessageId implements MessageId { http://git-wip-us.apache.org/repos/asf/james-project/blob/9d4af1dd/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/CombinedComparator.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/CombinedComparator.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/CombinedComparator.java index bb98fb7..9252293 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/CombinedComparator.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/CombinedComparator.java @@ -22,9 +22,9 @@ import java.util.Comparator; import java.util.List; import java.util.function.Function; +import org.apache.commons.lang3.NotImplementedException; import org.apache.james.mailbox.model.SearchQuery.Sort; import org.apache.james.mailbox.store.mail.model.MailboxMessage; -import org.apache.commons.lang.NotImplementedException; import com.github.steveash.guavate.Guavate; import com.google.common.base.Preconditions; http://git-wip-us.apache.org/repos/asf/james-project/blob/9d4af1dd/mailbox/store/src/test/java/org/apache/james/mailbox/store/SimpleMailboxMembership.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/SimpleMailboxMembership.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/SimpleMailboxMembership.java index d4c06b8..3ed5a53 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/SimpleMailboxMembership.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/SimpleMailboxMembership.java @@ -34,7 +34,7 @@ import java.util.Map.Entry; import javax.mail.Flags; -import org.apache.commons.lang.NotImplementedException; +import org.apache.commons.lang3.NotImplementedException; import org.apache.james.mailbox.MessageUid; import org.apache.james.mailbox.model.ComposedMessageId; import org.apache.james.mailbox.model.ComposedMessageIdWithMetaData; http://git-wip-us.apache.org/repos/asf/james-project/blob/9d4af1dd/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxMessageResultIteratorTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxMessageResultIteratorTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxMessageResultIteratorTest.java index 9661c43..0da8477 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxMessageResultIteratorTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxMessageResultIteratorTest.java @@ -20,6 +20,7 @@ package org.apache.james.mailbox.store; import static org.assertj.core.api.Assertions.assertThat; + import java.util.ArrayList; import java.util.HashSet; import java.util.Iterator; @@ -28,9 +29,11 @@ import java.util.Map; import java.util.NoSuchElementException; import java.util.Optional; import java.util.Set; + import javax.mail.Flags; import javax.mail.util.SharedByteArrayInputStream; +import org.apache.commons.lang3.NotImplementedException; import org.apache.james.mailbox.MessageUid; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.model.MailboxCounters; @@ -45,7 +48,6 @@ import org.apache.james.mailbox.store.mail.model.Mailbox; import org.apache.james.mailbox.store.mail.model.MailboxMessage; import org.apache.james.mailbox.store.mail.model.impl.PropertyBuilder; import org.apache.james.mailbox.store.mail.model.impl.SimpleMailboxMessage; -import org.apache.commons.lang.NotImplementedException; import org.junit.Test; import com.google.common.collect.Iterables; @@ -185,7 +187,7 @@ public class StoreMailboxMessageResultIteratorTest { @Override public Flags getApplicableFlag(Mailbox mailbox) throws MailboxException { - throw new NotImplementedException(); + throw new NotImplementedException("Not implemented"); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/9d4af1dd/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMessageIdManagerTestSystem.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMessageIdManagerTestSystem.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMessageIdManagerTestSystem.java index 251d0d4..2ed0e13 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMessageIdManagerTestSystem.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMessageIdManagerTestSystem.java @@ -27,7 +27,7 @@ import java.io.IOException; import javax.mail.Flags; -import org.apache.commons.lang.NotImplementedException; +import org.apache.commons.lang3.NotImplementedException; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.MailboxSession.SessionType; import org.apache.james.mailbox.MessageIdManager; @@ -78,7 +78,7 @@ public class StoreMessageIdManagerTestSystem extends MessageIdManagerTestSystem @Override public void deleteMailbox(MailboxId mailboxId, MailboxSession mailboxSession) { - throw new NotImplementedException(); + throw new NotImplementedException("Not implemented"); } @Override @@ -103,11 +103,11 @@ public class StoreMessageIdManagerTestSystem extends MessageIdManagerTestSystem @Override public int getConstantMessageSize() { - throw new NotImplementedException(); + throw new NotImplementedException("Not implemented"); } @Override public void setACL(MailboxId mailboxId, MailboxACL mailboxACL, MailboxSession session) throws MailboxException { - throw new NotImplementedException(); + throw new NotImplementedException("Not implemented"); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/9d4af1dd/mailbox/store/src/test/java/org/apache/james/mailbox/store/TestMailboxSessionMapperFactory.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/TestMailboxSessionMapperFactory.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/TestMailboxSessionMapperFactory.java index 8a29b5b..66d3cf4 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/TestMailboxSessionMapperFactory.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/TestMailboxSessionMapperFactory.java @@ -33,7 +33,7 @@ import java.util.function.Predicate; import javax.mail.Flags; -import org.apache.commons.lang.NotImplementedException; +import org.apache.commons.lang3.NotImplementedException; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.MessageManager; import org.apache.james.mailbox.MessageUid; @@ -87,12 +87,12 @@ public class TestMailboxSessionMapperFactory extends MailboxSessionMapperFactory mailboxMapper = new MailboxMapper() { @Override public MailboxId save(Mailbox mailbox) throws MailboxException { - throw new NotImplementedException(); + throw new NotImplementedException("Not implemented"); } @Override public void delete(Mailbox mailbox) throws MailboxException { - throw new NotImplementedException(); + throw new NotImplementedException("Not implemented"); } @@ -129,42 +129,42 @@ public class TestMailboxSessionMapperFactory extends MailboxSessionMapperFactory @Override public List<Mailbox> findMailboxWithPathLike(MailboxPath mailboxPath) throws MailboxException { - throw new NotImplementedException(); + throw new NotImplementedException("Not implemented"); } @Override public boolean hasChildren(Mailbox mailbox, char delimiter) throws MailboxException { - throw new NotImplementedException(); + throw new NotImplementedException("Not implemented"); } @Override public void updateACL(Mailbox mailbox, MailboxACL.ACLCommand mailboxACLCommand) throws MailboxException { - throw new NotImplementedException(); + throw new NotImplementedException("Not implemented"); } @Override public void setACL(Mailbox mailbox, MailboxACL mailboxACL) throws MailboxException { - throw new NotImplementedException(); + throw new NotImplementedException("Not implemented"); } @Override public List<Mailbox> list() throws MailboxException { - throw new NotImplementedException(); + throw new NotImplementedException("Not implemented"); } @Override public void endRequest() { - throw new NotImplementedException(); + throw new NotImplementedException("Not implemented"); } @Override public <T> T execute(Transaction<T> transaction) throws MailboxException { - throw new NotImplementedException(); + throw new NotImplementedException("Not implemented"); } @Override public List<Mailbox> findNonPersonalMailboxes(String userName, Right right) throws MailboxException { - throw new NotImplementedException(); + throw new NotImplementedException("Not implemented"); } }; messageIdMapper = new MessageIdMapper() { @@ -268,12 +268,12 @@ public class TestMailboxSessionMapperFactory extends MailboxSessionMapperFactory @Override public AnnotationMapper createAnnotationMapper(MailboxSession session) throws MailboxException { - throw new NotImplementedException(); + throw new NotImplementedException("Not implemented"); } @Override public MessageMapper createMessageMapper(MailboxSession session) throws MailboxException { - throw new NotImplementedException(); + throw new NotImplementedException("Not implemented"); } @Override @@ -288,7 +288,7 @@ public class TestMailboxSessionMapperFactory extends MailboxSessionMapperFactory @Override public SubscriptionMapper createSubscriptionMapper(MailboxSession session) throws SubscriptionException { - throw new NotImplementedException(); + throw new NotImplementedException("Not implemented"); } public void clean() { http://git-wip-us.apache.org/repos/asf/james-project/blob/9d4af1dd/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMailboxAssertTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMailboxAssertTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMailboxAssertTest.java index c4373de..bc7c21a 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMailboxAssertTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMailboxAssertTest.java @@ -24,7 +24,7 @@ import static org.assertj.core.api.Assertions.assertThat; import java.util.List; -import org.apache.commons.lang.NotImplementedException; +import org.apache.commons.lang3.NotImplementedException; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.model.MailboxACL; import org.apache.james.mailbox.model.MailboxId; @@ -124,7 +124,7 @@ public class ListMailboxAssertTest { @Override public boolean isChildOf(Mailbox potentialParent, MailboxSession mailboxSession) { - throw new NotImplementedException(); + throw new NotImplementedException("Not implemented"); } }; } http://git-wip-us.apache.org/repos/asf/james-project/blob/9d4af1dd/mailbox/zoo-seq-provider/pom.xml ---------------------------------------------------------------------- diff --git a/mailbox/zoo-seq-provider/pom.xml b/mailbox/zoo-seq-provider/pom.xml index 64f9343..7898b19 100644 --- a/mailbox/zoo-seq-provider/pom.xml +++ b/mailbox/zoo-seq-provider/pom.xml @@ -51,6 +51,10 @@ <version>13.0</version><!--$NO-MVN-MAN-VER$--> </dependency> <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + <dependency> <groupId>com.netflix.curator</groupId> <artifactId>curator-client</artifactId> <version>${curator.version}</version> http://git-wip-us.apache.org/repos/asf/james-project/blob/9d4af1dd/mailbox/zoo-seq-provider/src/main/java/org/apache/james/mailbox/store/mail/ZooUidProvider.java ---------------------------------------------------------------------- diff --git a/mailbox/zoo-seq-provider/src/main/java/org/apache/james/mailbox/store/mail/ZooUidProvider.java b/mailbox/zoo-seq-provider/src/main/java/org/apache/james/mailbox/store/mail/ZooUidProvider.java index d2bfb49..391fe8c 100644 --- a/mailbox/zoo-seq-provider/src/main/java/org/apache/james/mailbox/store/mail/ZooUidProvider.java +++ b/mailbox/zoo-seq-provider/src/main/java/org/apache/james/mailbox/store/mail/ZooUidProvider.java @@ -20,12 +20,12 @@ package org.apache.james.mailbox.store.mail; import java.util.Optional; +import org.apache.commons.lang3.NotImplementedException; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.MessageUid; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.model.MailboxId; import org.apache.james.mailbox.store.mail.model.Mailbox; -import org.apache.commons.lang.NotImplementedException; import com.google.common.base.Preconditions; import com.netflix.curator.RetryPolicy; @@ -95,7 +95,7 @@ public class ZooUidProvider implements UidProvider { @Override public MessageUid nextUid(MailboxSession session, MailboxId mailboxId) throws MailboxException { - throw new NotImplementedException(); + throw new NotImplementedException("Not implemented"); } public static <E extends MailboxId> String pathForMailbox(Mailbox mailbox) { http://git-wip-us.apache.org/repos/asf/james-project/blob/9d4af1dd/mailet/base/pom.xml ---------------------------------------------------------------------- diff --git a/mailet/base/pom.xml b/mailet/base/pom.xml index 7934ca2..9bcea51 100644 --- a/mailet/base/pom.xml +++ b/mailet/base/pom.xml @@ -64,10 +64,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> - <dependency> <groupId>javax.activation</groupId> <artifactId>activation</artifactId> </dependency> @@ -82,6 +78,10 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/james-project/blob/9d4af1dd/mailet/base/src/main/java/org/apache/mailet/base/DateFormats.java ---------------------------------------------------------------------- diff --git a/mailet/base/src/main/java/org/apache/mailet/base/DateFormats.java b/mailet/base/src/main/java/org/apache/mailet/base/DateFormats.java index 2527090..90abbb1 100644 --- a/mailet/base/src/main/java/org/apache/mailet/base/DateFormats.java +++ b/mailet/base/src/main/java/org/apache/mailet/base/DateFormats.java @@ -23,7 +23,7 @@ package org.apache.mailet.base; import java.util.Locale; import java.util.TimeZone; -import org.apache.commons.lang.time.FastDateFormat; +import org.apache.commons.lang3.time.FastDateFormat; public class DateFormats { http://git-wip-us.apache.org/repos/asf/james-project/blob/9d4af1dd/mailet/base/src/main/java/org/apache/mailet/base/GenericMailet.java ---------------------------------------------------------------------- diff --git a/mailet/base/src/main/java/org/apache/mailet/base/GenericMailet.java b/mailet/base/src/main/java/org/apache/mailet/base/GenericMailet.java index 58d0d41..f19b94a 100644 --- a/mailet/base/src/main/java/org/apache/mailet/base/GenericMailet.java +++ b/mailet/base/src/main/java/org/apache/mailet/base/GenericMailet.java @@ -26,9 +26,10 @@ import java.util.Collections; import java.util.HashSet; import java.util.Iterator; import java.util.Optional; + import javax.mail.MessagingException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.mailet.Mail; import org.apache.mailet.Mailet; import org.apache.mailet.MailetConfig; http://git-wip-us.apache.org/repos/asf/james-project/blob/9d4af1dd/mpt/core/pom.xml ---------------------------------------------------------------------- diff --git a/mpt/core/pom.xml b/mpt/core/pom.xml index 7e0ded5..64baf58 100644 --- a/mpt/core/pom.xml +++ b/mpt/core/pom.xml @@ -54,10 +54,6 @@ <artifactId>commons-io</artifactId> </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> - <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> @@ -72,6 +68,10 @@ <scope>compile</scope> </dependency> <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + <dependency> <groupId>org.apache.james.protocols</groupId> <artifactId>protocols-imap</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/9d4af1dd/mpt/impl/imap-mailbox/core/pom.xml ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/core/pom.xml b/mpt/impl/imap-mailbox/core/pom.xml index e16a903..c98767b 100644 --- a/mpt/impl/imap-mailbox/core/pom.xml +++ b/mpt/impl/imap-mailbox/core/pom.xml @@ -73,14 +73,14 @@ <artifactId>commons-io</artifactId> </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + <dependency> <groupId>org.apache.james.protocols</groupId> <artifactId>protocols-imap</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/9d4af1dd/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index bfc1249..e4e1ccc 100644 --- a/pom.xml +++ b/pom.xml @@ -648,7 +648,7 @@ <apache-commons-io.version>1.3.2</apache-commons-io.version> <jutf7.version>1.0.0</jutf7.version> <plugin.mailetdocs.version>0.1</plugin.mailetdocs.version> - <commons-lang3.version>3.3.2</commons-lang3.version> + <commons-lang3.version>3.6</commons-lang3.version> <httpclient-osgi.version>4.5.1</httpclient-osgi.version> <!-- maven-mailetdocs-plugin artifacts --> <maven-artifact.version>3.0-alpha-1</maven-artifact.version> @@ -1582,11 +1582,6 @@ <version>${commons-io.version}</version> </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>${commons-lang.version}</version> - </dependency> - <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> <version>1.1</version> http://git-wip-us.apache.org/repos/asf/james-project/blob/9d4af1dd/protocols/imap/pom.xml ---------------------------------------------------------------------- diff --git a/protocols/imap/pom.xml b/protocols/imap/pom.xml index b3add62..87252a0 100644 --- a/protocols/imap/pom.xml +++ b/protocols/imap/pom.xml @@ -60,10 +60,6 @@ <artifactId>commons-codec</artifactId> </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> @@ -74,6 +70,10 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + <dependency> <groupId>org.apache.james</groupId> <artifactId>apache-james-mailbox-api</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/9d4af1dd/protocols/imap/src/main/java/org/apache/james/imap/api/ImapConfiguration.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/api/ImapConfiguration.java b/protocols/imap/src/main/java/org/apache/james/imap/api/ImapConfiguration.java index 792b579..0d3c491 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/api/ImapConfiguration.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/api/ImapConfiguration.java @@ -22,7 +22,7 @@ package org.apache.james.imap.api; import java.util.Optional; import java.util.concurrent.TimeUnit; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import com.github.steveash.guavate.Guavate; import com.google.common.base.MoreObjects; http://git-wip-us.apache.org/repos/asf/james-project/blob/9d4af1dd/protocols/imap/src/main/java/org/apache/james/imap/encode/EncoderUtils.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/encode/EncoderUtils.java b/protocols/imap/src/main/java/org/apache/james/imap/encode/EncoderUtils.java index fd3a1ab..a3735f2 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/encode/EncoderUtils.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/encode/EncoderUtils.java @@ -23,7 +23,7 @@ import java.util.Date; import java.util.Locale; import java.util.TimeZone; -import org.apache.commons.lang.time.FastDateFormat; +import org.apache.commons.lang3.time.FastDateFormat; /** * Utility methods for IMAP encoding. http://git-wip-us.apache.org/repos/asf/james-project/blob/9d4af1dd/protocols/imap/src/main/java/org/apache/james/imap/processor/GetAnnotationProcessor.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/GetAnnotationProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/GetAnnotationProcessor.java index 99f58d4..1c6ffc1 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/GetAnnotationProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/GetAnnotationProcessor.java @@ -26,6 +26,7 @@ import java.util.Optional; import java.util.Set; import java.util.function.Predicate; +import org.apache.commons.lang3.NotImplementedException; import org.apache.james.imap.api.ImapCommand; import org.apache.james.imap.api.ImapConstants; import org.apache.james.imap.api.ImapSessionUtils; @@ -46,7 +47,6 @@ import org.apache.james.mailbox.model.MailboxAnnotationKey; import org.apache.james.mailbox.model.MailboxPath; import org.apache.james.metrics.api.MetricFactory; import org.apache.james.util.MDCBuilder; -import org.apache.commons.lang.NotImplementedException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -128,7 +128,7 @@ public class GetAnnotationProcessor extends AbstractMailboxProcessor<GetAnnotati case INFINITY: return getMailboxManager().getAnnotationsByKeysWithAllDepth(mailboxPath, mailboxSession, keys); default: - throw new NotImplementedException(); + throw new NotImplementedException("Not implemented"); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/9d4af1dd/server/mailet/mailets/pom.xml ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/pom.xml b/server/mailet/mailets/pom.xml index 4f3164f..ff4f712 100644 --- a/server/mailet/mailets/pom.xml +++ b/server/mailet/mailets/pom.xml @@ -176,6 +176,10 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + <dependency> <groupId>org.apache.james.jspf</groupId> <artifactId>apache-jspf-resolver</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/9d4af1dd/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/DSNBounce.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/DSNBounce.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/DSNBounce.java index 88f745b..f1edc22 100755 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/DSNBounce.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/DSNBounce.java @@ -32,6 +32,7 @@ import javax.mail.internet.InternetAddress; import javax.mail.internet.MimeBodyPart; import javax.mail.internet.MimeMessage; +import org.apache.commons.lang3.time.FastDateFormat; import org.apache.james.server.core.MailImpl; import org.apache.james.dnsservice.api.DNSService; import org.apache.james.transport.mailets.managesieve.ManageSieveMailet; @@ -50,7 +51,6 @@ import org.apache.james.transport.util.ReplyToUtils; import org.apache.james.transport.util.SenderUtils; import org.apache.james.transport.util.SpecialAddressesUtils; import org.apache.james.transport.util.TosUtils; -import org.apache.commons.lang.time.FastDateFormat; import org.apache.mailet.Mail; import org.apache.james.core.MailAddress; import org.apache.mailet.base.DateFormats; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
