Project: javamail
Repository: mercurial
Revision: 200
Author: shannon
Date: 2009-11-17 18:42:47 UTC
Link:
Log Message:
------------
Use a better OSGi version number, generated by the osgiversion-maven-plugin.
Improve the update_version script.
Update version number to 1.4.3-rc2, in case we need to release an update.
Typo in connection pool timeout, should be 45 seconds, not 4.5 seconds.
1.4.3 license
Update version to 1.4.3.
Added tag JAVAMAIL-1_4_3 for changeset 200b5a729cff
Add plugin repository for osgiversion-maven-plugin.
Added tag JAVAMAIL-1_4_3 for changeset 1f3f699ed17a
Revisions:
----------
194
195
196
197
198
199
200
Modified Paths:
---------------
client/pom.xml
demo/pom.xml
dsn/pom.xml
imap/pom.xml
javadoc/pom.xml
logging/pom.xml
mail/pom.xml
mailapi/pom.xml
mbox/dist/pom.xml
mbox/native/pom.xml
mbox/pom.xml
parent-distrib/pom.xml
pom.xml
pop3/pom.xml
servlet/pom.xml
smtp/pom.xml
taglib/pom.xml
update_version
webapp/pom.xml
mail/src/main/java/com/sun/mail/imap/IMAPStore.java
doc/release/LICENSE.txt
doc/release/distributionREADME.txt
.hgtags
Diffs:
------
diff -r 712d07e0bd2b -r 91920774464c client/pom.xml
--- a/client/pom.xml Thu Nov 05 15:00:06 2009 -0800
+++ b/client/pom.xml Fri Nov 06 15:55:21 2009 -0800
@@ -42,7 +42,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.4.3-rc1</version>
+ <version>1.4.3-rc2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r 712d07e0bd2b -r 91920774464c demo/pom.xml
--- a/demo/pom.xml Thu Nov 05 15:00:06 2009 -0800
+++ b/demo/pom.xml Fri Nov 06 15:55:21 2009 -0800
@@ -42,7 +42,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.4.3-rc1</version>
+ <version>1.4.3-rc2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r 712d07e0bd2b -r 91920774464c dsn/pom.xml
--- a/dsn/pom.xml Thu Nov 05 15:00:06 2009 -0800
+++ b/dsn/pom.xml Fri Nov 06 15:55:21 2009 -0800
@@ -42,7 +42,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.4.3-rc1</version>
+ <version>1.4.3-rc2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r 712d07e0bd2b -r 91920774464c imap/pom.xml
--- a/imap/pom.xml Thu Nov 05 15:00:06 2009 -0800
+++ b/imap/pom.xml Fri Nov 06 15:55:21 2009 -0800
@@ -42,7 +42,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>parent-distrib</artifactId>
- <version>1.4.3-rc1</version>
+ <version>1.4.3-rc2</version>
<relativePath>../parent-distrib/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff -r 712d07e0bd2b -r 91920774464c javadoc/pom.xml
--- a/javadoc/pom.xml Thu Nov 05 15:00:06 2009 -0800
+++ b/javadoc/pom.xml Fri Nov 06 15:55:21 2009 -0800
@@ -42,13 +42,13 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.4.3-rc1</version>
+ <version>1.4.3-rc2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
<artifactId>javadoc</artifactId>
<packaging>pom</packaging>
- <version>1.4.3-rc1</version>
+ <version>1.4.3-rc2</version>
<name>JavaMail API javadocs</name>
<description>${project.name}</description>
diff -r 712d07e0bd2b -r 91920774464c logging/pom.xml
--- a/logging/pom.xml Thu Nov 05 15:00:06 2009 -0800
+++ b/logging/pom.xml Fri Nov 06 15:55:21 2009 -0800
@@ -42,7 +42,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.4.3-rc1</version>
+ <version>1.4.3-rc2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
@@ -58,7 +58,7 @@
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>demo</artifactId>
- <version>1.4.3-rc1</version>
+ <version>1.4.3-rc2</version>
</dependency>
</dependencies>
</project>
diff -r 712d07e0bd2b -r 91920774464c mail/pom.xml
--- a/mail/pom.xml Thu Nov 05 15:00:06 2009 -0800
+++ b/mail/pom.xml Fri Nov 06 15:55:21 2009 -0800
@@ -42,7 +42,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.4.3-rc1</version>
+ <version>1.4.3-rc2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>javax.mail</groupId>
@@ -62,12 +62,12 @@
</mail.implementationTitle>
<mail.packages.export>
javax.mail.*; version=${mail.spec.version},
- com.sun.mail.imap; version=${mail.version},
- com.sun.mail.pop3; version=${mail.version},
- com.sun.mail.smtp; version=${mail.version},
- com.sun.mail.util; version=${mail.version},
- com.sun.mail.util.logging; version=${mail.version},
- com.sun.mail.handlers; version=${mail.version}
+ com.sun.mail.imap; version=${mail.osgiversion},
+ com.sun.mail.pop3; version=${mail.osgiversion},
+ com.sun.mail.smtp; version=${mail.osgiversion},
+ com.sun.mail.util; version=${mail.osgiversion},
+ com.sun.mail.util.logging; version=${mail.osgiversion},
+ com.sun.mail.handlers; version=${mail.osgiversion}
</mail.packages.export>
<mail.probeFile>
META-INF/gfprobe-provider.xml
diff -r 712d07e0bd2b -r 91920774464c mailapi/pom.xml
--- a/mailapi/pom.xml Thu Nov 05 15:00:06 2009 -0800
+++ b/mailapi/pom.xml Fri Nov 06 15:55:21 2009 -0800
@@ -42,7 +42,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.4.3-rc1</version>
+ <version>1.4.3-rc2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>javax.mail</groupId>
diff -r 712d07e0bd2b -r 91920774464c mbox/dist/pom.xml
--- a/mbox/dist/pom.xml Thu Nov 05 15:00:06 2009 -0800
+++ b/mbox/dist/pom.xml Fri Nov 06 15:55:21 2009 -0800
@@ -42,7 +42,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.4.3-rc1</version>
+ <version>1.4.3-rc2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff -r 712d07e0bd2b -r 91920774464c mbox/native/pom.xml
--- a/mbox/native/pom.xml Thu Nov 05 15:00:06 2009 -0800
+++ b/mbox/native/pom.xml Fri Nov 06 15:55:21 2009 -0800
@@ -42,7 +42,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.4.3-rc1</version>
+ <version>1.4.3-rc2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff -r 712d07e0bd2b -r 91920774464c mbox/pom.xml
--- a/mbox/pom.xml Thu Nov 05 15:00:06 2009 -0800
+++ b/mbox/pom.xml Fri Nov 06 15:55:21 2009 -0800
@@ -42,7 +42,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.4.3-rc1</version>
+ <version>1.4.3-rc2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r 712d07e0bd2b -r 91920774464c parent-distrib/pom.xml
--- a/parent-distrib/pom.xml Thu Nov 05 15:00:06 2009 -0800
+++ b/parent-distrib/pom.xml Fri Nov 06 15:55:21 2009 -0800
@@ -42,7 +42,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.4.3-rc1</version>
+ <version>1.4.3-rc2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r 712d07e0bd2b -r 91920774464c pom.xml
--- a/pom.xml Thu Nov 05 15:00:06 2009 -0800
+++ b/pom.xml Fri Nov 06 15:55:21 2009 -0800
@@ -43,7 +43,7 @@
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
<packaging>pom</packaging>
- <version>1.4.3-rc1</version>
+ <version>1.4.3-rc2</version>
<name>JavaMail API distribution</name>
<description>${project.name}</description>
<url>
http://java.sun.com/projects/javamail</url>
@@ -69,9 +69,9 @@
</organization>
<properties>
- <mail.version>1.4.3-rc1</mail.version>
+ <mail.version>1.4.3-rc2</mail.version>
<!-- like mail.version, but with underscores instead of dots -->
- <mail.zipversion>1_4_3-rc1</mail.zipversion>
+ <mail.zipversion>1_4_3-rc2</mail.zipversion>
<mail.spec.version>1.4</mail.spec.version>
<activation-api.version>1.1</activation-api.version>
<!-- defaults that are overridden in mail module -->
@@ -97,6 +97,8 @@
com.sun.mail.*
</mail.packages.private>
<mail.probeFile/>
+ <!-- for the osgiversion-maven-plugin -->
+ <hk2.plugin.version>0.4.11</hk2.plugin.version>
</properties>
<developers>
@@ -201,6 +203,32 @@
</execution>
</executions>
</plugin>
+
+ <!--
+ Since we don't want a qualifier like b05 or SNAPSHOT to
+ appear in the OSGi package version attribute, we use
+ the following plugin to populate a project property
+ with an OSGi version that is equivalent to the maven
+ version without the qualifier.
+ -->
+ <plugin>
+ <groupId>com.sun.enterprise</groupId>
+ <artifactId>osgiversion-maven-plugin</artifactId>
+ <version>${hk2.plugin.version}</version>
+ <configuration>
+ <dropVersionComponent>qualifier</dropVersionComponent>
+ <versionPropertyName>mail.osgiversion</versionPropertyName>
+ </configuration>
+ <executions>
+ <execution>
+ <id>compute-osgi-version</id>
+ <goals>
+ <goal>compute-osgi-version</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
diff -r 712d07e0bd2b -r 91920774464c pop3/pom.xml
--- a/pop3/pom.xml Thu Nov 05 15:00:06 2009 -0800
+++ b/pop3/pom.xml Fri Nov 06 15:55:21 2009 -0800
@@ -42,7 +42,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>parent-distrib</artifactId>
- <version>1.4.3-rc1</version>
+ <version>1.4.3-rc2</version>
<relativePath>../parent-distrib/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff -r 712d07e0bd2b -r 91920774464c servlet/pom.xml
--- a/servlet/pom.xml Thu Nov 05 15:00:06 2009 -0800
+++ b/servlet/pom.xml Fri Nov 06 15:55:21 2009 -0800
@@ -42,7 +42,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.4.3-rc1</version>
+ <version>1.4.3-rc2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r 712d07e0bd2b -r 91920774464c smtp/pom.xml
--- a/smtp/pom.xml Thu Nov 05 15:00:06 2009 -0800
+++ b/smtp/pom.xml Fri Nov 06 15:55:21 2009 -0800
@@ -42,7 +42,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>parent-distrib</artifactId>
- <version>1.4.3-rc1</version>
+ <version>1.4.3-rc2</version>
<relativePath>../parent-distrib/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff -r 712d07e0bd2b -r 91920774464c taglib/pom.xml
--- a/taglib/pom.xml Thu Nov 05 15:00:06 2009 -0800
+++ b/taglib/pom.xml Fri Nov 06 15:55:21 2009 -0800
@@ -42,7 +42,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.4.3-rc1</version>
+ <version>1.4.3-rc2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r 712d07e0bd2b -r 91920774464c update_version
--- a/update_version Thu Nov 05 15:00:06 2009 -0800
+++ b/update_version Fri Nov 06 15:55:21 2009 -0800
@@ -4,21 +4,25 @@
# version number in preparation for release, or to change back to
# snapshot version number after release.
#
-# Usage: update_version old-version new-version
+# Usage: update_version new-version
#
+new=$1
+# find the first version string in pom.xml, which is the old version
+old=`grep '<version>.*</version>' pom.xml | head -1 | \
+ sed -e 's:.*<version>\(.*\)</version>.*:\1:'`
for file in `find . -name 'pom.xml' `
do
ed - "$file" <<-EOF
- g:<version>$1</version>:s::<version>$2</version>:
+ g:<version>$old</version>:s::<version>$new</version>:
w
q
EOF
done
-zip1=`echo "$1" | sed -e 's/\\./_/g'`
-zip2=`echo "$2" | sed -e 's/\\./_/g'`
+zipold=`echo "$old" | sed -e 's/\\./_/g'`
+zipnew=`echo "$new" | sed -e 's/\\./_/g'`
ed - pom.xml <<-EOF
-g:<mail.version>$1</mail.version>:s::<mail.version>$2</mail.version>:
-g:<mail.zipversion>$zip1</mail.zipversion>:s::<mail.zipversion>$zip2</mail.zipversion>:
+g:<mail.version>$old</mail.version>:s::<mail.version>$new</mail.version>:
+g:<mail.zipversion>$zipold</mail.zipversion>:s::<mail.zipversion>$zipnew</mail.zipversion>:
w
q
EOF
diff -r 712d07e0bd2b -r 91920774464c webapp/pom.xml
--- a/webapp/pom.xml Thu Nov 05 15:00:06 2009 -0800
+++ b/webapp/pom.xml Fri Nov 06 15:55:21 2009 -0800
@@ -42,7 +42,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.4.3-rc1</version>
+ <version>1.4.3-rc2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r 91920774464c -r e542fc7b473f mail/src/main/java/com/sun/mail/imap/IMAPStore.java
--- a/mail/src/main/java/com/sun/mail/imap/IMAPStore.java Fri Nov 06 15:55:21 2009 -0800
+++ b/mail/src/main/java/com/sun/mail/imap/IMAPStore.java Mon Nov 16 11:45:28 2009 -0800
@@ -318,7 +318,7 @@
out.println("DEBUG: mail.imap.connectionpooltimeout: " +
clientTimeoutInterval);
} else
- clientTimeoutInterval = 45 * 100; // 45 seconds
+ clientTimeoutInterval = 45 * 1000; // 45 seconds
// check if the default server-side timeout value is overridden
int serverTimeout = PropUtil.getIntSessionProperty(session,
diff -r e542fc7b473f -r ba99ebe1e477 doc/release/LICENSE.txt
--- a/doc/release/LICENSE.txt Mon Nov 16 11:45:28 2009 -0800
+++ b/doc/release/LICENSE.txt Mon Nov 16 17:08:13 2009 -0800
@@ -12,39 +12,42 @@
Licensed unit Count: Unlimited.
-Permitted Uses:
+Permitted Uses:
-1. You may reproduce and use the Software for Individual, Commercial,
-or Research and Instructional Use for the purposes of designing,
-developing, testing, and running Your applets and
-application("Programs").
+1. You may reproduce and use the Software for Your own Individual,
+Commercial and Research and Instructional Use only for the purposes of
+designing, developing, testing, and running Your applets and
+applications ("Programs").
2. Subject to the terms and conditions of this Agreement and
restrictions and exceptions set forth in the Software's documentation,
You may reproduce and distribute portions of Software identified as a
-redistributable in the documentation ("Redistributable"), provided
-that:
+redistributable in the documentation (each a "Redistributable"),
+provided that You comply with the following (note that You may be
+entitled to reproduce and distribute other portions of the Software not
+defined in the documentation as a Redistributable under certain other
+licenses as described in the THIRDPARTYLICENSEREADME, if applicable):
-(a) you distribute Redistributable complete and unmodified and only
+(a) You distribute Redistributable complete and unmodified and only
bundled as part of Your Programs,
-(b) your Programs add significant and primary functionality to the
+(b) Your Programs add significant and primary functionality to the
Redistributable,
-(c) you distribute Redistributable for the sole purpose of running your
+(c) You distribute Redistributable for the sole purpose of running Your
Programs,
-(d) you do not distribute additional software intended to replace any
+(d) You do not distribute additional software intended to replace any
component(s) of the Redistributable,
-(e) you do not remove or alter any proprietary legends or notices
+(e) You do not remove or alter any proprietary legends or notices
contained in or on the Redistributable.
-(f) you only distribute the Redistributable subject to a license
+(f) You only distribute the Redistributable subject to a license
agreement that protects Sun's interests consistent with the terms
contained in this Agreement, and
-(g) you agree to defend and indemnify Sun and its licensors from and
+(g) You agree to defend and indemnify Sun and its licensors from and
against any damages, costs, liabilities, settlement amounts and/or
expenses (including attorneys' fees) incurred in connection with any
claim, lawsuit or action by any third party that arises or results from
@@ -52,12 +55,40 @@
Redistributable.
3. Java Technology Restrictions. You may not create, modify, or change
-the behavior of, or authorize your licensees to create, modify, or
+the behavior of, or authorize Your licensees to create, modify, or
change the behavior of, classes, interfaces, or subpackages that are in
any way identified as "java", "javax", "sun" or similar convention as
specified by Sun in any naming convention designation.
-B. Sun Microsystems, Inc. ("Sun")
+4. No Diagnostic, Maintenance, Repair or Technical Support Services.
+The scope of Your license does not include any right, express or
+implied, (i) to access, copy, distribute, display or use the Software
+to provide diagnostic, maintenance, repair or technical support
+services for Sun softwa re or Sun hardware on behalf of any third party
+for Your direct or indirect commercial gain or advantage, without Sun's
+prior written authorization, or (ii) for any third party to access,
+copy, distribute, display or use the Software to provide diagnostic,
+maintenance, repair or technical support services for Sun software or
+Sun hardware on Your behalf for such party's direct or indirect
+commercial gain or advantage, without Sun's prior written
+authorization. The limitations set forth in this paragraph apply to any
+and all error corrections, patches, updates, and upgrades to the
+Software You may receive, access, download or otherwise obtain from
+Sun.
+
+5. Records and Documentation. During the term of the SLA and
+Entitlement, and for a period of three (3) years thereafter, You agree
+to keep proper records and documentation of Your compliance with the
+SLA and Entitlement. Upon Sun's reasonable request, You will provide
+copies of such records and documentation to Sun for the purpose of
+confirming Your compliance with the terms and conditions of the SLA and
+Entitlement. This section will survive any termination of the SLA and
+Entitlement. You may terminate this SLA and Entitlement at any time by
+destroying all copies of the Software in which case the obligations set
+forth in Section 7 of the SLA shall apply.
+
+
+Sun Microsystems, Inc. ("Sun")
SOFTWARE LICENSE AGREEMENT
READ THE TERMS OF THIS AGREEMENT ("AGREEMENT") CAREFULLY BEFORE OPENING
@@ -69,11 +100,11 @@
OF PURCHASE FOR A REFUND OR, IF SOFTWARE IS ACCESSED ELECTRONICALLY,
SELECT THE "DECLINE" (OR "EXIT") BUTTON AT THE END OF THIS AGREEMENT.
IF YOU HAVE SEPARATELY AGREED TO LICENSE TERMS ("MASTER TERMS") FOR
-YOUR LICENSE TO THIS SOFTWARE, THEN SECTIONS 1-5 OF THIS AGREEMENT
+YOUR LICENSE TO THIS SOFTWARE, THEN SECTIONS 1-6 OF THIS AGREEMENT
("SUPPLEMENTAL LICENSE TERMS") SHALL SUPPLEMENT AND SUPERSEDE THE
MASTER TERMS IN RELATION TO THIS SOFTWARE.
-1. Definitions.
+1. Definitions.
(a) "Entitlement" means the collective set of applicable documents
authorized by Sun evidencing your obligation to pay associated fees (if
@@ -97,7 +128,6 @@
Entitlement. Also, certain software may be included for evaluation use
under Section 3.
-
(f) "You" and "Your" means the individual or legal entity specified
in the Entitlement, or for evaluation purposes, the entity performing
the evaluation.
@@ -156,7 +186,7 @@
your Entitlement. If you require additional Licensed Units, you will
need additional Entitlement(s).
-5. Restrictions.
+5. Restrictions.
(a) The copies of Software provided to you under this Agreement are
licensed, not sold, to you by Sun. Sun reserves all rights not
@@ -190,20 +220,7 @@
interest in or to any trademark, service mark, logo or trade name of
Sun or its licensors is granted under this Agreement.
-6. Term and Termination.
-
-The license and service term are set forth in your Entitlement(s). Your
-rights under this Agreement will terminate immediately without notice
-from Sun if you materially breach it or take any action in derogation
-of Sun's and/or its licensors' rights to Software. Sun may terminate
-this Agreement should any Software become, or in Sun's reasonable
-opinion likely to become, the subject of a claim of intellectual
-property infringement or trade secret misappropriation. Upon
-termination, you will cease use of, and destroy, Software and confirm
-compliance in writing to Sun. Sections 1, 5, 6, 7, and 9-15 will
-survive termination of the Agreement.
-
-7. Java Compatibility and Open Source.
+6. Java Compatibility and Open Source.
Software may contain Java technology. You may not create additional
classes to, or modifications of, the Java technology, except under
@@ -223,6 +240,19 @@
liability provisions in this Agreement will apply to all Software in
this distribution.
+7. Term and Termination.
+
+The license and service term are set forth in your Entitlement(s). Your
+rights under this Agreement will terminate immediately without notice
+from Sun if you materially breach it or take any action in derogation
+of Sun's and/or its licensors' rights to Software. Sun may terminate
+this Agreement should any Software become, or in Sun's reasonable
+opinion likely to become, the subject of a claim of intellectual
+property infringement or trade secret misappropriation. Upon
+termination, you will cease use of, and destroy, Software and confirm
+compliance in writing to Sun. Sections 1, 5, 6, 7, and 9-15 will
+survive termination of the Agreement.
+
8. Limited Warranty.
Sun warrants to you that for a period of 90 days from the date of
@@ -306,3 +336,4 @@
Please contact Sun Microsystems, Inc. 4150 Network Circle, Santa Clara,
California 95054 if you have questions.
+
diff -r e542fc7b473f -r ba99ebe1e477 doc/release/distributionREADME.txt
--- a/doc/release/distributionREADME.txt Mon Nov 16 11:45:28 2009 -0800
+++ b/doc/release/distributionREADME.txt Mon Nov 16 17:08:13 2009 -0800
@@ -3,29 +3,32 @@
DISTRIBUTION BY DEVELOPERS. Subject to the terms and conditions of the
Software License Agreement and the obligations, restrictions, and
exceptions set forth below, You may reproduce and distribute the
-portions of Software identified below (each a "Redistributable"),
-provided that:
+portions of Software identified below ("each a Redistributable"),
+provided that You comply with the following (note that You may be
+entitled to reproduce and distribute other portions of the Software not
+defined here as a Redistributable under certain other licenses as
+described in the THIRDPARTYLICENSEREADME, if applicable):
-(a) you distribute the Redistributable complete and unmodified and only
+(a) You distribute the Redistributable complete and unmodified and only
bundled as part of Your applets and applications ("Programs"),
-(b) your Programs add significant and primary functionality to the
+(b) Your Programs add significant and primary functionality to the
Software
-(c) you distribute Redistributable for the sole purpose of running your
+(c) You distribute Redistributable for the sole purpose of running Your
Programs,
-(d) you do not distribute additional software intended to replace any
+(d) You do not distribute additional software intended to replace any
component(s) of the Redistributable,
-(e) you do not remove or alter any proprietary legends or notices
+(e) You do not remove or alter any proprietary legends or notices
contained in or on the Redistributable.
-(f) you only distribute the Redistributable subject to a license
+(f) You only distribute the Redistributable subject to a license
agreement that protects Sun's interests consistent with the terms
contained in the Software License Agreement, and
-(g) you agree to defend and indemnify Sun and its licensors from and
+(g) You agree to defend and indemnify Sun and its licensors from and
against any damages, costs, liabilities, settlement amounts and/or
expenses (including attorneys' fees) incurred in connection with any
claim, lawsuit or action by any third party that arises or results from
diff -r ba99ebe1e477 -r 200b5a729cff client/pom.xml
--- a/client/pom.xml Mon Nov 16 17:08:13 2009 -0800
+++ b/client/pom.xml Mon Nov 16 18:44:47 2009 -0800
@@ -42,7 +42,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.4.3-rc2</version>
+ <version>1.4.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r ba99ebe1e477 -r 200b5a729cff demo/pom.xml
--- a/demo/pom.xml Mon Nov 16 17:08:13 2009 -0800
+++ b/demo/pom.xml Mon Nov 16 18:44:47 2009 -0800
@@ -42,7 +42,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.4.3-rc2</version>
+ <version>1.4.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r ba99ebe1e477 -r 200b5a729cff dsn/pom.xml
--- a/dsn/pom.xml Mon Nov 16 17:08:13 2009 -0800
+++ b/dsn/pom.xml Mon Nov 16 18:44:47 2009 -0800
@@ -42,7 +42,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.4.3-rc2</version>
+ <version>1.4.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r ba99ebe1e477 -r 200b5a729cff imap/pom.xml
--- a/imap/pom.xml Mon Nov 16 17:08:13 2009 -0800
+++ b/imap/pom.xml Mon Nov 16 18:44:47 2009 -0800
@@ -42,7 +42,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>parent-distrib</artifactId>
- <version>1.4.3-rc2</version>
+ <version>1.4.3</version>
<relativePath>../parent-distrib/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff -r ba99ebe1e477 -r 200b5a729cff javadoc/pom.xml
--- a/javadoc/pom.xml Mon Nov 16 17:08:13 2009 -0800
+++ b/javadoc/pom.xml Mon Nov 16 18:44:47 2009 -0800
@@ -42,13 +42,13 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.4.3-rc2</version>
+ <version>1.4.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
<artifactId>javadoc</artifactId>
<packaging>pom</packaging>
- <version>1.4.3-rc2</version>
+ <version>1.4.3</version>
<name>JavaMail API javadocs</name>
<description>${project.name}</description>
diff -r ba99ebe1e477 -r 200b5a729cff logging/pom.xml
--- a/logging/pom.xml Mon Nov 16 17:08:13 2009 -0800
+++ b/logging/pom.xml Mon Nov 16 18:44:47 2009 -0800
@@ -42,7 +42,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.4.3-rc2</version>
+ <version>1.4.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
@@ -58,7 +58,7 @@
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>demo</artifactId>
- <version>1.4.3-rc2</version>
+ <version>1.4.3</version>
</dependency>
</dependencies>
</project>
diff -r ba99ebe1e477 -r 200b5a729cff mail/pom.xml
--- a/mail/pom.xml Mon Nov 16 17:08:13 2009 -0800
+++ b/mail/pom.xml Mon Nov 16 18:44:47 2009 -0800
@@ -42,7 +42,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.4.3-rc2</version>
+ <version>1.4.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>javax.mail</groupId>
diff -r ba99ebe1e477 -r 200b5a729cff mailapi/pom.xml
--- a/mailapi/pom.xml Mon Nov 16 17:08:13 2009 -0800
+++ b/mailapi/pom.xml Mon Nov 16 18:44:47 2009 -0800
@@ -42,7 +42,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.4.3-rc2</version>
+ <version>1.4.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>javax.mail</groupId>
diff -r ba99ebe1e477 -r 200b5a729cff mbox/dist/pom.xml
--- a/mbox/dist/pom.xml Mon Nov 16 17:08:13 2009 -0800
+++ b/mbox/dist/pom.xml Mon Nov 16 18:44:47 2009 -0800
@@ -42,7 +42,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.4.3-rc2</version>
+ <version>1.4.3</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff -r ba99ebe1e477 -r 200b5a729cff mbox/native/pom.xml
--- a/mbox/native/pom.xml Mon Nov 16 17:08:13 2009 -0800
+++ b/mbox/native/pom.xml Mon Nov 16 18:44:47 2009 -0800
@@ -42,7 +42,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.4.3-rc2</version>
+ <version>1.4.3</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff -r ba99ebe1e477 -r 200b5a729cff mbox/pom.xml
--- a/mbox/pom.xml Mon Nov 16 17:08:13 2009 -0800
+++ b/mbox/pom.xml Mon Nov 16 18:44:47 2009 -0800
@@ -42,7 +42,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.4.3-rc2</version>
+ <version>1.4.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r ba99ebe1e477 -r 200b5a729cff parent-distrib/pom.xml
--- a/parent-distrib/pom.xml Mon Nov 16 17:08:13 2009 -0800
+++ b/parent-distrib/pom.xml Mon Nov 16 18:44:47 2009 -0800
@@ -42,7 +42,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.4.3-rc2</version>
+ <version>1.4.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r ba99ebe1e477 -r 200b5a729cff pom.xml
--- a/pom.xml Mon Nov 16 17:08:13 2009 -0800
+++ b/pom.xml Mon Nov 16 18:44:47 2009 -0800
@@ -43,7 +43,7 @@
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
<packaging>pom</packaging>
- <version>1.4.3-rc2</version>
+ <version>1.4.3</version>
<name>JavaMail API distribution</name>
<description>${project.name}</description>
<url>
http://java.sun.com/projects/javamail</url>
@@ -69,9 +69,9 @@
</organization>
<properties>
- <mail.version>1.4.3-rc2</mail.version>
+ <mail.version>1.4.3</mail.version>
<!-- like mail.version, but with underscores instead of dots -->
- <mail.zipversion>1_4_3-rc2</mail.zipversion>
+ <mail.zipversion>1_4_3</mail.zipversion>
<mail.spec.version>1.4</mail.spec.version>
<activation-api.version>1.1</activation-api.version>
<!-- defaults that are overridden in mail module -->
diff -r ba99ebe1e477 -r 200b5a729cff pop3/pom.xml
--- a/pop3/pom.xml Mon Nov 16 17:08:13 2009 -0800
+++ b/pop3/pom.xml Mon Nov 16 18:44:47 2009 -0800
@@ -42,7 +42,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>parent-distrib</artifactId>
- <version>1.4.3-rc2</version>
+ <version>1.4.3</version>
<relativePath>../parent-distrib/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff -r ba99ebe1e477 -r 200b5a729cff servlet/pom.xml
--- a/servlet/pom.xml Mon Nov 16 17:08:13 2009 -0800
+++ b/servlet/pom.xml Mon Nov 16 18:44:47 2009 -0800
@@ -42,7 +42,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.4.3-rc2</version>
+ <version>1.4.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r ba99ebe1e477 -r 200b5a729cff smtp/pom.xml
--- a/smtp/pom.xml Mon Nov 16 17:08:13 2009 -0800
+++ b/smtp/pom.xml Mon Nov 16 18:44:47 2009 -0800
@@ -42,7 +42,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>parent-distrib</artifactId>
- <version>1.4.3-rc2</version>
+ <version>1.4.3</version>
<relativePath>../parent-distrib/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff -r ba99ebe1e477 -r 200b5a729cff taglib/pom.xml
--- a/taglib/pom.xml Mon Nov 16 17:08:13 2009 -0800
+++ b/taglib/pom.xml Mon Nov 16 18:44:47 2009 -0800
@@ -42,7 +42,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.4.3-rc2</version>
+ <version>1.4.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r ba99ebe1e477 -r 200b5a729cff webapp/pom.xml
--- a/webapp/pom.xml Mon Nov 16 17:08:13 2009 -0800
+++ b/webapp/pom.xml Mon Nov 16 18:44:47 2009 -0800
@@ -42,7 +42,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.4.3-rc2</version>
+ <version>1.4.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r 200b5a729cff -r b039458cfca9 .hgtags
--- a/.hgtags Mon Nov 16 18:44:47 2009 -0800
+++ b/.hgtags Mon Nov 16 18:45:14 2009 -0800
@@ -2,3 +2,4 @@
dfb709919353eec53e9dca61b379163186f4d154 1.4.2-beta
24c89d103755d49d62c67368cea5c13b39c2b399 JAVAMAIL-1_4_2
dfaa56e47386544f4002ade511f2cb0207107734 JAVAMAIL-1_4_3-RC1
+200b5a729cff286d1288b64287dc339233cd5040 JAVAMAIL-1_4_3
diff -r b039458cfca9 -r 1f3f699ed17a pom.xml
--- a/pom.xml Mon Nov 16 18:45:14 2009 -0800
+++ b/pom.xml Tue Nov 17 10:42:28 2009 -0800
@@ -418,4 +418,12 @@
<url>
http://download.java.net/maven/2/</url>
</repository>
</repositories>
+
+ <pluginRepositories>
+ <pluginRepository>
+ <id>glassfish-repo-archive</id>
+ <name>M2 repo for GlassFish project specific artifacts</name>
+ <url>
http://download.java.net/maven/glassfish/</url>
+ </pluginRepository>
+ </pluginRepositories>
</project>
diff -r 1f3f699ed17a -r 99a792c80c1b .hgtags
--- a/.hgtags Tue Nov 17 10:42:28 2009 -0800
+++ b/.hgtags Tue Nov 17 10:42:47 2009 -0800
@@ -3,3 +3,5 @@
24c89d103755d49d62c67368cea5c13b39c2b399 JAVAMAIL-1_4_2
dfaa56e47386544f4002ade511f2cb0207107734 JAVAMAIL-1_4_3-RC1
200b5a729cff286d1288b64287dc339233cd5040 JAVAMAIL-1_4_3
+200b5a729cff286d1288b64287dc339233cd5040 JAVAMAIL-1_4_3
+1f3f699ed17aa2c740eb09def5d83dd80671748a JAVAMAIL-1_4_3