Author: sgoeschl Date: Mon Feb 1 21:35:08 2016 New Revision: 1728012 URL: http://svn.apache.org/viewvc?rev=1728012&view=rev Log: [EMAIL-161] Remove "javax.activation" dependency
Modified: commons/proper/email/trunk/pom.xml commons/proper/email/trunk/src/changes/changes.xml commons/proper/email/trunk/src/test/java/org/apache/commons/mail/InvalidInternetAddressTest.java Modified: commons/proper/email/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/pom.xml?rev=1728012&r1=1728011&r2=1728012&view=diff ============================================================================== --- commons/proper/email/trunk/pom.xml (original) +++ commons/proper/email/trunk/pom.xml Mon Feb 1 21:35:08 2016 @@ -230,13 +230,7 @@ <dependency> <groupId>com.sun.mail</groupId> <artifactId>javax.mail</artifactId> - <version>1.5.2</version> - </dependency> - <!-- JAF is built-in to Java 6 --> - <dependency> - <groupId>javax.activation</groupId> - <artifactId>activation</artifactId> - <version>1.1.1</version> + <version>1.5.5</version> </dependency> <dependency> <groupId>junit</groupId> Modified: commons/proper/email/trunk/src/changes/changes.xml URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/src/changes/changes.xml?rev=1728012&r1=1728011&r2=1728012&view=diff ============================================================================== --- commons/proper/email/trunk/src/changes/changes.xml (original) +++ commons/proper/email/trunk/src/changes/changes.xml Mon Feb 1 21:35:08 2016 @@ -23,6 +23,9 @@ <body> <release version="1.5" date="2016-MM-DD"> + <action dev="sgoeschl" type="update" issue="EMAIL-161" date="2016-02-01"> + Remove "javax.activation" dependency since it is included in JDK 1.6 and update to javax.mail-1.5.5 + </action> <action dev="sgoeschl" type="add" issue="EMAIL-160" date="2016-02-01"> Add Support for International Domain Names. </action> Modified: commons/proper/email/trunk/src/test/java/org/apache/commons/mail/InvalidInternetAddressTest.java URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/java/org/apache/commons/mail/InvalidInternetAddressTest.java?rev=1728012&r1=1728011&r2=1728012&view=diff ============================================================================== --- commons/proper/email/trunk/src/test/java/org/apache/commons/mail/InvalidInternetAddressTest.java (original) +++ commons/proper/email/trunk/src/test/java/org/apache/commons/mail/InvalidInternetAddressTest.java Mon Feb 1 21:35:08 2016 @@ -66,7 +66,7 @@ public class InvalidInternetAddressTest "local.name@domain,com", "local.name@domain;com", "local.name@domain:com", - "local.name@domain[com", + // "local.name@domain[com", -- works for javamail-1.5.5 "local.name@domain]com", "local.name@domain\\com", "local.name@domain\tcom", @@ -222,13 +222,11 @@ public class InvalidInternetAddressTest } catch (final Exception ex) { - if (quoted || domainBracket) { fail("Validate " + i + " failed: " + ARR_INVALID_EMAILS[i] + " - " + ex.getMessage()); } - } }