.hgtags

@@ -26,3 +26,7 @@ d90b0230ffde36e71d06cc8efc35c1bc662d3731 JAVAMAIL-1_6_0-RC1
 e4cb3b3d3aeefd1afab7e965317604bcd6644700 JAVAMAIL-1_6_0
 dfb709919353eec53e9dca61b379163186f4d154 1.4.2-beta
 0000000000000000000000000000000000000000 1.4.2-beta
+48f8142d2dc471a93866f1da6c13436371d9024c JAVAMAIL-1_6_1
+d8410291f8ed108e94ce0664e1f1a01d9a52e14a JAVAMAIL_1_6_2
+d8410291f8ed108e94ce0664e1f1a01d9a52e14a JAVAMAIL_1_6_2
+0000000000000000000000000000000000000000 JAVAMAIL_1_6_2

android/activation/pom.xml

@@ -48,7 +48,7 @@
     <parent>
 	<groupId>com.sun.mail</groupId>
 	<artifactId>android</artifactId>
-	<version>1.6.1</version>
+	<version>1.6.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.sun.mail</groupId>

android/mail/pom.xml

@@ -52,7 +52,7 @@
     <parent>
 	<groupId>com.sun.mail</groupId>
 	<artifactId>android</artifactId>
-	<version>1.6.1</version>
+	<version>1.6.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.sun.mail</groupId>

android/pom.xml

@@ -48,7 +48,7 @@
     <parent>
 	<groupId>com.sun.mail</groupId>
 	<artifactId>all</artifactId>
-	<version>1.6.1</version>
+	<version>1.6.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.sun.mail</groupId>

client/pom.xml

@@ -48,7 +48,7 @@
     <parent>
 	<groupId>com.sun.mail</groupId>
 	<artifactId>all</artifactId>
-	<version>1.6.1</version>
+	<version>1.6.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.sun.mail</groupId>

debian/changelog

+javamail (1.6.2-1) unstable; urgency=medium
+
+  * New upstream release
+    - Refreshed the patches
+  * Standards-Version updated to 4.2.1
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Thu, 20 Sep 2018 17:47:04 +0200
+
 javamail (1.6.1-3) unstable; urgency=medium
 
   * Team upload.

debian/control

@@ -17,7 +17,7 @@ Build-Depends:
  libmaven-javadoc-plugin-java,
  libmaven-source-plugin-java (>= 2.1),
  maven-debian-helper (>= 1.6.7)
-Standards-Version: 4.1.4
+Standards-Version: 4.2.1
 Vcs-Git: https://salsa.debian.org/java-team/javamail.git
 Vcs-Browser: https://salsa.debian.org/java-team/javamail
 Homepage: http://javamail.java.net

debian/patches/08-remove-module-info.patch

@@ -6,7 +6,7 @@ Author: Emmanuel Bourg <ebourg@apache.org>
 Forwarded: not-needed
 --- a/imap/src/main/java/module-info.java
 +++ /dev/null
-@@ -1,49 +0,0 @@
+@@ -1,51 +0,0 @@
 -/*
 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 - *
@@ -51,6 +51,8 @@ Forwarded: not-needed
 -    exports com.sun.mail.iap;
 -    exports com.sun.mail.imap;
 -    exports com.sun.mail.imap.protocol;
+-    provides javax.mail.Provider with
+-	com.sun.mail.imap.IMAPProvider, com.sun.mail.imap.IMAPSSLProvider;
 -
 -    requires java.mail;
 -    requires java.logging;
@@ -58,7 +60,7 @@ Forwarded: not-needed
 -}
 --- a/mailapi/src/main/java/module-info.java
 +++ /dev/null
-@@ -1,56 +0,0 @@
+@@ -1,57 +0,0 @@
 -/*
 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 - *
@@ -114,6 +116,7 @@ Forwarded: not-needed
 -    requires java.xml;		// for text/xml handler
 -    requires java.desktop;	// for image/jpeg handler
 -    requires java.security.sasl; // for OAuth2 support
+-    uses javax.mail.Provider;
 -}
 --- a/mailhandler/src/main/java/module-info.java
 +++ /dev/null
@@ -166,7 +169,7 @@ Forwarded: not-needed
 -}
 --- a/pop3/src/main/java/module-info.java
 +++ /dev/null
-@@ -1,47 +0,0 @@
+@@ -1,49 +0,0 @@
 -/*
 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 - *
@@ -209,6 +212,8 @@ Forwarded: not-needed
 -
 -module com.sun.mail.pop3 {
 -    exports com.sun.mail.pop3;
+-    provides javax.mail.Provider with
+-	com.sun.mail.pop3.POP3Provider, com.sun.mail.pop3.POP3SSLProvider;
 -
 -    requires java.mail;
 -    requires java.logging;
@@ -216,7 +221,7 @@ Forwarded: not-needed
 -}
 --- a/smtp/src/main/java/module-info.java
 +++ /dev/null
-@@ -1,47 +0,0 @@
+@@ -1,49 +0,0 @@
 -/*
 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 - *
@@ -259,8 +264,64 @@ Forwarded: not-needed
 -
 -module com.sun.mail.smtp {
 -    exports com.sun.mail.smtp;
+-    provides javax.mail.Provider with
+-	com.sun.mail.smtp.SMTPProvider, com.sun.mail.smtp.SMTPSSLProvider;
+-
+-    requires java.mail;
+-    requires java.logging;
+-    requires java.security.sasl;
+-}
+--- a/gimap/src/main/java/module-info.java
++++ /dev/null
+@@ -1,51 +0,0 @@
+-/*
+- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+- *
+- * Copyright (c) 2018 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://oss.oracle.com/licenses/CDDL+GPL-1.1
+- * or 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 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.
+- */
+-
+-module com.sun.mail.gimap {
+-    exports com.sun.mail.gimap;
+-    exports com.sun.mail.gimap.protocol;
+-    provides javax.mail.Provider with
+-	com.sun.mail.gimap.GmailProvider, com.sun.mail.gimap.GmailSSLProvider;
 -
 -    requires java.mail;
 -    requires java.logging;
 -    requires java.security.sasl;
+-    requires com.sun.mail.imap;
 -}

