Project: javamail
Repository: mercurial
Revision: 794
Author: shannon
Date: 2015-10-29 20:42:26 UTC
Link:
Log Message:
------------
Fixes for building with JDK 1.5
Upgrade maven-compiler-plugin
Oops, need to fix this one too.
Revisions:
----------
792
793
794
Modified Paths:
---------------
mail/pom.xml
mail/src/test/java/com/sun/mail/imap/IMAPUidExpungeTest.java
mail/src/test/java/javax/mail/internet/MailDateFormatTest.java
pom.xml
android/mail/pom.xml
mailapijar/pom.xml
parent-distrib/pom.xml
mailapi/pom.xml
Diffs:
------
diff -r 440c418a1f72 -r 2d7b45d1127e mail/pom.xml
--- a/mail/pom.xml Wed Oct 21 23:52:53 2015 -0700
+++ b/mail/pom.xml Mon Oct 26 09:56:49 2015 +0100
@@ -105,13 +105,13 @@
<configuration>
<source>1.5</source>
<target>1.5</target>
- <compilerArgs>
- <arg>-Xlint</arg>
+ <compilerArguments>
+ <Xlint/>
<!-- 1.5 is obsolete and will be removed in a future release -->
- <arg>-Xlint:-options</arg>
- <arg>-Xlint:-finally</arg>
- <arg>-Werror</arg>
- </compilerArgs>
+ <Xlint:-options/>
+ <Xlint:-finally/>
+ <Werror/>
+ </compilerArguments>
<showDeprecation>true</showDeprecation>
<showWarnings>true</showWarnings>
</configuration>
diff -r 440c418a1f72 -r 2d7b45d1127e mail/src/test/java/com/sun/mail/imap/IMAPUidExpungeTest.java
--- a/mail/src/test/java/com/sun/mail/imap/IMAPUidExpungeTest.java Wed Oct 21 23:52:53 2015 -0700
+++ b/mail/src/test/java/com/sun/mail/imap/IMAPUidExpungeTest.java Mon Oct 26 09:56:49 2015 +0100
@@ -79,7 +79,6 @@
public void testUIDSingle() {
testWithHandler(
new IMAPTest() {
- @Override
public void test(Folder folder, IMAPHandlerExpunge handler)
throws MessagingException {
Message m = ((UIDFolder)folder).getMessageByUID(2);
@@ -103,7 +102,6 @@
public void testUIDSingle2() {
testWithHandler(
new IMAPTest() {
- @Override
public void test(Folder folder, IMAPHandlerExpunge handler)
throws MessagingException {
Message m = ((UIDFolder)folder).getMessageByUID(2);
@@ -127,7 +125,6 @@
public void testUIDRange() {
testWithHandler(
new IMAPTest() {
- @Override
public void test(Folder folder, IMAPHandlerExpunge handler)
throws MessagingException {
Message[] msgs = ((UIDFolder)folder).getMessagesByUID(2, 4);
@@ -156,7 +153,6 @@
public void testUIDRange2() {
testWithHandler(
new IMAPTest() {
- @Override
public void test(Folder folder, IMAPHandlerExpunge handler)
throws MessagingException {
Message[] msgs = ((UIDFolder)folder).getMessagesByUID(2, 4);
@@ -185,7 +181,6 @@
public void testUIDRange3() {
testWithHandler(
new IMAPTest() {
- @Override
public void test(Folder folder, IMAPHandlerExpunge handler)
throws MessagingException {
Message[] msgs = ((UIDFolder)folder).getMessagesByUID(2, 4);
@@ -214,7 +209,6 @@
public void testUIDRange4() {
testWithHandler(
new IMAPTest() {
- @Override
public void test(Folder folder, IMAPHandlerExpunge handler)
throws MessagingException {
Message[] msgs = ((UIDFolder)folder).getMessagesByUID(1, 3);
@@ -245,7 +239,6 @@
public void testUIDRange5() {
testWithHandler(
new IMAPTest() {
- @Override
public void test(Folder folder, IMAPHandlerExpunge handler)
throws MessagingException {
Message[] msgs = ((UIDFolder)folder).getMessagesByUID(2, 4);
@@ -276,7 +269,6 @@
public void testUIDList() {
testWithHandler(
new IMAPTest() {
- @Override
public void test(Folder folder, IMAPHandlerExpunge handler)
throws MessagingException {
Message[] msgs = ((UIDFolder)folder).getMessagesByUID(
@@ -306,7 +298,6 @@
public void testUIDList2() {
testWithHandler(
new IMAPTest() {
- @Override
public void test(Folder folder, IMAPHandlerExpunge handler)
throws MessagingException {
Message[] msgs = ((UIDFolder)folder).getMessagesByUID(
@@ -336,7 +327,6 @@
public void testUIDList3() {
testWithHandler(
new IMAPTest() {
- @Override
public void test(Folder folder, IMAPHandlerExpunge handler)
throws MessagingException {
Message[] msgs = ((UIDFolder)folder).getMessagesByUID(
@@ -365,7 +355,6 @@
public void testUIDList4() {
testWithHandler(
new IMAPTest() {
- @Override
public void test(Folder folder, IMAPHandlerExpunge handler)
throws MessagingException {
Message[] msgs = ((UIDFolder)folder).getMessagesByUID(
@@ -397,7 +386,6 @@
public void testUIDList5() {
testWithHandler(
new IMAPTest() {
- @Override
public void test(Folder folder, IMAPHandlerExpunge handler)
throws MessagingException {
Message[] msgs = ((UIDFolder)folder).getMessagesByUID(
diff -r 440c418a1f72 -r 2d7b45d1127e mail/src/test/java/javax/mail/internet/MailDateFormatTest.java
--- a/mail/src/test/java/javax/mail/internet/MailDateFormatTest.java Wed Oct 21 23:52:53 2015 -0700
+++ b/mail/src/test/java/javax/mail/internet/MailDateFormatTest.java Mon Oct 26 09:56:49 2015 +0100
@@ -494,7 +494,7 @@
@Ignore("until the next spec change (1.6)")
public void mustProhibitSetDateFormatSymbols() {
SimpleDateFormat fmt = getStrict();
- fmt.setDateFormatSymbols(DateFormatSymbols.getInstance(Locale.FRENCH));
+ fmt.setDateFormatSymbols(new DateFormatSymbols(Locale.FRENCH));
Date date = mustPass(fmt, "1 Jan 2015 00:00:00 +0000");
assertThatDate(date, "jeu., 1 janv. 2015 00:00:00 +0000 (UTC)");
}
diff -r 440c418a1f72 -r 2d7b45d1127e pom.xml
--- a/pom.xml Wed Oct 21 23:52:53 2015 -0700
+++ b/pom.xml Mon Oct 26 09:56:49 2015 +0100
@@ -303,10 +303,10 @@
<compilerVersion>1.5</compilerVersion>
<source>1.5</source>
<target>1.5</target>
- <compilerArgs>
- <arg>-Xlint</arg>
- <arg>-Xlint:-finally</arg>
- </compilerArgs>
+ <compilerArguments combine.self="override">
+ <Xlint/>
+ <Xlint:-finally/>
+ </compilerArguments>
<showDeprecation>true</showDeprecation>
<showWarnings>true</showWarnings>
</configuration>
diff -r 2d7b45d1127e -r 2d460881a25d android/mail/pom.xml
--- a/android/mail/pom.xml Mon Oct 26 09:56:49 2015 +0100
+++ b/android/mail/pom.xml Thu Oct 29 20:45:30 2015 +0100
@@ -98,7 +98,7 @@
<execution>
<!-- download the binaries -->
<id>get-binaries</id>
- <phase>process-sources</phase>
+ <phase>compile</phase>
<goals>
<goal>unpack</goal>
</goals>
@@ -106,7 +106,7 @@
<execution>
<!-- download the sources -->
<id>get-sources</id>
- <phase>process-sources</phase>
+ <phase>compile</phase>
<goals>
<goal>unpack</goal>
</goals>
diff -r 2d7b45d1127e -r 2d460881a25d mail/pom.xml
--- a/mail/pom.xml Mon Oct 26 09:56:49 2015 +0100
+++ b/mail/pom.xml Thu Oct 29 20:45:30 2015 +0100
@@ -105,13 +105,13 @@
<configuration>
<source>1.5</source>
<target>1.5</target>
- <compilerArguments>
- <Xlint/>
+ <compilerArgs>
+ <arg>-Xlint</arg>
<!-- 1.5 is obsolete and will be removed in a future release -->
- <Xlint:-options/>
- <Xlint:-finally/>
- <Werror/>
- </compilerArguments>
+ <arg>-Xlint:-options</arg>
+ <arg>-Xlint:-finally</arg>
+ <arg>-Werror</arg>
+ </compilerArgs>
<showDeprecation>true</showDeprecation>
<showWarnings>true</showWarnings>
</configuration>
diff -r 2d7b45d1127e -r 2d460881a25d mailapijar/pom.xml
--- a/mailapijar/pom.xml Mon Oct 26 09:56:49 2015 +0100
+++ b/mailapijar/pom.xml Thu Oct 29 20:45:30 2015 +0100
@@ -83,7 +83,7 @@
<execution>
<!-- download the binaries -->
<id>get-binaries</id>
- <phase>process-sources</phase>
+ <phase>compile</phase>
<goals>
<goal>unpack</goal>
</goals>
@@ -91,7 +91,7 @@
<execution>
<!-- download the sources -->
<id>get-sources</id>
- <phase>process-sources</phase>
+ <phase>compile</phase>
<goals>
<goal>unpack</goal>
</goals>
diff -r 2d7b45d1127e -r 2d460881a25d parent-distrib/pom.xml
--- a/parent-distrib/pom.xml Mon Oct 26 09:56:49 2015 +0100
+++ b/parent-distrib/pom.xml Thu Oct 29 20:45:30 2015 +0100
@@ -68,7 +68,7 @@
<execution>
<!-- download the binaries -->
<id>get-binaries</id>
- <phase>process-sources</phase>
+ <phase>compile</phase>
<goals>
<goal>unpack</goal>
</goals>
@@ -76,7 +76,7 @@
<execution>
<!-- download the sources -->
<id>get-sources</id>
- <phase>process-sources</phase>
+ <phase>compile</phase>
<goals>
<goal>unpack</goal>
</goals>
diff -r 2d7b45d1127e -r 2d460881a25d pom.xml
--- a/pom.xml Mon Oct 26 09:56:49 2015 +0100
+++ b/pom.xml Thu Oct 29 20:45:30 2015 +0100
@@ -303,10 +303,10 @@
<compilerVersion>1.5</compilerVersion>
<source>1.5</source>
<target>1.5</target>
- <compilerArguments combine.self="override">
- <Xlint/>
- <Xlint:-finally/>
- </compilerArguments>
+ <compilerArgs combine.self="override">
+ <arg>-Xlint</arg>
+ <arg>-Xlint:-finally</arg>
+ </compilerArgs>
<showDeprecation>true</showDeprecation>
<showWarnings>true</showWarnings>
</configuration>
@@ -564,7 +564,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.4</version>
+ <version>3.3</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff -r 2d460881a25d -r 6e266e30cf4f mailapi/pom.xml
--- a/mailapi/pom.xml Thu Oct 29 20:45:30 2015 +0100
+++ b/mailapi/pom.xml Thu Oct 29 13:42:26 2015 -0700
@@ -85,7 +85,7 @@
<execution>
<!-- download the binaries -->
<id>get-binaries</id>
- <phase>process-sources</phase>
+ <phase>compile</phase>
<goals>
<goal>unpack</goal>
</goals>
@@ -93,7 +93,7 @@
<execution>
<!-- download the sources -->
<id>get-sources</id>
- <phase>process-sources</phase>
+ <phase>compile</phase>
<goals>
<goal>unpack</goal>
</goals>