Project: javamail
Repository: mercurial
Revision: 841
Author: shannon
Date: 2016-08-09 00:20:12 UTC
Link:
Log Message:
------------
add -W option to warn instead of fail when a message can't be copied
Final release of JavaMail 1.5.6.
Added tag JAVAMAIL-1_5_6 for changeset ddcb8608cc65
Revisions:
----------
839
840
841
Modified Paths:
---------------
demo/src/main/java/populate.java
android/activation/pom.xml
android/mail/pom.xml
android/pom.xml
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 65d3c6a9047a -r 47427b6d4372 demo/src/main/java/populate.java
--- a/demo/src/main/java/populate.java Fri Jul 15 15:09:47 2016 -0700
+++ b/demo/src/main/java/populate.java Mon Aug 08 17:06:11 2016 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997-2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -47,6 +47,7 @@
static boolean skipSpecial = false;
static boolean clear = false;
static boolean dontPreserveFlags = false;
+ static boolean warn = false;
public static void main(String argv[]) {
String srcURL = null;
@@ -70,6 +71,8 @@
clear = true;
} else if (argv[optind].equals("-P")) {
dontPreserveFlags = true;
+ } else if (argv[optind].equals("-W")) {
+ warn = true;
} else if (argv[optind].equals("--")) {
optind++;
break;
@@ -222,7 +225,20 @@
msgs[i] = m;
}
}
- src.copyMessages(msgs, dst);
+ if (warn) {
+ // have to copy messages one at a time
+ for (int i = 0; i < msgs.length; i++) {
+ try {
+ src.copyMessages(new Message[] { msgs[i] }, dst);
+ } catch (MessagingException mex) {
+ System.out.println("WARNING: Copy of message " + (i + 1) +
+ " from " + src.getFullName() +
+ " to " + dst.getFullName() +
+ " failed: " + mex.toString());
+ }
+ }
+ } else
+ src.copyMessages(msgs, dst);
}
private static void printUsage() {
diff -r 47427b6d4372 -r ddcb8608cc65 android/activation/pom.xml
--- a/android/activation/pom.xml Mon Aug 08 17:06:11 2016 -0700
+++ b/android/activation/pom.xml Mon Aug 08 17:19:54 2016 -0700
@@ -48,7 +48,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>android</artifactId>
- <version>1.5.6-SNAPSHOT</version>
+ <version>1.5.6</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r 47427b6d4372 -r ddcb8608cc65 android/mail/pom.xml
--- a/android/mail/pom.xml Mon Aug 08 17:06:11 2016 -0700
+++ b/android/mail/pom.xml Mon Aug 08 17:19:54 2016 -0700
@@ -52,7 +52,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>android</artifactId>
- <version>1.5.6-SNAPSHOT</version>
+ <version>1.5.6</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r 47427b6d4372 -r ddcb8608cc65 android/pom.xml
--- a/android/pom.xml Mon Aug 08 17:06:11 2016 -0700
+++ b/android/pom.xml Mon Aug 08 17:19:54 2016 -0700
@@ -48,7 +48,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.5.6-SNAPSHOT</version>
+ <version>1.5.6</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r 47427b6d4372 -r ddcb8608cc65 client/pom.xml
--- a/client/pom.xml Mon Aug 08 17:06:11 2016 -0700
+++ b/client/pom.xml Mon Aug 08 17:19:54 2016 -0700
@@ -48,7 +48,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.5.6-SNAPSHOT</version>
+ <version>1.5.6</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r 47427b6d4372 -r ddcb8608cc65 demo/pom.xml
--- a/demo/pom.xml Mon Aug 08 17:06:11 2016 -0700
+++ b/demo/pom.xml Mon Aug 08 17:19:54 2016 -0700
@@ -48,7 +48,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.5.6-SNAPSHOT</version>
+ <version>1.5.6</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r 47427b6d4372 -r ddcb8608cc65 dsn/pom.xml
--- a/dsn/pom.xml Mon Aug 08 17:06:11 2016 -0700
+++ b/dsn/pom.xml Mon Aug 08 17:19:54 2016 -0700
@@ -48,7 +48,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.5.6-SNAPSHOT</version>
+ <version>1.5.6</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r 47427b6d4372 -r ddcb8608cc65 gimap/pom.xml
--- a/gimap/pom.xml Mon Aug 08 17:06:11 2016 -0700
+++ b/gimap/pom.xml Mon Aug 08 17:19:54 2016 -0700
@@ -48,7 +48,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.5.6-SNAPSHOT</version>
+ <version>1.5.6</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r 47427b6d4372 -r ddcb8608cc65 imap/pom.xml
--- a/imap/pom.xml Mon Aug 08 17:06:11 2016 -0700
+++ b/imap/pom.xml Mon Aug 08 17:19:54 2016 -0700
@@ -48,7 +48,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>parent-distrib</artifactId>
- <version>1.5.6-SNAPSHOT</version>
+ <version>1.5.6</version>
<relativePath>../parent-distrib/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff -r 47427b6d4372 -r ddcb8608cc65 javadoc/pom.xml
--- a/javadoc/pom.xml Mon Aug 08 17:06:11 2016 -0700
+++ b/javadoc/pom.xml Mon Aug 08 17:19:54 2016 -0700
@@ -48,13 +48,13 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.5.6-SNAPSHOT</version>
+ <version>1.5.6</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
<artifactId>javadoc</artifactId>
<packaging>pom</packaging>
- <version>1.5.6-SNAPSHOT</version>
+ <version>1.5.6</version>
<name>JavaMail API javadocs</name>
<description>${project.name}</description>
diff -r 47427b6d4372 -r ddcb8608cc65 logging/pom.xml
--- a/logging/pom.xml Mon Aug 08 17:06:11 2016 -0700
+++ b/logging/pom.xml Mon Aug 08 17:19:54 2016 -0700
@@ -48,7 +48,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.5.6-SNAPSHOT</version>
+ <version>1.5.6</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r 47427b6d4372 -r ddcb8608cc65 mail/pom.xml
--- a/mail/pom.xml Mon Aug 08 17:06:11 2016 -0700
+++ b/mail/pom.xml Mon Aug 08 17:19:54 2016 -0700
@@ -48,7 +48,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.5.6-SNAPSHOT</version>
+ <version>1.5.6</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r 47427b6d4372 -r ddcb8608cc65 mailapi/pom.xml
--- a/mailapi/pom.xml Mon Aug 08 17:06:11 2016 -0700
+++ b/mailapi/pom.xml Mon Aug 08 17:19:54 2016 -0700
@@ -56,7 +56,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.5.6-SNAPSHOT</version>
+ <version>1.5.6</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r 47427b6d4372 -r ddcb8608cc65 mailapijar/pom.xml
--- a/mailapijar/pom.xml Mon Aug 08 17:06:11 2016 -0700
+++ b/mailapijar/pom.xml Mon Aug 08 17:19:54 2016 -0700
@@ -55,7 +55,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.5.6-SNAPSHOT</version>
+ <version>1.5.6</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>javax.mail</groupId>
diff -r 47427b6d4372 -r ddcb8608cc65 mailhandler/pom.xml
--- a/mailhandler/pom.xml Mon Aug 08 17:06:11 2016 -0700
+++ b/mailhandler/pom.xml Mon Aug 08 17:19:54 2016 -0700
@@ -48,7 +48,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>parent-distrib</artifactId>
- <version>1.5.6-SNAPSHOT</version>
+ <version>1.5.6</version>
<relativePath>../parent-distrib/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff -r 47427b6d4372 -r ddcb8608cc65 mbox/native/pom.xml
--- a/mbox/native/pom.xml Mon Aug 08 17:06:11 2016 -0700
+++ b/mbox/native/pom.xml Mon Aug 08 17:19:54 2016 -0700
@@ -48,7 +48,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.5.6-SNAPSHOT</version>
+ <version>1.5.6</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff -r 47427b6d4372 -r ddcb8608cc65 mbox/pom.xml
--- a/mbox/pom.xml Mon Aug 08 17:06:11 2016 -0700
+++ b/mbox/pom.xml Mon Aug 08 17:19:54 2016 -0700
@@ -48,7 +48,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.5.6-SNAPSHOT</version>
+ <version>1.5.6</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r 47427b6d4372 -r ddcb8608cc65 oldmail/pom.xml
--- a/oldmail/pom.xml Mon Aug 08 17:06:11 2016 -0700
+++ b/oldmail/pom.xml Mon Aug 08 17:19:54 2016 -0700
@@ -53,7 +53,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.5.6-SNAPSHOT</version>
+ <version>1.5.6</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>javax.mail</groupId>
diff -r 47427b6d4372 -r ddcb8608cc65 outlook/pom.xml
--- a/outlook/pom.xml Mon Aug 08 17:06:11 2016 -0700
+++ b/outlook/pom.xml Mon Aug 08 17:19:54 2016 -0700
@@ -48,7 +48,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.5.6-SNAPSHOT</version>
+ <version>1.5.6</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r 47427b6d4372 -r ddcb8608cc65 parent-distrib/pom.xml
--- a/parent-distrib/pom.xml Mon Aug 08 17:06:11 2016 -0700
+++ b/parent-distrib/pom.xml Mon Aug 08 17:19:54 2016 -0700
@@ -48,7 +48,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.5.6-SNAPSHOT</version>
+ <version>1.5.6</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r 47427b6d4372 -r ddcb8608cc65 pom.xml
--- a/pom.xml Mon Aug 08 17:06:11 2016 -0700
+++ b/pom.xml Mon Aug 08 17:19:54 2016 -0700
@@ -54,7 +54,7 @@
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
<packaging>pom</packaging>
- <version>1.5.6-SNAPSHOT</version>
+ <version>1.5.6</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.6-SNAPSHOT</mail.version>
+ <mail.version>1.5.6</mail.version>
<!-- like mail.version, but with underscores instead of dots -->
- <mail.zipversion>1_5_6-SNAPSHOT</mail.zipversion>
+ <mail.zipversion>1_5_6</mail.zipversion>
<mail.spec.version>1.5</mail.spec.version>
<!-- defaults that are overridden in mail module -->
<mail.extensionName>
diff -r 47427b6d4372 -r ddcb8608cc65 pop3/pom.xml
--- a/pop3/pom.xml Mon Aug 08 17:06:11 2016 -0700
+++ b/pop3/pom.xml Mon Aug 08 17:19:54 2016 -0700
@@ -48,7 +48,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>parent-distrib</artifactId>
- <version>1.5.6-SNAPSHOT</version>
+ <version>1.5.6</version>
<relativePath>../parent-distrib/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff -r 47427b6d4372 -r ddcb8608cc65 publish/pom.xml
--- a/publish/pom.xml Mon Aug 08 17:06:11 2016 -0700
+++ b/publish/pom.xml Mon Aug 08 17:19:54 2016 -0700
@@ -48,13 +48,13 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.5.6-SNAPSHOT</version>
+ <version>1.5.6</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
<artifactId>publish</artifactId>
<packaging>pom</packaging>
- <version>1.5.6-SNAPSHOT</version>
+ <version>1.5.6</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.6-SNAPSHOT</version>
+ <version>1.5.6</version>
</dependency>
<!--
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>demo</artifactId>
- <version>1.5.6-SNAPSHOT</version>
+ <version>1.5.6</version>
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>client</artifactId>
- <version>1.5.6-SNAPSHOT</version>
+ <version>1.5.6</version>
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>servlet</artifactId>
- <version>1.5.6-SNAPSHOT</version>
+ <version>1.5.6</version>
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>webapp</artifactId>
<type>war</type>
- <version>1.5.6-SNAPSHOT</version>
+ <version>1.5.6</version>
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>taglib</artifactId>
- <version>1.5.6-SNAPSHOT</version>
+ <version>1.5.6</version>
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>logging</artifactId>
- <version>1.5.6-SNAPSHOT</version>
+ <version>1.5.6</version>
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>outlook</artifactId>
- <version>1.5.6-SNAPSHOT</version>
+ <version>1.5.6</version>
</dependency>
-->
</dependencies>
diff -r 47427b6d4372 -r ddcb8608cc65 servlet/pom.xml
--- a/servlet/pom.xml Mon Aug 08 17:06:11 2016 -0700
+++ b/servlet/pom.xml Mon Aug 08 17:19:54 2016 -0700
@@ -48,7 +48,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.5.6-SNAPSHOT</version>
+ <version>1.5.6</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r 47427b6d4372 -r ddcb8608cc65 smtp/pom.xml
--- a/smtp/pom.xml Mon Aug 08 17:06:11 2016 -0700
+++ b/smtp/pom.xml Mon Aug 08 17:19:54 2016 -0700
@@ -48,7 +48,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>parent-distrib</artifactId>
- <version>1.5.6-SNAPSHOT</version>
+ <version>1.5.6</version>
<relativePath>../parent-distrib/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff -r 47427b6d4372 -r ddcb8608cc65 taglib/pom.xml
--- a/taglib/pom.xml Mon Aug 08 17:06:11 2016 -0700
+++ b/taglib/pom.xml Mon Aug 08 17:19:54 2016 -0700
@@ -48,7 +48,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.5.6-SNAPSHOT</version>
+ <version>1.5.6</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r 47427b6d4372 -r ddcb8608cc65 webapp/pom.xml
--- a/webapp/pom.xml Mon Aug 08 17:06:11 2016 -0700
+++ b/webapp/pom.xml Mon Aug 08 17:19:54 2016 -0700
@@ -48,7 +48,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.5.6-SNAPSHOT</version>
+ <version>1.5.6</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r ddcb8608cc65 -r 8129aa1dd1c4 .hgtags
--- a/.hgtags Mon Aug 08 17:19:54 2016 -0700
+++ b/.hgtags Mon Aug 08 17:20:12 2016 -0700
@@ -20,3 +20,4 @@
a63663b1bb07ae812f9cf13b03fbcf3e8e129521 JAVAMAIL-1_5_3
15b5ba9b58712d064178b2530a2b7f89e1d2ebc1 JAVAMAIL-1_5_4
6f854b7031906581f1c91bf70a13734cbec18e0a JAVAMAIL-1_5_5
+ddcb8608cc654e273da1cd11969a41d60c7c07db JAVAMAIL-1_5_6