Project: javamail
Repository: mercurial
Revision: 557
Author: shannon
Date: 2013-04-08 18:56:26 UTC
Link:
Log Message:
------------
Get rid of unused mbox distribution subproject.
Add compatibility issues for MailHandler. (From Jason)
Final release of JavaMail 1.5.0.
Added tag JAVAMAIL-1_5_0 for changeset fa1edb81787d
Revisions:
----------
554
555
556
557
Modified Paths:
---------------
doc/release/COMPAT.txt
client/pom.xml
demo/pom.xml
dsn/pom.xml
gimap/pom.xml
imap/pom.xml
javadoc/pom.xml
logging/pom.xml
mail/pom.xml
mail/src/main/java/doc-files/speclicense.html
mailapi/pom.xml
mailapijar/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 a74656d98f20 -r c7e7b8c6c0d5 mbox/dist/assembly.xml
--- a/mbox/dist/assembly.xml Thu Apr 04 10:48:32 2013 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
- Copyright (c) 1997-2010 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.
-
--->
-
-<assembly>
- <formats>
- <format>zip</format>
- </formats>
- <baseDirectory>mbox-${mail.version}</baseDirectory>
- <moduleSets>
- <!-- include the main mbox.jar file -->
- <moduleSet>
- <includes>
- <include>com.sun.mail:mbox</include>
- </includes>
- <binaries>
- <includeDependencies>false</includeDependencies>
- <unpack>false</unpack>
- <outputFileNameMapping>
- ${module.artifactId}.${module.extension}
- </outputFileNameMapping>
- </binaries>
- </moduleSet>
-
- <!-- include the native code library in the lib directory -->
- <moduleSet>
- <includes>
- <include>com.sun.mail:libmbox</include>
- </includes>
- <binaries>
- <includeDependencies>false</includeDependencies>
- <unpack>false</unpack>
- <outputDirectory>lib/sparc</outputDirectory>
- <outputFileNameMapping>
- ${module.artifactId}.${module.extension}
- </outputFileNameMapping>
- </binaries>
- </moduleSet>
- </moduleSets>
-
- <!-- LICENSE.txt -->
- <fileSets>
- <fileSet>
- <directory>../../doc/release</directory>
- <outputDirectory></outputDirectory>
- <includes>
- <include>LICENSE.txt</include>
- </includes>
- </fileSet>
- </fileSets>
-</assembly>
diff -r a74656d98f20 -r c7e7b8c6c0d5 mbox/dist/pom.xml
--- a/mbox/dist/pom.xml Thu Apr 04 10:48:32 2013 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
- 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.
-
--->
-
-<project xmlns="
http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="
http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="
http://maven.apache.org/POM/4.0.0
-
http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>com.sun.mail</groupId>
- <artifactId>all</artifactId>
- <version>1.5.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>com.sun.mail</groupId>
- <artifactId>mboxdist</artifactId>
- <packaging>pom</packaging>
- <name>JavaMail API mbox distribution</name>
- <description>JavaMail API mbox distribution</description>
- <url>
http://java.sun.com/projects/javamail</url>
-
- <modules>
- <module>..</module> <!-- mbox module itself -->
- <module>../native</module>
- </modules>
- <build>
- <plugins>
- <!--
- This is the rule that creates the zip file for distribution.
- -->
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <inherited>false</inherited>
- <!--
- I'd like this to be run as part of the
- package phase, but that doesn't work.
- Have to run it explicitly as:
-
- mvn package assembly:assembly
-
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>assembly</goal>
- </goals>
- -->
- <configuration>
- <finalName>mbox-${mail.version}</finalName>
- <descriptors>
- <descriptor>assembly.xml</descriptor>
- </descriptors>
- </configuration>
- <!--
- </execution>
- </executions>
- -->
- </plugin>
- </plugins>
- </build>
-</project>
diff -r c7e7b8c6c0d5 -r 167136b582c0 doc/release/COMPAT.txt
--- a/doc/release/COMPAT.txt Fri Apr 05 13:02:15 2013 -0700
+++ b/doc/release/COMPAT.txt Fri Apr 05 15:11:57 2013 -0700
@@ -55,6 +55,32 @@
imagine how this change could impact any applications other
than perhaps those using reflection to access these classes.
+- MailHandler default attachment filters
+
+ The default used for attachment filters has changed from allow
+ all log records (null) to instead use body filter assigned to
+ getFilter(). This is a safer choice as it maintains any
+ existing filter rules when attachments are added.
+
+- MailHandler default 'TO' address recipient
+
+ If the 'TO' address key is not specified then the local address
+ is used. The previous behavior was to omit the 'TO' address
+ header. This can break configurations that are only sending to
+ a set of 'CC' or 'BCC' addresses. To revert this behavior
+ simply specify a 'TO' address key with an empty address value.
+
+- MailHandler intern of error manager, filters, and formatters.
+
+ When MailHandler is created, the error manager, filters, and
+ formatters are checked for equality. When equal objects are
+ found they are replaced with a single representation. This
+ allows objects of the same type to share state for improving
+ performance, adding functionality, etc. To revert to the
+ previous behavior the error manager, filters, and formatters
+ must retain or be wrapped with objects that retain the identity
+ equals and hash code to prevent interning.
+
-- JavaMail 1.4.4 --
diff -r 167136b582c0 -r fa1edb81787d client/pom.xml
--- a/client/pom.xml Fri Apr 05 15:11:57 2013 -0700
+++ b/client/pom.xml Mon Apr 08 11:36:53 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</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r 167136b582c0 -r fa1edb81787d demo/pom.xml
--- a/demo/pom.xml Fri Apr 05 15:11:57 2013 -0700
+++ b/demo/pom.xml Mon Apr 08 11:36:53 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</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r 167136b582c0 -r fa1edb81787d dsn/pom.xml
--- a/dsn/pom.xml Fri Apr 05 15:11:57 2013 -0700
+++ b/dsn/pom.xml Mon Apr 08 11:36:53 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</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r 167136b582c0 -r fa1edb81787d gimap/pom.xml
--- a/gimap/pom.xml Fri Apr 05 15:11:57 2013 -0700
+++ b/gimap/pom.xml Mon Apr 08 11:36:53 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</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r 167136b582c0 -r fa1edb81787d imap/pom.xml
--- a/imap/pom.xml Fri Apr 05 15:11:57 2013 -0700
+++ b/imap/pom.xml Mon Apr 08 11:36:53 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</version>
<relativePath>../parent-distrib/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff -r 167136b582c0 -r fa1edb81787d javadoc/pom.xml
--- a/javadoc/pom.xml Fri Apr 05 15:11:57 2013 -0700
+++ b/javadoc/pom.xml Mon Apr 08 11:36:53 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</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</version>
<name>JavaMail API javadocs</name>
<description>${project.name}</description>
diff -r 167136b582c0 -r fa1edb81787d logging/pom.xml
--- a/logging/pom.xml Fri Apr 05 15:11:57 2013 -0700
+++ b/logging/pom.xml Mon Apr 08 11:36:53 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</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r 167136b582c0 -r fa1edb81787d mail/pom.xml
--- a/mail/pom.xml Fri Apr 05 15:11:57 2013 -0700
+++ b/mail/pom.xml Mon Apr 08 11:36:53 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</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r 167136b582c0 -r fa1edb81787d mail/src/main/java/doc-files/speclicense.html
--- a/mail/src/main/java/doc-files/speclicense.html Fri Apr 05 15:11:57 2013 -0700
+++ b/mail/src/main/java/doc-files/speclicense.html Mon Apr 08 11:36:53 2013 -0700
@@ -7,183 +7,183 @@
<br/>
Version: 1.5
<br/>
-Status: Maintenance Review
+Status: Final Release
<br/>
-Release: February 18, 2013
+Specification Lead: Oracle America, Inc. ("Specification Lead")
+<br/>
+Release: March 18, 2013
<br/>
<br/>
Copyright © 2013 Oracle America, Inc.
<br/>
-500 Oracle Parkway
-<br/>
-Redwood City, California 94065, U.S.A.
-<br/>
-<br/>
All rights reserved.
<br/>
-
<p>
-NOTICE
+LIMITED LICENSE GRANTS
<br/>
-The Specification is protected by copyright and the information
-described therein may be protected by one or more U.S. patents, foreign
-patents, or pending applications. Except as provided under the
-following license, no part of the Specification may be reproduced in
-any form by any means without the prior written authorization of Oracle
-America, Inc. ("Oracle") and its licensors, if any. Any use of the
-Specification and the information described therein will be governed by
-the terms and conditions of this Agreement.
+1. License for Evaluation Purposes. Specification Lead hereby grants
+you a fully-paid, non-exclusive, non-transferable, worldwide, limited
+license (without the right to sublicense), under Specification Lead's
+applicable intellectual property rights to view, download, use and
+reproduce the Specification only for the purpose of internal
+evaluation. This includes (i) developing applications intended to run
+on an implementation of the Specification, provided that such
+applications do not themselves implement any portion(s) of the
+Specification, and (ii) discussing the Specification with any third
+party; and (iii) excerpting brief portions of the Specification in oral
+or written communications which discuss the Specification provided that
+such excerpts do not in the aggregate constitute a significant portion
+of the Specification.
</p>
<p>
-Subject to the terms and conditions of this license, including your
-compliance with Paragraphs 1 and 2 below, Oracle hereby grants you a
-fully-paid, non-exclusive, non-transferable, limited license (without
-the right to sublicense) under Oracle's intellectual property rights
-to:
-<br/>
-1.Review the Specification for the purposes of evaluation. This
-includes: (i) developing implementations of the Specification for your
-internal, non-commercial use; (ii) discussing the Specification with
-any third party; and (iii) excerpting brief portions of the
-Specification in oral or written communications which discuss the
-Specification provided that such excerpts do not in the aggregate
-constitute a significant portion of the Technology.
-<br/>
-2.Distribute implementations of the Specification to third parties for
-their testing and evaluation use, provided that any such
-implementation:
-<br/>
-(i) does not modify, subset, superset or otherwise extend the Licensor
-Name Space, or include any public or protected packages, classes, Java
-interfaces, fields or methods within the Licensor Name Space other than
-those required/authorized by the Specification or Specifications being
-implemented;
-<br/>
-(ii) is clearly and prominently marked with the word "UNTESTED" or
-"EARLY ACCESS" or "INCOMPATIBLE" or "UNSTABLE" or "BETA" in any list of
-available builds and in proximity to every link initiating its
-download, where the list or link is under Licensee's control; and
-<br/>
-(iii) includes the following notice:
-<br/>
-"This is an implementation of an early-draft specification developed
-under the Java Community Process (JCP) and is made available for
-testing and evaluation purposes only. The code is not compatible with
-any specification of the JCP."
+2. License for the Distribution of Compliant Implementations.
+Specification Lead also grants you a perpetual, non-exclusive,
+non-transferable, worldwide, fully paid-up, royalty free, limited
+license (without the right to sublicense) under any applicable
+copyrights or, subject to the provisions of subsection 4 below, patent
+rights it may have covering the Specification to create and/or
+distribute an Independent Implementation of the Specification that: (a)
+fully implements the Specification including all its required
+interfaces and functionality; (b) does not modify, subset, superset or
+otherwise extend the Licensor Name Space, or include any public or
+protected packages, classes, Java interfaces, fields or methods within
+the Licensor Name Space other than those required/authorized by the
+Specification or Specifications being implemented; and (c) passes the
+Technology Compatibility Kit (including satisfying the requirements of
+the applicable TCK Users Guide) for such Specification ("Compliant
+Implementation"). In addition, the foregoing license is expressly
+conditioned on your not acting outside its scope. No license is
+granted hereunder for any other purpose (including, for example,
+modifying the Specification, other than to the extent of your fair use
+rights, or distributing the Specification to third parties). Also, no
+right, title, or interest in or to any trademarks, service marks, or
+trade names of Specification Lead or Specification Lead's licensors is
+granted hereunder. Java, and Java-related logos, marks and names are
+trademarks or registered trademarks of Oracle America, Inc. in the U.S.
+and other countries.
</p>
<p>
-The grant set forth above concerning your distribution of
-implementations of the specification is contingent upon your agreement
-to terminate development and distribution of your "early draft"
-implementation as soon as feasible following final completion of the
-specification. If you fail to do so, the foregoing grant shall be
-considered null and void.
+3. Pass-through Conditions. You need not include limitations (a)-(c)
+from the previous paragraph or any other particular "pass through"
+requirements in any license You grant concerning the use of your
+Independent Implementation or products derived from it. However,
+except with respect to Independent Implementations (and products
+derived from them) that satisfy limitations (a)-(c) from the previous
+paragraph, You may neither: (a) grant or otherwise pass through to
+your licensees any licenses under Specification Lead's applicable
+intellectual property rights; nor (b) authorize your licensees to make
+any claims concerning their implementation's compliance with the
+Specification in question.
</p>
<p>
-No provision of this Agreement shall be understood to restrict your
-ability to make and distribute to third parties applications written to
-the Specification.
+4. Reciprocity Concerning Patent Licenses.
+<br/>
+a. With respect to any patent claims covered by the license granted
+under subparagraph 2 above that would be infringed by all technically
+feasible implementations of the Specification, such license is
+conditioned upon your offering on fair, reasonable and
+non-discriminatory terms, to any party seeking it from You, a
+perpetual, non-exclusive, non-transferable, worldwide license under
+Your patent rights which are or would be infringed by all technically
+feasible implementations of the Specification to develop, distribute
+and use a Compliant Implementation.
+<br/>
+b. With respect to any patent claims owned by Specification Lead and
+covered by the license granted under subparagraph 2, whether or not
+their infringement can be avoided in a technically feasible manner when
+implementing the Specification, such license shall terminate with
+respect to such claims if You initiate a claim against Specification
+Lead that it has, in the course of performing its responsibilities as
+the Specification Lead, induced any other entity to infringe Your
+patent rights.
+<br/>
+c. Also with respect to any patent claims owned by Specification Lead
+and covered by the license granted under subparagraph 2 above, where
+the infringement of such claims can be avoided in a technically
+feasible manner when implementing the Specification such license, with
+respect to such claims, shall terminate if You initiate a claim against
+Specification Lead that its making, having made, using, offering to
+sell, selling or importing a Compliant Implementation infringes Your
+patent rights.
</p>
<p>
-Other than this limited license, you acquire no right, title or
-interest in or to the Specification or any other Oracle intellectual
-property, and the Specification may only be used in accordance with the
-license terms set forth herein. This license will expire on the earlier
-of: (a) two (2) years from the date of Release listed above; (b) the
-date on which the final version of the Specification is publicly
-released; or (c) the date on which the Java Specification Request (JSR)
-to which the Specification corresponds is withdrawn. In addition, this
-license will terminate immediately without notice from Oracle if you
-fail to comply with any provision of this license. Upon termination,
-you must cease use of or destroy the Specification.
+5. Definitions. For the purposes of this Agreement: "Independent
+Implementation" shall mean an implementation of the Specification that
+neither derives from any of Specification Lead's source code or binary
+code materials nor, except with an appropriate and separate license
+from Specification Lead, includes any of Specification Lead's source
+code or binary code materials; "Licensor Name Space" shall mean the
+public class or interface declarations whose names begin with "java",
+"javax", "com.sun" and "com.oracle" or their equivalents in any
+subsequent naming convention adopted by Oracle America, Inc. through
+the Java Community Process, or any recognized successors or
+replacements thereof; and "Technology Compatibility Kit" or "TCK" shall
+mean the test suite and accompanying TCK User's Guide provided by
+Specification Lead which corresponds to the Specification and that was
+available either (i) from Specification Lead's 120 days before the
+first release of Your Independent Implementation that allows its use
+for commercial purposes, or (ii) more recently than 120 days from such
+release but against which You elect to test Your implementation of the
+Specification.
</p>
<p>
-"Licensor Name Space" means the public class or interface declarations
-whose names begin with "java", "javax", "com.oracle" or their
-equivalents in any subsequent naming convention adopted by Oracle
-through the Java Community Process, or any recognized successors or
-replacements thereof
+This Agreement will terminate immediately without notice from
+Specification Lead if you breach the Agreement or act outside the scope
+of the licenses granted above.
</p>
<p>
-TRADEMARKS
+DISCLAIMER OF WARRANTIES
<br/>
-No right, title, or interest in or to any trademarks, service marks, or
-trade names of Oracle or Oracle's licensors is granted hereunder.
-Oracle, the Oracle logo, Java are trademarks or registered trademarks
-of Oracle USA, Inc. in the U.S. and other countries.
-</p>
-<p>
-DISCLAIMER OF WARRANTIES
-<br/>
-THE SPECIFICATION IS PROVIDED "AS IS" AND IS EXPERIMENTAL AND MAY
-CONTAIN DEFECTS OR DEFICIENCIES WHICH CANNOT OR WILL NOT BE CORRECTED
-BY ORACLE. ORACLE MAKES NO REPRESENTATIONS OR WARRANTIES, EITHER
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT
-THAT THE CONTENTS OF THE SPECIFICATION ARE
-</p>
-<p>
-SUITABLE FOR ANY PURPOSE OR THAT ANY PRACTICE OR IMPLEMENTATION OF SUCH
-CONTENTS WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADE
-SECRETS OR OTHER RIGHTS. This document does not represent any
-commitment to release or implement any portion of the Specification in
-any product.
-</p>
-<p>
-THE SPECIFICATION COULD INCLUDE TECHNICAL INACCURACIES OR TYPOGRAPHICAL
-ERRORS. CHANGES ARE PERIODICALLY ADDED TO THE INFORMATION THEREIN;
-THESE CHANGES WILL BE INCORPORATED INTO NEW VERSIONS OF THE
-SPECIFICATION, IF ANY. ORACLE MAY MAKE IMPROVEMENTS AND/OR CHANGES TO
-THE PRODUCT(S) AND/OR THE PROGRAM(S) DESCRIBED IN THE SPECIFICATION AT
-ANY TIME. Any use of such changes in the Specification will be governed
-by the then-current license for the applicable version of the
-Specification.
+THE SPECIFICATION IS PROVIDED "AS IS". SPECIFICATION LEAD MAKES NO
+REPRESENTATIONS OR WARRANTIES, EITHER EXPRESS OR IMPLIED, INCLUDING BUT
+NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+PURPOSE, NON-INFRINGEMENT (INCLUDING AS A CONSEQUENCE OF ANY PRACTICE
+OR IMPLEMENTATION OF THE SPECIFICATION), OR THAT THE CONTENTS OF THE
+SPECIFICATION ARE SUITABLE FOR ANY PURPOSE. This document does not
+represent any commitment to release or implement any portion of the
+Specification in any product. In addition, the Specification could
+include technical inaccuracies or typographical errors.
</p>
<p>
LIMITATION OF LIABILITY
<br/>
-TO THE EXTENT NOT PROHIBITED BY LAW, IN NO EVENT WILL ORACLE OR ITS
-LICENSORS BE LIABLE FOR ANY DAMAGES, INCLUDING WITHOUT LIMITATION, LOST
-REVENUE, PROFITS OR DATA, OR FOR SPECIAL, INDIRECT, CONSEQUENTIAL,
-INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE
-THEORY OF LIABILITY, ARISING OUT OF OR RELATED TO ANY FURNISHING,
-PRACTICING, MODIFYING OR ANY USE OF THE SPECIFICATION, EVEN IF ORACLE
-AND/OR ITS LICENSORS HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
+TO THE EXTENT NOT PROHIBITED BY LAW, IN NO EVENT WILL SPECIFICATION
+LEAD OR ITS LICENSORS BE LIABLE FOR ANY DAMAGES, INCLUDING WITHOUT
+LIMITATION, LOST REVENUE, PROFITS OR DATA, OR FOR SPECIAL, INDIRECT,
+CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND
+REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF OR RELATED IN ANY
+WAY TO YOUR HAVING, IMPELEMENTING OR OTHERWISE USING USING THE
+SPECIFICATION, EVEN IF SPECIFICATION LEAD AND/OR ITS LICENSORS HAVE
+BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. You will indemnify,
+hold harmless, and defend Specification Lead and its licensors from any
+claims arising or resulting from: (i) your use of the Specification;
+(ii) the use or distribution of your Java application, applet and/or
+implementation; and/or (iii) any claims that later versions or releases
+of any Specification furnished to you are incompatible with the
+Specification provided to you under this license.
</p>
<p>
-You will hold Oracle (and its licensors) harmless from any claims based
-on your use of the Specification for any purposes other than the
-limited right of evaluation as described above, and from any claims
-that later versions or releases of any Specification furnished to you
-are incompatible with the Specification provided to you under this
-license.
-</p>
-<p>
-RESTRICTED RIGHTS LEGEND
+RESTRICTED RIGHTS LEGEND
<br/>
-If this Software is being acquired by or on behalf of the U.S.
-Government or by a U.S. Government prime contractor or subcontractor
-(at any tier), then the Government's rights in the Software and
-accompanying documentation shall be only as set forth in this license;
-this is in accordance with 48 C.F.R. 227.7201 through 227.7202-4 (for
-Department of Defense (DoD) acquisitions) and with 48 C.F.R. 2.101 and
-12.212 (for non-DoD acquisitions).
+U.S. Government: If this Specification is being acquired by or on
+behalf of the U.S. Government or by a U.S. Government prime contractor
+or subcontractor (at any tier), then the Government's rights in the
+Software and accompanying documentation shall be only as set forth in
+this license; this is in accordance with 48 C.F.R. 227.7201 through
+227.7202-4 (for Department of Defense (DoD) acquisitions) and with 48
+C.F.R. 2.101 and 12.212 (for non-DoD acquisitions).
</p>
<p>
REPORT
<br/>
-You may wish to report any ambiguities, inconsistencies or inaccuracies
-you may find in connection with your evaluation of the Specification
-("Feedback"). To the extent that you provide Oracle with any Feedback,
-you hereby: (i) agree that such Feedback is provided on a
-non-proprietary and non-confidential basis, and (ii) grant Oracle a
-perpetual, non-exclusive, worldwide, fully paid-up, irrevocable
-license, with the right to sublicense through multiple levels of
-sublicensees, to incorporate, disclose, and use without limitation the
-Feedback for any purpose related to the Specification and future
-versions, implementations, and test suites thereof.
+If you provide Specification Lead with any comments or suggestions
+concerning the Specification ("Feedback"), you hereby: (i) agree that
+such Feedback is provided on a non-proprietary and non-confidential
+basis, and (ii) grant Specification Lead a perpetual, non-exclusive,
+worldwide, fully paid-up, irrevocable license, with the right to
+sublicense through multiple levels of sublicensees, to incorporate,
+disclose, and use without limitation the Feedback for any purpose.
</p>
<p>
GENERAL TERMS
@@ -206,7 +206,7 @@
matter. It supersedes all prior or contemporaneous oral or written
communications, proposals, conditions, representations and warranties
and prevails over any conflicting or additional terms of any quote,
-order, acknowledgment, or other communication between the parties
+order, acknowledgment, or other communication between the parties
relating to its subject matter during the term of this Agreement. No
modification to this Agreement will be binding, unless in writing and
signed by an authorized representative of each party.
diff -r 167136b582c0 -r fa1edb81787d mailapi/pom.xml
--- a/mailapi/pom.xml Fri Apr 05 15:11:57 2013 -0700
+++ b/mailapi/pom.xml Mon Apr 08 11:36:53 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</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r 167136b582c0 -r fa1edb81787d mailapijar/pom.xml
--- a/mailapijar/pom.xml Fri Apr 05 15:11:57 2013 -0700
+++ b/mailapijar/pom.xml Mon Apr 08 11:36:53 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</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>javax.mail</groupId>
diff -r 167136b582c0 -r fa1edb81787d mbox/native/pom.xml
--- a/mbox/native/pom.xml Fri Apr 05 15:11:57 2013 -0700
+++ b/mbox/native/pom.xml Mon Apr 08 11:36:53 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</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff -r 167136b582c0 -r fa1edb81787d mbox/pom.xml
--- a/mbox/pom.xml Fri Apr 05 15:11:57 2013 -0700
+++ b/mbox/pom.xml Mon Apr 08 11:36:53 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</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r 167136b582c0 -r fa1edb81787d oldmail/pom.xml
--- a/oldmail/pom.xml Fri Apr 05 15:11:57 2013 -0700
+++ b/oldmail/pom.xml Mon Apr 08 11:36:53 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</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>javax.mail</groupId>
diff -r 167136b582c0 -r fa1edb81787d outlook/pom.xml
--- a/outlook/pom.xml Fri Apr 05 15:11:57 2013 -0700
+++ b/outlook/pom.xml Mon Apr 08 11:36:53 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</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r 167136b582c0 -r fa1edb81787d parent-distrib/pom.xml
--- a/parent-distrib/pom.xml Fri Apr 05 15:11:57 2013 -0700
+++ b/parent-distrib/pom.xml Mon Apr 08 11:36:53 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</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r 167136b582c0 -r fa1edb81787d pom.xml
--- a/pom.xml Fri Apr 05 15:11:57 2013 -0700
+++ b/pom.xml Mon Apr 08 11:36:53 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</version>
<name>JavaMail API distribution</name>
<description>${project.name}</description>
<url>
http://javamail.java.net</url>
@@ -85,13 +85,10 @@
</organization>
<properties>
- <mail.version>1.5.0-SNAPSHOT</mail.version>
+ <mail.version>1.5.0</mail.version>
<!-- like mail.version, but with underscores instead of dots -->
- <mail.zipversion>1_5_0-SNAPSHOT</mail.zipversion>
- <!-- XXX - temporary until 1.5 is final
+ <mail.zipversion>1_5_0</mail.zipversion>
<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>
@@ -351,10 +348,6 @@
<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 167136b582c0 -r fa1edb81787d pop3/pom.xml
--- a/pop3/pom.xml Fri Apr 05 15:11:57 2013 -0700
+++ b/pop3/pom.xml Mon Apr 08 11:36:53 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</version>
<relativePath>../parent-distrib/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff -r 167136b582c0 -r fa1edb81787d publish/pom.xml
--- a/publish/pom.xml Fri Apr 05 15:11:57 2013 -0700
+++ b/publish/pom.xml Mon Apr 08 11:36:53 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</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
<artifactId>publish</artifactId>
<packaging>pom</packaging>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.5.0</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.0-SNAPSHOT</version>
+ <version>1.5.0</version>
</dependency>
<!--
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>demo</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.5.0</version>
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>client</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.5.0</version>
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>servlet</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.5.0</version>
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>webapp</artifactId>
<type>war</type>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.5.0</version>
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>taglib</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.5.0</version>
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>logging</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.5.0</version>
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>outlook</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.5.0</version>
</dependency>
-->
</dependencies>
diff -r 167136b582c0 -r fa1edb81787d servlet/pom.xml
--- a/servlet/pom.xml Fri Apr 05 15:11:57 2013 -0700
+++ b/servlet/pom.xml Mon Apr 08 11:36:53 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</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r 167136b582c0 -r fa1edb81787d smtp/pom.xml
--- a/smtp/pom.xml Fri Apr 05 15:11:57 2013 -0700
+++ b/smtp/pom.xml Mon Apr 08 11:36:53 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</version>
<relativePath>../parent-distrib/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff -r 167136b582c0 -r fa1edb81787d taglib/pom.xml
--- a/taglib/pom.xml Fri Apr 05 15:11:57 2013 -0700
+++ b/taglib/pom.xml Mon Apr 08 11:36:53 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</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r 167136b582c0 -r fa1edb81787d webapp/pom.xml
--- a/webapp/pom.xml Fri Apr 05 15:11:57 2013 -0700
+++ b/webapp/pom.xml Mon Apr 08 11:36:53 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</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r fa1edb81787d -r 0b866cffd059 .hgtags
--- a/.hgtags Mon Apr 08 11:36:53 2013 -0700
+++ b/.hgtags Mon Apr 08 11:56:26 2013 -0700
@@ -14,3 +14,4 @@
b9c00b0cf3cf560077cd3c393c597e4ed9f1bf14 JAVAMAIL-1_4_6
3dba8c78634fcb1ffd9a32e840bcfab91a83a551 JAVAMAIL-1_4_6
ba4e734fdfa9916c0e8867b8ea8b4218e276be0e JAVAMAIL-1_4_7
+fa1edb81787d0b26828cee438a6d54df619fa6da JAVAMAIL-1_5_0