demo/pom.xml

@@ -48,7 +48,7 @@
     <parent>
 	<groupId>com.sun.mail</groupId>
 	<artifactId>all</artifactId>
-	<version>1.6.1</version>
+	<version>1.6.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.sun.mail</groupId>

demo/src/main/java/NewlineOutputStream.java

 /*
- * Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997-2018 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
@@ -46,7 +46,7 @@ public class NewlineOutputStream extends FilterOutputStream {
     public NewlineOutputStream(OutputStream os) {
 	super(os);
 	if (newline == null) {
-	    String s = System.getProperty("line.separator");
+	    String s = System.lineSeparator();
 	    if (s == null || s.length() <= 0)
 		s = "\n";
 	    try {

doc/release/CHANGES.txt

@@ -15,6 +15,28 @@ Seven digit bug numbers are from the old Sun bug database, which is no
 longer available.
 
 
+		  CHANGES IN THE 1.6.2 RELEASE
+		  ----------------------------
+The following bugs have been fixed in the 1.6.2 release.
+
+GH  306	Infinite loop parsing invalid ID response
+GH  307	StringIndexOutOfBoundsException when *.proxy.host contains a colon
+GH  309	Multipart Content-Transfer-Encoding trailing space
+GH  310	Android app fails to build with JavaMail 1.6.1
+GH  314	InternetAddress fails to detect illegal square brackets in local part
+GH  315	empty Content-Transfer-Encoding header causes IOException
+GH  316	starttls.enable documentation should reference starttls.required prop
+GH  317	use System.lineSeparator() instead of System.getProperty(...)
+GH  321	URLName.getURL() returns incorrect url.
+GH  322	Dots in local part of emails not handled properly
+GH  323	Support loading protocol providers using ServiceLoader
+GH  326	Apply relaxed Content-Disposition parsing to Content-Disposition params
+GH  330	Attachment filename is ignored
+GH  332	http proxy support should support authenticating to the proxy server
+GH  333	search with Unicode char throws BadCommandException with UTF8=ALLOW
+GH  334	gimap set labels error with some non english characters
+
+
 		  CHANGES IN THE 1.6.1 RELEASE
 		  ----------------------------
 The following bugs have been fixed in the 1.6.1 release.

doc/release/README.txt

@@ -55,7 +55,7 @@ Download
 
 See the JavaMail project page to download this release.
 
-	https://javamail.java.net
+	https://javaee.github.io/javamail/
 
 
 Requirements
@@ -77,7 +77,7 @@ Installation
   ----------
 
   1. Download the javax.mail.jar file from the JavaMail project website.
-     http://java.net/projects/javamail/downloads/download/javax.mail.jar
+     https://github.com/javaee/javamail/releases
 
   2. Set your CLASSPATH to include the "javax.mail.jar" file obtained from
      the download, as well as the current directory.
@@ -94,7 +94,7 @@ Installation
       export CLASSPATH=$CLASSPATH:/u/me/download/activation/activation.jar
 
   3. Download the javamail-samples.zip file from the project website.
-     http://java.net/projects/javamail/downloads/download/javamail-samples.zip
+     https://github.com/javaee/javamail/releases
 
   4. Compile any sample program using your Java compiler. For example:
 
@@ -120,7 +120,7 @@ Installation
   -------
 
   1. Download the javax.mail.jar file from the JavaMail project website.
-     http://java.net/projects/javamail/downloads/download/javax.mail.jar
+     https://github.com/javaee/javamail/releases
 
   2. Set your CLASSPATH to include the "javax.mail.jar" file obtained from
      the download, as well as the current directory.
@@ -137,7 +137,7 @@ Installation
       set CLASSPATH=%CLASSPATH%;c:\download\activation\activation.jar
 
   3. Download the javamail-samples.zip file from the project website.
-     http://java.net/projects/javamail/downloads/download/javamail-samples.zip
+     https://github.com/javaee/javamail/releases
 
   4. Compile any sample program using your Java compiler. For example:
 

dsn/pom.xml

@@ -48,7 +48,7 @@
     <parent>
 	<groupId>com.sun.mail</groupId>
 	<artifactId>all</artifactId>
-	<version>1.6.1</version>
+	<version>1.6.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.sun.mail</groupId>

gimap/pom.xml

@@ -48,7 +48,7 @@
     <parent>
 	<groupId>com.sun.mail</groupId>
 	<artifactId>all</artifactId>
-	<version>1.6.1</version>
+	<version>1.6.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.sun.mail</groupId>

gimap/src/main/java/com/sun/mail/gimap/GmailProvider.java

+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 1997-2018 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://oss.oracle.com/licenses/CDDL+GPL-1.1
+ * or 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 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.gimap;
+
+import javax.mail.Provider;
+
+/**
+ * The Gmail IMAP protocol provider.
+ */
+public class GmailProvider extends Provider {
+    public GmailProvider() {
+	super(Provider.Type.STORE, "gimap", GmailStore.class.getName(),
+	    "Oracle", null);
+    }
+}

