Project: javamail
Repository: mercurial
Revision: 548
Author: shannon
Date: 2013-03-29 21:04:23 UTC
Link:
Log Message:
------------
When failing to connect to a server, provide more detail in exception - bug 5861
Update version to 1.5.0-b02.
Fix spec and OSGi version numbers until spec is final.
Don't use IOException(msg, cause) constructor that was added in JDK 1.6.
get rid of unneeded Exception field in SocketConnectException;
update serialVersionUID
Update version to 1.5.0-SNAPSHOT.
Revisions:
----------
544
545
546
547
548
Modified Paths:
---------------
doc/release/CHANGES.txt
mail/src/main/java/com/sun/mail/imap/IMAPStore.java
mail/src/main/java/com/sun/mail/pop3/POP3Store.java
mail/src/main/java/com/sun/mail/smtp/SMTPTransport.java
mail/src/main/java/com/sun/mail/util/SocketFetcher.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
mbox/dist/pom.xml
mbox/native/pom.xml
mbox/pom.xml
oldmail/pom.xml
outlook/pom.xml
parent-distrib/pom.xml
pom.xml
pop3/pom.xml
servlet/pom.xml
smtp/pom.xml
taglib/pom.xml
webapp/pom.xml
mail/src/main/java/com/sun/mail/util/SocketConnectException.java
mail/src/main/java/com/sun/mail/util/MailConnectException.java
Added Paths:
------------
mail/src/main/java/com/sun/mail/util/MailConnectException.java
mail/src/main/java/com/sun/mail/util/SocketConnectException.java
mail/src/test/java/com/sun/mail/imap/IMAPConnectFailureTest.java
mail/src/test/java/com/sun/mail/smtp/SMTPConnectFailureTest.java
Diffs:
------
diff -r a6f66f6e9131 -r c9b75d67349b doc/release/CHANGES.txt
--- a/doc/release/CHANGES.txt Wed Mar 20 15:50:21 2013 -0700
+++ b/doc/release/CHANGES.txt Mon Mar 25 15:30:03 2013 -0700
@@ -38,6 +38,7 @@
K 5829 NullPointerException when accessing the content of a message attachment
K 5830 IMAPProtocol.sasllogin uses old constructor for IMAPSaslAuthenticator
K 5847 Exception when parsing bad address with unclosed quote in mail header
+K 5861 when failing to connect to a server, provide more detail in exception
CHANGES IN THE 1.4.7 RELEASE
diff -r a6f66f6e9131 -r c9b75d67349b mail/src/main/java/com/sun/mail/imap/IMAPStore.java
--- a/mail/src/main/java/com/sun/mail/imap/IMAPStore.java Wed Mar 20 15:50:21 2013 -0700
+++ b/mail/src/main/java/com/sun/mail/imap/IMAPStore.java Mon Mar 25 15:30:03 2013 -0700
@@ -56,6 +56,8 @@
import com.sun.mail.imap.protocol.*;
import com.sun.mail.util.PropUtil;
import com.sun.mail.util.MailLogger;
+import com.sun.mail.util.SocketConnectException;
+import com.sun.mail.util.MailConnectException;
/**
* This class provides access to an IMAP message store. <p>
@@ -666,6 +668,8 @@
protocol.disconnect();
protocol = null;
throw new MessagingException(pex.getMessage(), pex);
+ } catch (SocketConnectException scex) {
+ throw new MailConnectException(scex);
} catch (IOException ioex) {
throw new MessagingException(ioex.getMessage(), ioex);
}
diff -r a6f66f6e9131 -r c9b75d67349b mail/src/main/java/com/sun/mail/pop3/POP3Store.java
--- a/mail/src/main/java/com/sun/mail/pop3/POP3Store.java Wed Mar 20 15:50:21 2013 -0700
+++ b/mail/src/main/java/com/sun/mail/pop3/POP3Store.java Mon Mar 25 15:30:03 2013 -0700
@@ -1,7 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright (c) 1997-2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997-2013 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
@@ -55,6 +55,8 @@
import com.sun.mail.util.PropUtil;
import com.sun.mail.util.MailLogger;
+import com.sun.mail.util.SocketConnectException;
+import com.sun.mail.util.MailConnectException;
/**
* A POP3 Message Store. Contains only one folder, "INBOX".
@@ -205,6 +207,8 @@
port = getPort(null);
} catch (EOFException eex) {
throw new AuthenticationFailedException(eex.getMessage());
+ } catch (SocketConnectException scex) {
+ throw new MailConnectException(scex);
} catch (IOException ioex) {
throw new MessagingException("Connect failed", ioex);
}
diff -r a6f66f6e9131 -r c9b75d67349b mail/src/main/java/com/sun/mail/smtp/SMTPTransport.java
--- a/mail/src/main/java/com/sun/mail/smtp/SMTPTransport.java Wed Mar 20 15:50:21 2013 -0700
+++ b/mail/src/main/java/com/sun/mail/smtp/SMTPTransport.java Mon Mar 25 15:30:03 2013 -0700
@@ -1957,6 +1957,8 @@
}
} catch (UnknownHostException uhex) {
throw new MessagingException("Unknown SMTP host: " + host, uhex);
+ } catch (SocketConnectException scex) {
+ throw new MailConnectException(scex);
} catch (IOException ioe) {
throw new MessagingException("Could not connect to SMTP host: " +
host + ", port: " + port, ioe);
diff -r a6f66f6e9131 -r c9b75d67349b mail/src/main/java/com/sun/mail/util/MailConnectException.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/src/main/java/com/sun/mail/util/MailConnectException.java Mon Mar 25 15:30:03 2013 -0700
@@ -0,0 +1,107 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 1997-2013 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
+ * and Distribution License("CDDL") (collectively, the "License"). You
+ * may not use this file except in compliance with the License. You can
+ * obtain a copy of the License at
+ *
https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt. See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license." If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above. However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+
+package com.sun.mail.util;
+
+import javax.mail.MessagingException;
+
+/**
+ * A MessagingException that indicates a socket connection attempt failed.
+ * Unlike java.net.ConnectException, it includes details of what we
+ * were trying to connect to. The underlying exception is available
+ * as the "cause" of this exception.
+ *
+ * @see java.net.ConnectException
+ * @author Bill Shannon
+ * @since JavaMail 1.5.0
+ */
+
+public class MailConnectException extends MessagingException {
+ private String host;
+ private int port;
+ private int cto;
+
+ //private static final long serialVersionUID = 4280468026581616424L;
+
+ /**
+ * Constructs a MailConnectException.
+ *
+ * @param cex the SocketConnectException with the details
+ */
+ public MailConnectException(SocketConnectException cex) {
+ super(
+ "Couldn't connect to host, port: " +
+ cex.getHost() + ", " + cex.getPort() +
+ "; timeout " + cex.getConnectionTimeout() +
+ (cex.getMessage() != null ? ("; " + cex.getMessage()) : ""));
+ // extract the details and save them here
+ this.host = cex.getHost();
+ this.port = cex.getPort();
+ this.cto = cex.getConnectionTimeout();
+ setNextException(cex.getException());
+ }
+
+ /**
+ * The host we were trying to connect to.
+ *
+ * @return the host
+ */
+ public String getHost() {
+ return host;
+ }
+
+ /**
+ * The port we were trying to connect to.
+ *
+ * @return the port
+ */
+ public int getPort() {
+ return port;
+ }
+
+ /**
+ * The timeout used for the connection attempt.
+ *
+ * @return the connection timeout
+ */
+ public int getConnectionTimeout() {
+ return cto;
+ }
+}
diff -r a6f66f6e9131 -r c9b75d67349b mail/src/main/java/com/sun/mail/util/SocketConnectException.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/src/main/java/com/sun/mail/util/SocketConnectException.java Mon Mar 25 15:30:03 2013 -0700
@@ -0,0 +1,116 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 1997-2013 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
+ * and Distribution License("CDDL") (collectively, the "License"). You
+ * may not use this file except in compliance with the License. You can
+ * obtain a copy of the License at
+ *
https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt. See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license." If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above. However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+
+package com.sun.mail.util;
+
+import java.io.IOException;
+
+/**
+ * An IOException that indicates a socket connection attempt failed.
+ * Unlike java.net.ConnectException, it includes details of what we
+ * were trying to connect to.
+ *
+ * @see java.net.ConnectException
+ * @author Bill Shannon
+ * @since JavaMail 1.5.0
+ */
+
+public class SocketConnectException extends IOException {
+ private String host;
+ private int port;
+ private int cto;
+ private Exception ex;
+
+ //private static final long serialVersionUID = 4280468026581616424L;
+
+ /**
+ * Constructs a SocketConnectException.
+ *
+ * @param msg error message detail
+ * @param cause the underlying exception that indicates the failure
+ * @param host the host we were trying to connect to
+ * @param port the port we were trying to connect to
+ * @param cto the timeout for the connection attempt
+ */
+ public SocketConnectException(String msg, Exception cause,
+ String host, int port, int cto) {
+ super(msg, cause);
+ this.host = host;
+ this.port = port;
+ this.cto = cto;
+ this.ex = cause;
+ }
+
+ /**
+ * The exception that caused the failure.
+ *
+ * @return the exception
+ */
+ public Exception getException() {
+ return ex;
+ }
+
+ /**
+ * The host we were trying to connect to.
+ *
+ * @return the host
+ */
+ public String getHost() {
+ return host;
+ }
+
+ /**
+ * The port we were trying to connect to.
+ *
+ * @return the port
+ */
+ public int getPort() {
+ return port;
+ }
+
+ /**
+ * The timeout used for the connection attempt.
+ *
+ * @return the connection timeout
+ */
+ public int getConnectionTimeout() {
+ return cto;
+ }
+}
diff -r a6f66f6e9131 -r c9b75d67349b mail/src/main/java/com/sun/mail/util/SocketFetcher.java
--- a/mail/src/main/java/com/sun/mail/util/SocketFetcher.java Wed Mar 20 15:50:21 2013 -0700
+++ b/mail/src/main/java/com/sun/mail/util/SocketFetcher.java Mon Mar 25 15:30:03 2013 -0700
@@ -220,13 +220,8 @@
}
if (ex instanceof IOException)
throw (IOException)ex;
- IOException ioex = new IOException(
- "Couldn't connect using " + sfErr +
- " to host, port: " +
- host + ", " + sfPort +
- "; Exception: " + ex);
- ioex.initCause(ex);
- throw ioex;
+ throw new SocketConnectException("Using " + sfErr, ex,
+ host, sfPort, cto);
}
}
@@ -263,6 +258,7 @@
String socksHost = props.getProperty(prefix + ".socks.host", null);
int socksPort = 1080;
+ String err = null;
if (socksHost != null) {
int i = socksHost.indexOf(':');
if (i >= 0) {
@@ -275,6 +271,7 @@
}
socksPort = PropUtil.getIntProperty(props,
prefix + ".socks.port", socksPort);
+ err = "Using SOCKS host, port: " + socksHost + ", " + socksPort;
if (logger.isLoggable(Level.FINER))
logger.finer("socks host " + socksHost + ", port " + socksPort);
}
@@ -293,10 +290,14 @@
socket.setSoTimeout(to);
if (localaddr != null)
socket.bind(new InetSocketAddress(localaddr, localport));
- if (cto >= 0)
- socket.connect(new InetSocketAddress(host, port), cto);
- else
- socket.connect(new InetSocketAddress(host, port));
+ try {
+ if (cto >= 0)
+ socket.connect(new InetSocketAddress(host, port), cto);
+ else
+ socket.connect(new InetSocketAddress(host, port));
+ } catch (IOException ex) {
+ throw new SocketConnectException(err, ex, host, port, cto);
+ }
/*
* If we want an SSL connection and we didn't get an SSLSocket,
diff -r a6f66f6e9131 -r c9b75d67349b mail/src/test/java/com/sun/mail/imap/IMAPConnectFailureTest.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/src/test/java/com/sun/mail/imap/IMAPConnectFailureTest.java Mon Mar 25 15:30:03 2013 -0700
@@ -0,0 +1,103 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2009-2013 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
+ * and Distribution License("CDDL") (collectively, the "License"). You
+ * may not use this file except in compliance with the License. You can
+ * obtain a copy of the License at
+ *
https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt. See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license." If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above. However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+
+package com.sun.mail.imap;
+
+import java.io.*;
+import java.util.Properties;
+import java.net.ServerSocket;
+
+import javax.mail.Session;
+import javax.mail.Store;
+
+import com.sun.mail.util.MailConnectException;
+
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+/**
+ * Test connect failure.
+ */
+public final class IMAPConnectFailureTest {
+
+ private static final String HOST = "localhost";
+ private static final int PORT = 26422;
+ private static final int CTO = 20;
+
+ @Test
+ public void testNoServer() {
+ try {
+ // verify that port is not being used
+ ServerSocket ss = new ServerSocket(PORT);
+ ss.close();
+
+ Properties properties = new Properties();
+ properties.setProperty("mail.imap.host", HOST);
+ properties.setProperty("mail.imap.port", "" + PORT);
+ properties.setProperty("mail.imap.connectiontimeout", "" + CTO);
+ Session session = Session.getInstance(properties);
+ //session.setDebug(true);
+
+ Store store = session.getStore("imap");
+ try {
+ store.connect("test", "test");
+ fail("Connected!");
+ // failure!
+ } catch (MailConnectException mcex) {
+ // success!
+ assertEquals(HOST, mcex.getHost());
+ assertEquals(PORT, mcex.getPort());
+ assertEquals(CTO, mcex.getConnectionTimeout());
+ } catch (Exception ex) {
+ System.out.println(ex);
+ //ex.printStackTrace();
+ fail(ex.toString());
+ } finally {
+ if (store.isConnected())
+ store.close();
+ }
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ fail(e.getMessage());
+ }
+ }
+}
diff -r a6f66f6e9131 -r c9b75d67349b mail/src/test/java/com/sun/mail/smtp/SMTPConnectFailureTest.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/src/test/java/com/sun/mail/smtp/SMTPConnectFailureTest.java Mon Mar 25 15:30:03 2013 -0700
@@ -0,0 +1,101 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2009-2013 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
+ * and Distribution License("CDDL") (collectively, the "License"). You
+ * may not use this file except in compliance with the License. You can
+ * obtain a copy of the License at
+ *
https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt. See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license." If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above. However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+
+package com.sun.mail.smtp;
+
+import java.util.Properties;
+import java.net.ServerSocket;
+
+import javax.mail.Session;
+import javax.mail.Transport;
+
+import com.sun.mail.util.MailConnectException;
+
+import org.junit.Test;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+/**
+ * Test connect failures.
+ */
+public class SMTPConnectFailureTest {
+
+ private static final String HOST = "localhost";
+ private static final int PORT = 26423;
+ private static final int CTO = 20;
+
+ @Test
+ public void testNoServer() {
+ SMTPServer server = null;
+ try {
+ // verify that port is not being used
+ ServerSocket ss = new ServerSocket(PORT);
+ ss.close();
+ Properties properties = new Properties();
+ properties.setProperty("mail.smtp.host", HOST);
+ properties.setProperty("mail.smtp.port", "" + PORT);
+ properties.setProperty("mail.smtp.connectiontimeout", "" + CTO);
+ Session session = Session.getInstance(properties);
+ //session.setDebug(true);
+
+ Transport t = session.getTransport("smtp");
+ try {
+ t.connect("test", "test");
+ fail("Connected!");
+ // failure!
+ } catch (MailConnectException mcex) {
+ // success!
+ assertEquals(HOST, mcex.getHost());
+ assertEquals(PORT, mcex.getPort());
+ assertEquals(CTO, mcex.getConnectionTimeout());
+ } catch (Exception ex) {
+ // expect an exception when connect times out
+ fail(ex.toString());
+ } finally {
+ if (t.isConnected())
+ t.close();
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ fail(e.getMessage());
+ }
+ }
+}
diff -r c9b75d67349b -r 87ab4c9ca875 client/pom.xml
--- a/client/pom.xml Mon Mar 25 15:30:03 2013 -0700
+++ b/client/pom.xml Mon Mar 25 15:40:18 2013 -0700
@@ -48,7 +48,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.5.0-b02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r c9b75d67349b -r 87ab4c9ca875 demo/pom.xml
--- a/demo/pom.xml Mon Mar 25 15:30:03 2013 -0700
+++ b/demo/pom.xml Mon Mar 25 15:40:18 2013 -0700
@@ -48,7 +48,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.5.0-b02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r c9b75d67349b -r 87ab4c9ca875 dsn/pom.xml
--- a/dsn/pom.xml Mon Mar 25 15:30:03 2013 -0700
+++ b/dsn/pom.xml Mon Mar 25 15:40:18 2013 -0700
@@ -48,7 +48,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.5.0-b02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r c9b75d67349b -r 87ab4c9ca875 gimap/pom.xml
--- a/gimap/pom.xml Mon Mar 25 15:30:03 2013 -0700
+++ b/gimap/pom.xml Mon Mar 25 15:40:18 2013 -0700
@@ -48,7 +48,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.5.0-b02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r c9b75d67349b -r 87ab4c9ca875 imap/pom.xml
--- a/imap/pom.xml Mon Mar 25 15:30:03 2013 -0700
+++ b/imap/pom.xml Mon Mar 25 15:40:18 2013 -0700
@@ -48,7 +48,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>parent-distrib</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.5.0-b02</version>
<relativePath>../parent-distrib/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff -r c9b75d67349b -r 87ab4c9ca875 javadoc/pom.xml
--- a/javadoc/pom.xml Mon Mar 25 15:30:03 2013 -0700
+++ b/javadoc/pom.xml Mon Mar 25 15:40:18 2013 -0700
@@ -48,13 +48,13 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.5.0-b02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
<artifactId>javadoc</artifactId>
<packaging>pom</packaging>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.5.0-b02</version>
<name>JavaMail API javadocs</name>
<description>${project.name}</description>
@@ -101,6 +101,7 @@
com/sun/mail/smtp/SMTPSenderFailedException.java,
com/sun/mail/smtp/SMTPTransport.java,
com/sun/mail/smtp/SMTPSSLTransport.java,
+ com/sun/mail/util/MailConnectException.java,
com/sun/mail/util/MailSSLSocketFactory.java,
com/sun/mail/util/ReadableMime.java,
com/sun/mail/util/logging/MailHandler.java
diff -r c9b75d67349b -r 87ab4c9ca875 logging/pom.xml
--- a/logging/pom.xml Mon Mar 25 15:30:03 2013 -0700
+++ b/logging/pom.xml Mon Mar 25 15:40:18 2013 -0700
@@ -48,7 +48,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.5.0-b02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r c9b75d67349b -r 87ab4c9ca875 mail/pom.xml
--- a/mail/pom.xml Mon Mar 25 15:30:03 2013 -0700
+++ b/mail/pom.xml Mon Mar 25 15:40:18 2013 -0700
@@ -48,7 +48,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.5.0-b02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r c9b75d67349b -r 87ab4c9ca875 mailapi/pom.xml
--- a/mailapi/pom.xml Mon Mar 25 15:30:03 2013 -0700
+++ b/mailapi/pom.xml Mon Mar 25 15:40:18 2013 -0700
@@ -56,7 +56,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.5.0-b02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r c9b75d67349b -r 87ab4c9ca875 mailapijar/pom.xml
--- a/mailapijar/pom.xml Mon Mar 25 15:30:03 2013 -0700
+++ b/mailapijar/pom.xml Mon Mar 25 15:40:18 2013 -0700
@@ -55,7 +55,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.5.0-b02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>javax.mail</groupId>
diff -r c9b75d67349b -r 87ab4c9ca875 mbox/dist/pom.xml
--- a/mbox/dist/pom.xml Mon Mar 25 15:30:03 2013 -0700
+++ b/mbox/dist/pom.xml Mon Mar 25 15:40:18 2013 -0700
@@ -48,7 +48,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.5.0-b02</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff -r c9b75d67349b -r 87ab4c9ca875 mbox/native/pom.xml
--- a/mbox/native/pom.xml Mon Mar 25 15:30:03 2013 -0700
+++ b/mbox/native/pom.xml Mon Mar 25 15:40:18 2013 -0700
@@ -48,7 +48,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.5.0-b02</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff -r c9b75d67349b -r 87ab4c9ca875 mbox/pom.xml
--- a/mbox/pom.xml Mon Mar 25 15:30:03 2013 -0700
+++ b/mbox/pom.xml Mon Mar 25 15:40:18 2013 -0700
@@ -48,7 +48,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.5.0-b02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r c9b75d67349b -r 87ab4c9ca875 oldmail/pom.xml
--- a/oldmail/pom.xml Mon Mar 25 15:30:03 2013 -0700
+++ b/oldmail/pom.xml Mon Mar 25 15:40:18 2013 -0700
@@ -53,7 +53,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.5.0-b02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>javax.mail</groupId>
diff -r c9b75d67349b -r 87ab4c9ca875 outlook/pom.xml
--- a/outlook/pom.xml Mon Mar 25 15:30:03 2013 -0700
+++ b/outlook/pom.xml Mon Mar 25 15:40:18 2013 -0700
@@ -48,7 +48,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.5.0-b02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r c9b75d67349b -r 87ab4c9ca875 parent-distrib/pom.xml
--- a/parent-distrib/pom.xml Mon Mar 25 15:30:03 2013 -0700
+++ b/parent-distrib/pom.xml Mon Mar 25 15:40:18 2013 -0700
@@ -48,7 +48,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.5.0-b02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r c9b75d67349b -r 87ab4c9ca875 pom.xml
--- a/pom.xml Mon Mar 25 15:30:03 2013 -0700
+++ b/pom.xml Mon Mar 25 15:40:18 2013 -0700
@@ -54,7 +54,7 @@
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
<packaging>pom</packaging>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.5.0-b02</version>
<name>JavaMail API distribution</name>
<description>${project.name}</description>
<url>
http://kenai.com/projects/javamail</url>
@@ -91,10 +91,13 @@
</organization>
<properties>
- <mail.version>1.5.0-SNAPSHOT</mail.version>
+ <mail.version>1.5.0-b02</mail.version>
<!-- like mail.version, but with underscores instead of dots -->
- <mail.zipversion>1_5_0-SNAPSHOT</mail.zipversion>
+ <mail.zipversion>1_5_0-b02</mail.zipversion>
+ <!-- XXX - temporary until 1.5 is final
<mail.spec.version>1.5</mail.spec.version>
+ -->
+ <mail.spec.version>1.4.99.02</mail.spec.version>
<activation-api.version>1.1</activation-api.version>
<!-- defaults that are overridden in mail module -->
<mail.extensionName>
@@ -109,6 +112,9 @@
<mail.bundle.symbolicName>
${project.groupId}.${project.artifactId}
</mail.bundle.symbolicName>
+ <mail.bundle.symbolicName>
+ ${project.groupId}.${project.artifactId}
+ </mail.bundle.symbolicName>
<mail.packages.export>
javax.mail.*; version=${mail.spec.version}
</mail.packages.export>
@@ -350,6 +356,10 @@
<Bundle-SymbolicName>
${mail.bundle.symbolicName}
</Bundle-SymbolicName>
+ <!-- XXX - temporary until 1.5 is final -->
+ <Bundle-Version>
+ 1.4.99.b02
+ </Bundle-Version>
<Export-Package>
${mail.packages.export}
</Export-Package>
diff -r c9b75d67349b -r 87ab4c9ca875 pop3/pom.xml
--- a/pop3/pom.xml Mon Mar 25 15:30:03 2013 -0700
+++ b/pop3/pom.xml Mon Mar 25 15:40:18 2013 -0700
@@ -48,7 +48,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>parent-distrib</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.5.0-b02</version>
<relativePath>../parent-distrib/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff -r c9b75d67349b -r 87ab4c9ca875 servlet/pom.xml
--- a/servlet/pom.xml Mon Mar 25 15:30:03 2013 -0700
+++ b/servlet/pom.xml Mon Mar 25 15:40:18 2013 -0700
@@ -48,7 +48,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.5.0-b02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r c9b75d67349b -r 87ab4c9ca875 smtp/pom.xml
--- a/smtp/pom.xml Mon Mar 25 15:30:03 2013 -0700
+++ b/smtp/pom.xml Mon Mar 25 15:40:18 2013 -0700
@@ -48,7 +48,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>parent-distrib</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.5.0-b02</version>
<relativePath>../parent-distrib/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff -r c9b75d67349b -r 87ab4c9ca875 taglib/pom.xml
--- a/taglib/pom.xml Mon Mar 25 15:30:03 2013 -0700
+++ b/taglib/pom.xml Mon Mar 25 15:40:18 2013 -0700
@@ -48,7 +48,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.5.0-b02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r c9b75d67349b -r 87ab4c9ca875 webapp/pom.xml
--- a/webapp/pom.xml Mon Mar 25 15:30:03 2013 -0700
+++ b/webapp/pom.xml Mon Mar 25 15:40:18 2013 -0700
@@ -48,7 +48,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.5.0-b02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r 87ab4c9ca875 -r 0c420eb5033c mail/src/main/java/com/sun/mail/util/SocketConnectException.java
--- a/mail/src/main/java/com/sun/mail/util/SocketConnectException.java Mon Mar 25 15:40:18 2013 -0700
+++ b/mail/src/main/java/com/sun/mail/util/SocketConnectException.java Mon Mar 25 19:05:12 2013 -0700
@@ -71,7 +71,8 @@
*/
public SocketConnectException(String msg, Exception cause,
String host, int port, int cto) {
- super(msg, cause);
+ super(msg);
+ initCause(cause);
this.host = host;
this.port = port;
this.cto = cto;
diff -r 0c420eb5033c -r f975493690ab mail/src/main/java/com/sun/mail/util/MailConnectException.java
--- a/mail/src/main/java/com/sun/mail/util/MailConnectException.java Mon Mar 25 19:05:12 2013 -0700
+++ b/mail/src/main/java/com/sun/mail/util/MailConnectException.java Fri Mar 29 13:55:41 2013 -0700
@@ -58,7 +58,7 @@
private int port;
private int cto;
- //private static final long serialVersionUID = 4280468026581616424L;
+ private static final long serialVersionUID = -3818807731125317729L;
/**
* Constructs a MailConnectException.
diff -r 0c420eb5033c -r f975493690ab mail/src/main/java/com/sun/mail/util/SocketConnectException.java
--- a/mail/src/main/java/com/sun/mail/util/SocketConnectException.java Mon Mar 25 19:05:12 2013 -0700
+++ b/mail/src/main/java/com/sun/mail/util/SocketConnectException.java Fri Mar 29 13:55:41 2013 -0700
@@ -56,9 +56,8 @@
private String host;
private int port;
private int cto;
- private Exception ex;
- //private static final long serialVersionUID = 4280468026581616424L;
+ private static final long serialVersionUID = 3997871560538755463L;
/**
* Constructs a SocketConnectException.
@@ -76,7 +75,6 @@
this.host = host;
this.port = port;
this.cto = cto;
- this.ex = cause;
}
/**
@@ -85,7 +83,9 @@
* @return the exception
*/
public Exception getException() {
- return ex;
+ // the "cause" is always an Exception; see constructor above
+ assert getCause() instanceof Exception;
+ return (Exception)getCause();
}
/**
diff -r f975493690ab -r 700ae6fd4a6c client/pom.xml
--- a/client/pom.xml Fri Mar 29 13:55:41 2013 -0700
+++ b/client/pom.xml Fri Mar 29 14:04:23 2013 -0700
@@ -48,7 +48,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.5.0-b02</version>
+ <version>1.5.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r f975493690ab -r 700ae6fd4a6c demo/pom.xml
--- a/demo/pom.xml Fri Mar 29 13:55:41 2013 -0700
+++ b/demo/pom.xml Fri Mar 29 14:04:23 2013 -0700
@@ -48,7 +48,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.5.0-b02</version>
+ <version>1.5.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r f975493690ab -r 700ae6fd4a6c dsn/pom.xml
--- a/dsn/pom.xml Fri Mar 29 13:55:41 2013 -0700
+++ b/dsn/pom.xml Fri Mar 29 14:04:23 2013 -0700
@@ -48,7 +48,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.5.0-b02</version>
+ <version>1.5.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r f975493690ab -r 700ae6fd4a6c gimap/pom.xml
--- a/gimap/pom.xml Fri Mar 29 13:55:41 2013 -0700
+++ b/gimap/pom.xml Fri Mar 29 14:04:23 2013 -0700
@@ -48,7 +48,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.5.0-b02</version>
+ <version>1.5.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r f975493690ab -r 700ae6fd4a6c imap/pom.xml
--- a/imap/pom.xml Fri Mar 29 13:55:41 2013 -0700
+++ b/imap/pom.xml Fri Mar 29 14:04:23 2013 -0700
@@ -48,7 +48,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>parent-distrib</artifactId>
- <version>1.5.0-b02</version>
+ <version>1.5.0-SNAPSHOT</version>
<relativePath>../parent-distrib/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff -r f975493690ab -r 700ae6fd4a6c javadoc/pom.xml
--- a/javadoc/pom.xml Fri Mar 29 13:55:41 2013 -0700
+++ b/javadoc/pom.xml Fri Mar 29 14:04:23 2013 -0700
@@ -48,13 +48,13 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.5.0-b02</version>
+ <version>1.5.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
<artifactId>javadoc</artifactId>
<packaging>pom</packaging>
- <version>1.5.0-b02</version>
+ <version>1.5.0-SNAPSHOT</version>
<name>JavaMail API javadocs</name>
<description>${project.name}</description>
diff -r f975493690ab -r 700ae6fd4a6c logging/pom.xml
--- a/logging/pom.xml Fri Mar 29 13:55:41 2013 -0700
+++ b/logging/pom.xml Fri Mar 29 14:04:23 2013 -0700
@@ -48,7 +48,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.5.0-b02</version>
+ <version>1.5.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r f975493690ab -r 700ae6fd4a6c mail/pom.xml
--- a/mail/pom.xml Fri Mar 29 13:55:41 2013 -0700
+++ b/mail/pom.xml Fri Mar 29 14:04:23 2013 -0700
@@ -48,7 +48,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.5.0-b02</version>
+ <version>1.5.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r f975493690ab -r 700ae6fd4a6c mailapi/pom.xml
--- a/mailapi/pom.xml Fri Mar 29 13:55:41 2013 -0700
+++ b/mailapi/pom.xml Fri Mar 29 14:04:23 2013 -0700
@@ -56,7 +56,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.5.0-b02</version>
+ <version>1.5.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r f975493690ab -r 700ae6fd4a6c mailapijar/pom.xml
--- a/mailapijar/pom.xml Fri Mar 29 13:55:41 2013 -0700
+++ b/mailapijar/pom.xml Fri Mar 29 14:04:23 2013 -0700
@@ -55,7 +55,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.5.0-b02</version>
+ <version>1.5.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>javax.mail</groupId>
diff -r f975493690ab -r 700ae6fd4a6c mbox/dist/pom.xml
--- a/mbox/dist/pom.xml Fri Mar 29 13:55:41 2013 -0700
+++ b/mbox/dist/pom.xml Fri Mar 29 14:04:23 2013 -0700
@@ -48,7 +48,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.5.0-b02</version>
+ <version>1.5.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff -r f975493690ab -r 700ae6fd4a6c mbox/native/pom.xml
--- a/mbox/native/pom.xml Fri Mar 29 13:55:41 2013 -0700
+++ b/mbox/native/pom.xml Fri Mar 29 14:04:23 2013 -0700
@@ -48,7 +48,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.5.0-b02</version>
+ <version>1.5.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff -r f975493690ab -r 700ae6fd4a6c mbox/pom.xml
--- a/mbox/pom.xml Fri Mar 29 13:55:41 2013 -0700
+++ b/mbox/pom.xml Fri Mar 29 14:04:23 2013 -0700
@@ -48,7 +48,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.5.0-b02</version>
+ <version>1.5.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r f975493690ab -r 700ae6fd4a6c oldmail/pom.xml
--- a/oldmail/pom.xml Fri Mar 29 13:55:41 2013 -0700
+++ b/oldmail/pom.xml Fri Mar 29 14:04:23 2013 -0700
@@ -53,7 +53,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.5.0-b02</version>
+ <version>1.5.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>javax.mail</groupId>
diff -r f975493690ab -r 700ae6fd4a6c outlook/pom.xml
--- a/outlook/pom.xml Fri Mar 29 13:55:41 2013 -0700
+++ b/outlook/pom.xml Fri Mar 29 14:04:23 2013 -0700
@@ -48,7 +48,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.5.0-b02</version>
+ <version>1.5.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r f975493690ab -r 700ae6fd4a6c parent-distrib/pom.xml
--- a/parent-distrib/pom.xml Fri Mar 29 13:55:41 2013 -0700
+++ b/parent-distrib/pom.xml Fri Mar 29 14:04:23 2013 -0700
@@ -48,7 +48,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.5.0-b02</version>
+ <version>1.5.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r f975493690ab -r 700ae6fd4a6c pom.xml
--- a/pom.xml Fri Mar 29 13:55:41 2013 -0700
+++ b/pom.xml Fri Mar 29 14:04:23 2013 -0700
@@ -54,7 +54,7 @@
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
<packaging>pom</packaging>
- <version>1.5.0-b02</version>
+ <version>1.5.0-SNAPSHOT</version>
<name>JavaMail API distribution</name>
<description>${project.name}</description>
<url>
http://kenai.com/projects/javamail</url>
@@ -91,9 +91,9 @@
</organization>
<properties>
- <mail.version>1.5.0-b02</mail.version>
+ <mail.version>1.5.0-SNAPSHOT</mail.version>
<!-- like mail.version, but with underscores instead of dots -->
- <mail.zipversion>1_5_0-b02</mail.zipversion>
+ <mail.zipversion>1_5_0-SNAPSHOT</mail.zipversion>
<!-- XXX - temporary until 1.5 is final
<mail.spec.version>1.5</mail.spec.version>
-->
diff -r f975493690ab -r 700ae6fd4a6c pop3/pom.xml
--- a/pop3/pom.xml Fri Mar 29 13:55:41 2013 -0700
+++ b/pop3/pom.xml Fri Mar 29 14:04:23 2013 -0700
@@ -48,7 +48,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>parent-distrib</artifactId>
- <version>1.5.0-b02</version>
+ <version>1.5.0-SNAPSHOT</version>
<relativePath>../parent-distrib/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff -r f975493690ab -r 700ae6fd4a6c servlet/pom.xml
--- a/servlet/pom.xml Fri Mar 29 13:55:41 2013 -0700
+++ b/servlet/pom.xml Fri Mar 29 14:04:23 2013 -0700
@@ -48,7 +48,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.5.0-b02</version>
+ <version>1.5.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r f975493690ab -r 700ae6fd4a6c smtp/pom.xml
--- a/smtp/pom.xml Fri Mar 29 13:55:41 2013 -0700
+++ b/smtp/pom.xml Fri Mar 29 14:04:23 2013 -0700
@@ -48,7 +48,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>parent-distrib</artifactId>
- <version>1.5.0-b02</version>
+ <version>1.5.0-SNAPSHOT</version>
<relativePath>../parent-distrib/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff -r f975493690ab -r 700ae6fd4a6c taglib/pom.xml
--- a/taglib/pom.xml Fri Mar 29 13:55:41 2013 -0700
+++ b/taglib/pom.xml Fri Mar 29 14:04:23 2013 -0700
@@ -48,7 +48,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.5.0-b02</version>
+ <version>1.5.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r f975493690ab -r 700ae6fd4a6c webapp/pom.xml
--- a/webapp/pom.xml Fri Mar 29 13:55:41 2013 -0700
+++ b/webapp/pom.xml Fri Mar 29 14:04:23 2013 -0700
@@ -48,7 +48,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.5.0-b02</version>
+ <version>1.5.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>