[EMAIL-161] Remove "javax.activation" dependency
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/email/trunk@1728012 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pom.xml b/pom.xml
index 07f41ea..9aed481 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index ec4626b..48afa33 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -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>
diff --git a/src/test/java/org/apache/commons/mail/InvalidInternetAddressTest.java b/src/test/java/org/apache/commons/mail/InvalidInternetAddressTest.java
index 3e67b0c..4bdcc3b 100644
--- a/src/test/java/org/apache/commons/mail/InvalidInternetAddressTest.java
+++ b/src/test/java/org/apache/commons/mail/InvalidInternetAddressTest.java
@@ -66,7 +66,7 @@
"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 @@
}
catch (final Exception ex)
{
-
if (quoted || domainBracket)
{
fail("Validate " + i + " failed: " + ARR_INVALID_EMAILS[i]
+ " - " + ex.getMessage());
}
-
}
}
