commits@javamail.java.net

[javamail~mercurial:710] Added tag JAVAMAIL-1_5_3 for changeset a63663b1bb07

From: <shannon_at_java.net>
Date: Wed, 15 Apr 2015 22:49:20 +0000

Project: javamail
Repository: mercurial
Revision: 710
Author: shannon
Date: 2015-04-15 18:35:11 UTC
Link:

Log Message:
------------
shorten timeouts to reduce test time
SMTP SASL incorrrectly sends "*" as an empty response - bug 6778
Final release of JavaMail 1.5.3.
Added tag JAVAMAIL-1_5_3 for changeset a63663b1bb07


Revisions:
----------
707
708
709
710


Modified Paths:
---------------
mail/src/test/java/com/sun/mail/util/WriteTimeoutSocketTest.java
doc/release/CHANGES.txt
mail/src/main/java/com/sun/mail/smtp/SMTPSaslAuthenticator.java
mail/src/test/java/com/sun/mail/smtp/SMTPSaslHandler.java
mail/src/test/java/com/sun/mail/smtp/SMTPSaslLoginTest.java
client/pom.xml
demo/pom.xml
dsn/pom.xml
gimap/pom.xml
imap/pom.xml
javadoc/pom.xml
logging/pom.xml
mail/pom.xml
mailapi/pom.xml
mailapijar/pom.xml
mailhandler/pom.xml
mbox/native/pom.xml
mbox/pom.xml
oldmail/pom.xml
outlook/pom.xml
parent-distrib/pom.xml
pom.xml
pop3/pom.xml
publish/pom.xml
servlet/pom.xml
smtp/pom.xml
taglib/pom.xml
webapp/pom.xml
.hgtags


Diffs:
------
diff -r b71dfc0eab8e -r 3f6a2aeea34e mail/src/test/java/com/sun/mail/util/WriteTimeoutSocketTest.java
--- a/mail/src/test/java/com/sun/mail/util/WriteTimeoutSocketTest.java Mon Apr 13 15:33:28 2015 -0700
+++ b/mail/src/test/java/com/sun/mail/util/WriteTimeoutSocketTest.java Tue Apr 14 12:22:24 2015 -0700
@@ -72,6 +72,7 @@
     @Rule
     public Timeout deadlockTimeout = new Timeout(20000);
 
+ private static final int TIMEOUT = 200; // ms
     private static final String data =
         "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
 
@@ -82,7 +83,7 @@
     public void test() {
         final Properties properties = new Properties();
         properties.setProperty("mail.imap.host", "localhost");
- properties.setProperty("mail.imap.writetimeout", "" + 1000);
+ properties.setProperty("mail.imap.writetimeout", "" + TIMEOUT);
         test(properties, false);
     }
 
