This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository javamail.
commit e67ff8a3949381ce2c01676ec1545ad2d7a6621d Author: Emmanuel Bourg <[email protected]> Date: Tue Aug 26 08:42:06 2014 +0200 New upstream release (1.5.2) Removed 03-change-test-ports.patch (fixed upstream) --- debian/changelog | 7 ++ debian/patches/03-change-test-ports.patch | 139 ------------------------------ debian/patches/series | 1 - 3 files changed, 7 insertions(+), 140 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3a5be56..8d15702 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +javamail (1.5.2-1) UNRELEASED; urgency=medium + + * New upstream release + - Removed 03-change-test-ports.patch (fixed upstream) + + -- Emmanuel Bourg <[email protected]> Mon, 25 Aug 2014 23:27:13 +0200 + javamail (1.5.1-1) unstable; urgency=low * Initial release (Closes: #596469, #710394) diff --git a/debian/patches/03-change-test-ports.patch b/debian/patches/03-change-test-ports.patch deleted file mode 100644 index 1840190..0000000 --- a/debian/patches/03-change-test-ports.patch +++ /dev/null @@ -1,139 +0,0 @@ -Description: Changes the ports opened by the tests to avoid 'java.net.BindException: Address already in use' errors -Author: Emmanuel Bourg <[email protected]> -Forwarded: no ---- a/mail/src/test/java/com/sun/mail/smtp/SMTPConnectFailureTest.java -+++ b/mail/src/test/java/com/sun/mail/smtp/SMTPConnectFailureTest.java -@@ -59,7 +59,7 @@ - public class SMTPConnectFailureTest { - - private static final String HOST = "localhost"; -- private static final int PORT = 26423; -+ private static final int PORT = 26424; - private static final int CTO = 20; - - @Test ---- a/mail/src/test/java/com/sun/mail/smtp/SMTPCloseTest.java -+++ b/mail/src/test/java/com/sun/mail/smtp/SMTPCloseTest.java -@@ -65,13 +65,13 @@ - public void test() { - NopServer server = null; - try { -- server = new NopServer(26423); -+ server = new NopServer(26425); - server.start(); - Thread.sleep(1000); - - final Properties properties = new Properties(); - properties.setProperty("mail.smtp.host", "localhost"); -- properties.setProperty("mail.smtp.port", "26423"); -+ properties.setProperty("mail.smtp.port", "26425"); - properties.setProperty("mail.smtp.timeout", "100"); - final Session session = Session.getInstance(properties); - //session.setDebug(true); ---- a/mail/src/test/java/com/sun/mail/smtp/SMTPSaslLoginTest.java -+++ b/mail/src/test/java/com/sun/mail/smtp/SMTPSaslLoginTest.java -@@ -59,13 +59,13 @@ - public void test() { - SMTPServer server = null; - try { -- server = new SMTPServer(new SMTPSaslHandler(), 26423); -+ server = new SMTPServer(new SMTPSaslHandler(), 26426); - server.start(); - Thread.sleep(1000); - - Properties properties = new Properties(); - properties.setProperty("mail.smtp.host", "localhost"); -- properties.setProperty("mail.smtp.port", "26423"); -+ properties.setProperty("mail.smtp.port", "26426"); - properties.setProperty("mail.smtp.sasl.enable", "true"); - properties.setProperty("mail.smtp.sasl.mechanisms", "DIGEST-MD5"); - properties.setProperty("mail.smtp.auth.digest-md5.disable", "true"); ---- a/mail/src/test/java/com/sun/mail/pop3/POP3FolderClosedExceptionTest.java -+++ b/mail/src/test/java/com/sun/mail/pop3/POP3FolderClosedExceptionTest.java -@@ -71,13 +71,13 @@ - POP3Server server = null; - try { - final POP3Handler handler = new POP3HandlerTimeoutBody(); -- server = new POP3Server(handler, 26421); -+ server = new POP3Server(handler, 26420); - server.start(); - Thread.sleep(1000); - - final Properties properties = new Properties(); - properties.setProperty("mail.pop3.host", "localhost"); -- properties.setProperty("mail.pop3.port", "26421"); -+ properties.setProperty("mail.pop3.port", "26420"); - final Session session = Session.getInstance(properties); - //session.setDebug(true); - ---- a/mail/src/test/java/com/sun/mail/pop3/POP3StoreTest.java -+++ b/mail/src/test/java/com/sun/mail/pop3/POP3StoreTest.java -@@ -66,13 +66,13 @@ - POP3Server server = null; - try { - final POP3Handler handler = new POP3HandlerNoopErr(); -- server = new POP3Server(handler, 26421); -+ server = new POP3Server(handler, 26419); - server.start(); - Thread.sleep(1000); - - final Properties properties = new Properties(); - properties.setProperty("mail.pop3.host", "localhost"); -- properties.setProperty("mail.pop3.port", "26421"); -+ properties.setProperty("mail.pop3.port", "26419"); - final Session session = Session.getInstance(properties); - //session.setDebug(true); - ---- a/mail/src/test/java/com/sun/mail/pop3/POP3ReadableMimeTest.java -+++ b/mail/src/test/java/com/sun/mail/pop3/POP3ReadableMimeTest.java -@@ -74,13 +74,13 @@ - private static void startServer(boolean cached) { - try { - final POP3Handler handler = new POP3Handler(); -- server = new POP3Server(handler, 26421); -+ server = new POP3Server(handler, 26422); - server.start(); - Thread.sleep(1000); - - final Properties properties = new Properties(); - properties.setProperty("mail.pop3.host", "localhost"); -- properties.setProperty("mail.pop3.port", "26421"); -+ properties.setProperty("mail.pop3.port", "26422"); - if (cached) - properties.setProperty("mail.pop3.filecache.enable", "true"); - final Session session = Session.getInstance(properties); ---- a/mail/src/test/java/com/sun/mail/pop3/POP3MessageTest.java -+++ b/mail/src/test/java/com/sun/mail/pop3/POP3MessageTest.java -@@ -71,13 +71,13 @@ - private static void startServer(boolean cached) { - try { - final POP3Handler handler = new POP3Handler(); -- server = new POP3Server(handler, 26421); -+ server = new POP3Server(handler, 26418); - server.start(); - Thread.sleep(1000); - - final Properties properties = new Properties(); - properties.setProperty("mail.pop3.host", "localhost"); -- properties.setProperty("mail.pop3.port", "26421"); -+ properties.setProperty("mail.pop3.port", "26418"); - if (cached) - properties.setProperty("mail.pop3.filecache.enable", "true"); - final Session session = Session.getInstance(properties); ---- a/mail/src/test/java/com/sun/mail/pop3/POP3AuthDebugTest.java -+++ b/mail/src/test/java/com/sun/mail/pop3/POP3AuthDebugTest.java -@@ -101,12 +101,12 @@ - POP3Server server = null; - try { - final POP3Handler handler = new POP3Handler(); -- server = new POP3Server(handler, 26421); -+ server = new POP3Server(handler, 26417); - server.start(); - Thread.sleep(1000); - - properties.setProperty("mail.pop3.host", "localhost"); -- properties.setProperty("mail.pop3.port", "26421"); -+ properties.setProperty("mail.pop3.port", "26417"); - final Session session = Session.getInstance(properties); - ByteArrayOutputStream bos = new ByteArrayOutputStream(); - PrintStream ps = new PrintStream(bos); diff --git a/debian/patches/series b/debian/patches/series index 25be033..7f9beb8 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ #01-ignore-findbugs.patch 01-disable-modules.patch 02-rename-jars.patch -03-change-test-ports.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/javamail.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