gimap/src/main/java/com/sun/mail/gimap/GmailSSLProvider.java

+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 1997-2018 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://oss.oracle.com/licenses/CDDL+GPL-1.1
+ * or 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 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.gimap;
+
+import javax.mail.Provider;
+
+/**
+ * The Gmail IMAP protocol provider.
+ */
+public class GmailSSLProvider extends Provider {
+    public GmailSSLProvider() {
+	super(Provider.Type.STORE, "gimaps", GmailSSLStore.class.getName(),
+	    "Oracle", null);
+    }
+}

gimap/src/main/java/com/sun/mail/gimap/protocol/GmailProtocol.java

 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997-2018 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
@@ -42,6 +42,7 @@ package com.sun.mail.gimap.protocol;
 
 import java.io.*;
 import java.util.*;
+import java.nio.charset.StandardCharsets;
 
 import com.sun.mail.iap.*;
 import com.sun.mail.imap.protocol.*;
@@ -192,11 +193,12 @@ public class GmailProtocol extends IMAPProtocol {
 	handleResult(r[r.length-1]);
     }
 
+    // XXX - assume Gmail always supports UTF-8
     private Argument createLabelList(String[] labels) {
 	Argument args = new Argument();	
 	Argument itemArgs = new Argument();
 	for (int i = 0, len = labels.length; i < len; i++)
-	    itemArgs.writeAtom(labels[i]);
+	    itemArgs.writeString(labels[i], StandardCharsets.UTF_8);
 	args.writeArgument(itemArgs);
 	return args;
     }

gimap/src/main/java/module-info.java

+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2018 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://oss.oracle.com/licenses/CDDL+GPL-1.1
+ * or 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 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.
+ */
+
+module com.sun.mail.gimap {
+    exports com.sun.mail.gimap;
+    exports com.sun.mail.gimap.protocol;
+    provides javax.mail.Provider with
+	com.sun.mail.gimap.GmailProvider, com.sun.mail.gimap.GmailSSLProvider;
+
+    requires java.mail;
+    requires java.logging;
+    requires java.security.sasl;
+    requires com.sun.mail.imap;
+}

gimap/src/main/resources/META-INF/services/javax.mail.Provider

+com.sun.mail.gimap.GmailProvider
+com.sun.mail.gimap.GmailSSLProvider

imap/pom.xml

@@ -48,7 +48,7 @@
     <parent>
 	<groupId>com.sun.mail</groupId>
 	<artifactId>parent-distrib</artifactId>
-	<version>1.6.1</version>
+	<version>1.6.2</version>
 	<relativePath>../parent-distrib/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>