JAMES-2472 Upgrade commons-net
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/e9a25d0d Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/e9a25d0d Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/e9a25d0d Branch: refs/heads/master Commit: e9a25d0dd9d70076d4c521cadbdeb47cfed85c42 Parents: d4973c2 Author: benwa <[email protected]> Authored: Wed Jul 18 10:34:15 2018 +0700 Committer: Matthieu Baechler <[email protected]> Committed: Fri Jul 20 10:03:53 2018 +0200 ---------------------------------------------------------------------- pom.xml | 2 +- .../java/org/apache/james/utils/SMTPMessageSender.java | 12 ++---------- 2 files changed, 3 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/e9a25d0d/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index b1ebda4..4743e1b 100644 --- a/pom.xml +++ b/pom.xml @@ -609,7 +609,7 @@ <commons-pool.version>1.6</commons-pool.version> <commons-configuration.version>1.9</commons-configuration.version> <commons-dbcp.version>1.4</commons-dbcp.version> - <commons-net.version>3.2</commons-net.version> + <commons-net.version>3.6</commons-net.version> <commons-beanutils-core.version>1.8.3</commons-beanutils-core.version> <commons-io.version>2.5</commons-io.version> <commons-logging.version>1.1.1</commons-logging.version> http://git-wip-us.apache.org/repos/asf/james-project/blob/e9a25d0d/server/testing/src/main/java/org/apache/james/utils/SMTPMessageSender.java ---------------------------------------------------------------------- diff --git a/server/testing/src/main/java/org/apache/james/utils/SMTPMessageSender.java b/server/testing/src/main/java/org/apache/james/utils/SMTPMessageSender.java index f3d1fb7..0ae1930 100644 --- a/server/testing/src/main/java/org/apache/james/utils/SMTPMessageSender.java +++ b/server/testing/src/main/java/org/apache/james/utils/SMTPMessageSender.java @@ -40,16 +40,8 @@ import com.github.fge.lambdas.Throwing; public class SMTPMessageSender extends ExternalResource implements Closeable { - private static AuthenticatingSMTPClient createClient() { - try { - return new AuthenticatingSMTPClient(); - } catch (NoSuchAlgorithmException e) { - throw new RuntimeException(e); - } - } - public static SMTPMessageSender noAuthentication(String ip, int port, String senderDomain) throws IOException { - AuthenticatingSMTPClient smtpClient = createClient(); + AuthenticatingSMTPClient smtpClient = new AuthenticatingSMTPClient(); smtpClient.connect(ip, port); return new SMTPMessageSender(smtpClient, senderDomain); } @@ -73,7 +65,7 @@ public class SMTPMessageSender extends ExternalResource implements Closeable { } public SMTPMessageSender(String senderDomain) { - this(createClient(), senderDomain); + this(new AuthenticatingSMTPClient(), senderDomain); } public SMTPMessageSender connect(String ip, int port) throws IOException { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