@@ -93,7 +94,7 @@
     public void testSocketFactory() {
         final Properties properties = new Properties();
         properties.setProperty("mail.imap.host", "localhost");
- properties.setProperty("mail.imap.writetimeout", "" + 1000);
+ properties.setProperty("mail.imap.writetimeout", "" + TIMEOUT);
         TestSocketFactory sf = new TestSocketFactory();
         properties.put("mail.imap.socketFactory", sf);
         properties.setProperty("mail.imap.socketFactory.fallback", "false");
@@ -109,7 +110,7 @@
     public void testSSL() {
         final Properties properties = new Properties();
         properties.setProperty("mail.imap.host", "localhost");
- properties.setProperty("mail.imap.writetimeout", "" + 1000);
+ properties.setProperty("mail.imap.writetimeout", "" + TIMEOUT);
         properties.setProperty("mail.imap.ssl.enable", "true");
         // enable only the anonymous cipher suites since there's no
         // server certificate
@@ -125,7 +126,7 @@
     public void testSSLSocketFactory() throws Exception {
         final Properties properties = new Properties();
         properties.setProperty("mail.imap.host", "localhost");
- properties.setProperty("mail.imap.writetimeout", "" + 1000);
+ properties.setProperty("mail.imap.writetimeout", "" + TIMEOUT);
         properties.setProperty("mail.imap.ssl.enable", "true");
         TestSSLSocketFactory sf = new TestSSLSocketFactory();
         sf.setDefaultCipherSuites(getAnonCipherSuitesArray());
@@ -228,7 +229,7 @@
         @Override
         protected void collectMessage(int bytes) throws IOException {
             try {
- Thread.currentThread().sleep(2000);
+ Thread.currentThread().sleep(TIMEOUT*2);
             } catch (InterruptedException ex) { }
             super.collectMessage(bytes);
         }


diff -r 3f6a2aeea34e -r 5bd78a13a9bc doc/release/CHANGES.txt
--- a/doc/release/CHANGES.txt Tue Apr 14 12:22:24 2015 -0700
+++ b/doc/release/CHANGES.txt Tue Apr 14 12:29:50 2015 -0700
@@ -38,6 +38,7 @@
 K 6755 EXPUNGE response during UID FETCH breaks UID->seqnum mapping
 K 6762 ArrayIndexOutOfBoundsException caused by out-of-range IMAP responses
 K 6772 write timeouts don't work with a custom SSL socket factory
+K 6778 SMTP SASL DIGEST-MD5 fails on postfix since the last reply sent is "*"
 
 
                   CHANGES IN THE 1.5.2 RELEASE

diff -r 3f6a2aeea34e -r 5bd78a13a9bc mail/src/main/java/com/sun/mail/smtp/SMTPSaslAuthenticator.java
--- a/mail/src/main/java/com/sun/mail/smtp/SMTPSaslAuthenticator.java Tue Apr 14 12:22:24 2015 -0700
+++ b/mail/src/main/java/com/sun/mail/smtp/SMTPSaslAuthenticator.java Tue Apr 14 12:29:50 2015 -0700
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 1997-2014 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -202,7 +202,7 @@
                     }
                     if (ba == null) {
                         logger.fine("SASL: no response");
- resp = pr.simpleCommand("*");
+ resp = pr.simpleCommand("");
                     } else {
                         if (logger.isLoggable(Level.FINE))
                             logger.fine("SASL response: " +

diff -r 3f6a2aeea34e -r 5bd78a13a9bc mail/src/test/java/com/sun/mail/smtp/SMTPSaslHandler.java
--- a/mail/src/test/java/com/sun/mail/smtp/SMTPSaslHandler.java Tue Apr 14 12:22:24 2015 -0700
+++ b/mail/src/test/java/com/sun/mail/smtp/SMTPSaslHandler.java Tue Apr 14 12:29:50 2015 -0700
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2009-2013 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009-2015 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -153,24 +153,24 @@
         while (!ss.isComplete()) {
             try {
                 byte[] chal = ss.evaluateResponse(response);
- if (ss.isComplete()) {
- break;
- } else {
- // send challenge
- if (LOGGER.isLoggable(Level.FINE))
- LOGGER.fine("SASL challenge: " +
- ASCIIUtility.toString(chal, 0, chal.length));
- byte[] ba = BASE64EncoderStream.encode(chal);
- if (ba.length > 0)
- println("334 " +
- ASCIIUtility.toString(ba, 0, ba.length));
- else
- println("334");
- // read response
- String resp = readLine();
- response = resp.getBytes();
- response = BASE64DecoderStream.decode(response);
+ // send challenge
+ if (LOGGER.isLoggable(Level.FINE))
+ LOGGER.fine("SASL challenge: " +
+ ASCIIUtility.toString(chal, 0, chal.length));
+ byte[] ba = BASE64EncoderStream.encode(chal);
+ if (ba.length > 0)
+ println("334 " +
+ ASCIIUtility.toString(ba, 0, ba.length));
+ else
+ println("334");
+ // read response
+ String resp = readLine();
+ if (!isBase64(resp)) {
+ println("501 response not base64");
+ break;
                 }
+ response = resp.getBytes();
+ response = BASE64DecoderStream.decode(response);
             } catch (SaslException ex) {
                 println("501 " + ex.toString());
                 break;
@@ -192,4 +192,22 @@
 
         println("235 Authenticated");
     }
+
+ /**
+ * Is every character in the string a base64 character?
+ */
+ private boolean isBase64(String s) {
+ int len = s.length();
+ if (s.endsWith("=="))
+ len -= 2;
+ else if (s.endsWith("="))
+ len--;
+ for (int i = 0; i < len; i++) {
+ char c = s.charAt(i);
+ if (!((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z') ||
+ (c >= '0' && c <= '9') || c == '+' || c == '/'))
+ return false;
+ }
+ return true;
+ }
 }

diff -r 3f6a2aeea34e -r 5bd78a13a9bc mail/src/test/java/com/sun/mail/smtp/SMTPSaslLoginTest.java
--- a/mail/src/test/java/com/sun/mail/smtp/SMTPSaslLoginTest.java Tue Apr 14 12:22:24 2015 -0700
+++ b/mail/src/test/java/com/sun/mail/smtp/SMTPSaslLoginTest.java Tue Apr 14 12:29:50 2015 -0700
@@ -58,13 +58,92 @@
  */
 public class SMTPSaslLoginTest {
 
+ /**
+ * Test using non-SASL DIGEST-MD5.
+ */
     @Test
     public void testSuccess() {
         TestServer server = null;
         try {
             server = new TestServer(new SMTPSaslHandler());
             server.start();
- Thread.sleep(1000);
+
+ Properties properties = new Properties();
+ properties.setProperty("mail.smtp.host", "localhost");
+ properties.setProperty("mail.smtp.port", "" + server.getPort());
+ //properties.setProperty("mail.debug.auth", "true");
+ Session session = Session.getInstance(properties);
+ //session.setDebug(true);
+
+ Transport t = session.getTransport("smtp");
+ try {
+ t.connect("test", "test");
+ // success!
+ } catch (Exception ex) {
+ fail(ex.toString());
+ } finally {
+ t.close();
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ fail(e.getMessage());
+ } finally {
+ if (server != null) {
+ server.quit();
+ server.interrupt();
+ }
+ }
+ }
+
+ /**
+ * Test using non-SASL DIGEST-MD5 with incorrect password.
+ */
+ @Test
+ public void testFailure() {
+ TestServer server = null;
+ try {
+ server = new TestServer(new SMTPSaslHandler());
+ server.start();
+
+ Properties properties = new Properties();
+ properties.setProperty("mail.smtp.host", "localhost");
+ properties.setProperty("mail.smtp.port", "" + server.getPort());
+ //properties.setProperty("mail.debug.auth", "true");
+ Session session = Session.getInstance(properties);
+ //session.setDebug(true);
+
+ Transport t = session.getTransport("smtp");
+ try {
+ t.connect("test", "xtest");
+ // should have failed
+ fail("wrong password succeeded");
+ } catch (AuthenticationFailedException ex) {
+ // success!
+ } catch (Exception ex) {
+ fail(ex.toString());
+ } finally {
+ t.close();
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ fail(e.getMessage());
+ } finally {
+ if (server != null) {
+ server.quit();
+ server.interrupt();
+ }
+ }
+ }
+
+ /**
+ * Test using SASL DIGEST-MD5.
+ */
+ @Test
+ public void testSaslSuccess() {
+ TestServer server = null;
+ try {
+ server = new TestServer(new SMTPSaslHandler());
+ server.start();
 
             Properties properties = new Properties();
             properties.setProperty("mail.smtp.host", "localhost");
@@ -96,13 +175,15 @@
         }
     }
 
+ /**
+ * Test using SASL DIGEST-MD5 with incorrect password.
+ */
     @Test
- public void testFailure() {
+ public void testSaslFailure() {
         TestServer server = null;
         try {
             server = new TestServer(new SMTPSaslHandler());
             server.start();
- Thread.sleep(1000);
 
             Properties properties = new Properties();
             properties.setProperty("mail.smtp.host", "localhost");


diff -r 5bd78a13a9bc -r a63663b1bb07 client/pom.xml
--- a/client/pom.xml Tue Apr 14 12:29:50 2015 -0700
+++ b/client/pom.xml Wed Apr 15 11:34:52 2015 -0700
@@ -48,7 +48,7 @@
     <parent>
         <groupId>com.sun.mail</groupId>
         <artifactId>all</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.sun.mail</groupId>

diff -r 5bd78a13a9bc -r a63663b1bb07 demo/pom.xml
--- a/demo/pom.xml Tue Apr 14 12:29:50 2015 -0700
+++ b/demo/pom.xml Wed Apr 15 11:34:52 2015 -0700
@@ -48,7 +48,7 @@
     <parent>
         <groupId>com.sun.mail</groupId>
         <artifactId>all</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.sun.mail</groupId>

diff -r 5bd78a13a9bc -r a63663b1bb07 dsn/pom.xml
--- a/dsn/pom.xml Tue Apr 14 12:29:50 2015 -0700
+++ b/dsn/pom.xml Wed Apr 15 11:34:52 2015 -0700
@@ -48,7 +48,7 @@
     <parent>
         <groupId>com.sun.mail</groupId>
         <artifactId>all</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.sun.mail</groupId>

diff -r 5bd78a13a9bc -r a63663b1bb07 gimap/pom.xml
--- a/gimap/pom.xml Tue Apr 14 12:29:50 2015 -0700
+++ b/gimap/pom.xml Wed Apr 15 11:34:52 2015 -0700
@@ -48,7 +48,7 @@
     <parent>
         <groupId>com.sun.mail</groupId>
         <artifactId>all</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.sun.mail</groupId>

diff -r 5bd78a13a9bc -r a63663b1bb07 imap/pom.xml
--- a/imap/pom.xml Tue Apr 14 12:29:50 2015 -0700
+++ b/imap/pom.xml Wed Apr 15 11:34:52 2015 -0700
@@ -48,7 +48,7 @@
     <parent>
         <groupId>com.sun.mail</groupId>
         <artifactId>parent-distrib</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.3</version>
         <relativePath>../parent-distrib/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff -r 5bd78a13a9bc -r a63663b1bb07 javadoc/pom.xml
--- a/javadoc/pom.xml Tue Apr 14 12:29:50 2015 -0700
+++ b/javadoc/pom.xml Wed Apr 15 11:34:52 2015 -0700
@@ -48,13 +48,13 @@
     <parent>
         <groupId>com.sun.mail</groupId>
         <artifactId>all</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.sun.mail</groupId>
     <artifactId>javadoc</artifactId>
     <packaging>pom</packaging>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.3</version>
     <name>JavaMail API javadocs</name>
     <description>${project.name}</description>
 

diff -r 5bd78a13a9bc -r a63663b1bb07 logging/pom.xml
--- a/logging/pom.xml Tue Apr 14 12:29:50 2015 -0700
+++ b/logging/pom.xml Wed Apr 15 11:34:52 2015 -0700
@@ -48,7 +48,7 @@
     <parent>
         <groupId>com.sun.mail</groupId>
         <artifactId>all</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.sun.mail</groupId>

diff -r 5bd78a13a9bc -r a63663b1bb07 mail/pom.xml
--- a/mail/pom.xml Tue Apr 14 12:29:50 2015 -0700
+++ b/mail/pom.xml Wed Apr 15 11:34:52 2015 -0700
@@ -48,7 +48,7 @@
     <parent>
         <groupId>com.sun.mail</groupId>
         <artifactId>all</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.sun.mail</groupId>

diff -r 5bd78a13a9bc -r a63663b1bb07 mailapi/pom.xml
--- a/mailapi/pom.xml Tue Apr 14 12:29:50 2015 -0700
+++ b/mailapi/pom.xml Wed Apr 15 11:34:52 2015 -0700
@@ -56,7 +56,7 @@
     <parent>
         <groupId>com.sun.mail</groupId>
         <artifactId>all</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.sun.mail</groupId>

diff -r 5bd78a13a9bc -r a63663b1bb07 mailapijar/pom.xml
--- a/mailapijar/pom.xml Tue Apr 14 12:29:50 2015 -0700
+++ b/mailapijar/pom.xml Wed Apr 15 11:34:52 2015 -0700
@@ -55,7 +55,7 @@
     <parent>
         <groupId>com.sun.mail</groupId>
         <artifactId>all</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>javax.mail</groupId>

diff -r 5bd78a13a9bc -r a63663b1bb07 mailhandler/pom.xml
--- a/mailhandler/pom.xml Tue Apr 14 12:29:50 2015 -0700
+++ b/mailhandler/pom.xml Wed Apr 15 11:34:52 2015 -0700
@@ -48,7 +48,7 @@
     <parent>
         <groupId>com.sun.mail</groupId>
         <artifactId>parent-distrib</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.3</version>
         <relativePath>../parent-distrib/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff -r 5bd78a13a9bc -r a63663b1bb07 mbox/native/pom.xml
--- a/mbox/native/pom.xml Tue Apr 14 12:29:50 2015 -0700
+++ b/mbox/native/pom.xml Wed Apr 15 11:34:52 2015 -0700
@@ -48,7 +48,7 @@
     <parent>
         <groupId>com.sun.mail</groupId>
         <artifactId>all</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.3</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff -r 5bd78a13a9bc -r a63663b1bb07 mbox/pom.xml
--- a/mbox/pom.xml Tue Apr 14 12:29:50 2015 -0700
+++ b/mbox/pom.xml Wed Apr 15 11:34:52 2015 -0700
@@ -48,7 +48,7 @@
     <parent>
         <groupId>com.sun.mail</groupId>
         <artifactId>all</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.sun.mail</groupId>

diff -r 5bd78a13a9bc -r a63663b1bb07 oldmail/pom.xml
--- a/oldmail/pom.xml Tue Apr 14 12:29:50 2015 -0700
+++ b/oldmail/pom.xml Wed Apr 15 11:34:52 2015 -0700
@@ -53,7 +53,7 @@
     <parent>
         <groupId>com.sun.mail</groupId>
         <artifactId>all</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>javax.mail</groupId>

diff -r 5bd78a13a9bc -r a63663b1bb07 outlook/pom.xml
--- a/outlook/pom.xml Tue Apr 14 12:29:50 2015 -0700
+++ b/outlook/pom.xml Wed Apr 15 11:34:52 2015 -0700
@@ -48,7 +48,7 @@
     <parent>
         <groupId>com.sun.mail</groupId>
         <artifactId>all</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.sun.mail</groupId>

diff -r 5bd78a13a9bc -r a63663b1bb07 parent-distrib/pom.xml
--- a/parent-distrib/pom.xml Tue Apr 14 12:29:50 2015 -0700
+++ b/parent-distrib/pom.xml Wed Apr 15 11:34:52 2015 -0700
@@ -48,7 +48,7 @@
     <parent>
         <groupId>com.sun.mail</groupId>
         <artifactId>all</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.sun.mail</groupId>

diff -r 5bd78a13a9bc -r a63663b1bb07 pom.xml
--- a/pom.xml Tue Apr 14 12:29:50 2015 -0700
+++ b/pom.xml Wed Apr 15 11:34:52 2015 -0700
@@ -54,7 +54,7 @@
     <groupId>com.sun.mail</groupId>
     <artifactId>all</artifactId>
     <packaging>pom</packaging>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.3</version>
     <name>JavaMail API distribution</name>
     <description>${project.name}</description>
     <url>http://javamail.java.net</url>
@@ -85,9 +85,9 @@
     </organization>
 
     <properties>
- <mail.version>1.5.3-SNAPSHOT</mail.version>
+ <mail.version>1.5.3</mail.version>
         <!-- like mail.version, but with underscores instead of dots -->
- <mail.zipversion>1_5_3-SNAPSHOT</mail.zipversion>
+ <mail.zipversion>1_5_3</mail.zipversion>
         <mail.spec.version>1.5</mail.spec.version>
         <activation-api.version>1.1</activation-api.version>
         <!-- defaults that are overridden in mail module -->

diff -r 5bd78a13a9bc -r a63663b1bb07 pop3/pom.xml
--- a/pop3/pom.xml Tue Apr 14 12:29:50 2015 -0700
+++ b/pop3/pom.xml Wed Apr 15 11:34:52 2015 -0700
@@ -48,7 +48,7 @@
     <parent>
         <groupId>com.sun.mail</groupId>
         <artifactId>parent-distrib</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.3</version>
         <relativePath>../parent-distrib/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff -r 5bd78a13a9bc -r a63663b1bb07 publish/pom.xml
--- a/publish/pom.xml Tue Apr 14 12:29:50 2015 -0700
+++ b/publish/pom.xml Wed Apr 15 11:34:52 2015 -0700
@@ -48,13 +48,13 @@
     <parent>
         <groupId>com.sun.mail</groupId>
         <artifactId>all</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.sun.mail</groupId>
     <artifactId>publish</artifactId>
     <packaging>pom</packaging>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.3</version>
     <name>JavaMail API publish project</name>
 
     <build>
@@ -89,44 +89,44 @@
         <dependency>
             <groupId>com.sun.mail</groupId>
             <artifactId>javax.mail</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.3</version>
         </dependency>
     <!--
         <dependency>
             <groupId>com.sun.mail</groupId>
             <artifactId>demo</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.3</version>
         </dependency>
         <dependency>
             <groupId>com.sun.mail</groupId>
             <artifactId>client</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.3</version>
         </dependency>
         <dependency>
             <groupId>com.sun.mail</groupId>
             <artifactId>servlet</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.3</version>
         </dependency>
         <dependency>
             <groupId>com.sun.mail</groupId>
             <artifactId>webapp</artifactId>
             <type>war</type>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.3</version>
         </dependency>
         <dependency>
             <groupId>com.sun.mail</groupId>
             <artifactId>taglib</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.3</version>
         </dependency>
         <dependency>
             <groupId>com.sun.mail</groupId>
             <artifactId>logging</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.3</version>
         </dependency>
         <dependency>
             <groupId>com.sun.mail</groupId>
             <artifactId>outlook</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.3</version>
         </dependency>
     -->
     </dependencies>

diff -r 5bd78a13a9bc -r a63663b1bb07 servlet/pom.xml
--- a/servlet/pom.xml Tue Apr 14 12:29:50 2015 -0700
+++ b/servlet/pom.xml Wed Apr 15 11:34:52 2015 -0700
@@ -48,7 +48,7 @@
     <parent>
         <groupId>com.sun.mail</groupId>
         <artifactId>all</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.sun.mail</groupId>

diff -r 5bd78a13a9bc -r a63663b1bb07 smtp/pom.xml
--- a/smtp/pom.xml Tue Apr 14 12:29:50 2015 -0700
+++ b/smtp/pom.xml Wed Apr 15 11:34:52 2015 -0700
@@ -48,7 +48,7 @@
     <parent>
         <groupId>com.sun.mail</groupId>
         <artifactId>parent-distrib</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.3</version>
         <relativePath>../parent-distrib/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff -r 5bd78a13a9bc -r a63663b1bb07 taglib/pom.xml
--- a/taglib/pom.xml Tue Apr 14 12:29:50 2015 -0700
+++ b/taglib/pom.xml Wed Apr 15 11:34:52 2015 -0700
@@ -48,7 +48,7 @@
     <parent>
         <groupId>com.sun.mail</groupId>
         <artifactId>all</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.sun.mail</groupId>

diff -r 5bd78a13a9bc -r a63663b1bb07 webapp/pom.xml
--- a/webapp/pom.xml Tue Apr 14 12:29:50 2015 -0700
+++ b/webapp/pom.xml Wed Apr 15 11:34:52 2015 -0700
@@ -48,7 +48,7 @@
     <parent>
         <groupId>com.sun.mail</groupId>
         <artifactId>all</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.sun.mail</groupId>


diff -r a63663b1bb07 -r e5fca2ba4f16 .hgtags
--- a/.hgtags Wed Apr 15 11:34:52 2015 -0700
+++ b/.hgtags Wed Apr 15 11:35:11 2015 -0700
@@ -17,3 +17,4 @@
 fa1edb81787d0b26828cee438a6d54df619fa6da JAVAMAIL-1_5_0
 f6c4d3181f06de080bb3b107382464fad875dfdb JAVAMAIL-1_5_1
 1cbe387fd6841ae0f1c5c6da1e7f872c49255f1d JAVAMAIL-1_5_2
+a63663b1bb07ae812f9cf13b03fbcf3e8e129521 JAVAMAIL-1_5_3