From 79a2ad61ecef99de9618eadc9935568a2793e7f6 Mon Sep 17 00:00:00 2001
From: Pascal Schumacher <pascalschumacher@gmx.net>
Date: Sat, 19 Dec 2015 11:19:12 +0100
Subject: [PATCH 1/3] CAMEL-9433: Upgrade java mail with new maven coord.

---
 components/camel-atom/pom.xml                | 12 ++++++------
 components/camel-aws/pom.xml                 |  8 ++++----
 components/camel-google-mail/pom.xml         |  4 ++--
 tests/test-bundles/mock-javamail_1.7/pom.xml |  6 +++---
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/components/camel-atom/pom.xml b/components/camel-atom/pom.xml
index 3bf1b4b152e79..cabe979e37cec 100644
--- a/components/camel-atom/pom.xml
+++ b/components/camel-atom/pom.xml
@@ -76,8 +76,8 @@
       <version>${abdera-version}</version>
       <exclusions>
           <exclusion>
-              <groupId>javax.mail</groupId>
-              <artifactId>mail</artifactId>
+              <groupId>com.sun.mail</groupId>
+              <artifactId>javax.mail</artifactId>
           </exclusion>
           <exclusion>
               <groupId>xml-apis</groupId>
@@ -118,8 +118,8 @@
         <artifactId>axiom-api</artifactId>
         <exclusions>
             <exclusion>
-                <groupId>javax.mail</groupId>
-                <artifactId>mail</artifactId>
+                <groupId>com.sun.mail</groupId>
+                <artifactId>javax.mail</artifactId>
             </exclusion>
             <exclusion>
                 <groupId>xml-apis</groupId>
@@ -160,8 +160,8 @@
         <artifactId>axiom-impl</artifactId>
         <exclusions>
             <exclusion>
-                <groupId>javax.mail</groupId>
-                <artifactId>mail</artifactId>
+                <groupId>com.sun.mail</groupId>
+                <artifactId>javax.mail</artifactId>
             </exclusion>
             <exclusion>
                 <groupId>xml-apis</groupId>
diff --git a/components/camel-aws/pom.xml b/components/camel-aws/pom.xml
index 426d135ef0c08..fc40fed18426f 100644
--- a/components/camel-aws/pom.xml
+++ b/components/camel-aws/pom.xml
@@ -90,8 +90,8 @@
                     <artifactId>commons-codec</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>javax.mail</groupId>
-                    <artifactId>mail</artifactId>
+                    <groupId>com.sun.mail</groupId>
+                    <artifactId>javax.mail</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
@@ -119,8 +119,8 @@
             <artifactId>commons-codec</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.mail</groupId>
-            <artifactId>mail</artifactId>
+            <groupId>com.sun.mail</groupId>
+            <artifactId>javax.mail</artifactId>
             <version>${javax-mail-version}</version>
         </dependency>
 
diff --git a/components/camel-google-mail/pom.xml b/components/camel-google-mail/pom.xml
index ff1af158c845d..3ebb677b762b3 100644
--- a/components/camel-google-mail/pom.xml
+++ b/components/camel-google-mail/pom.xml
@@ -69,8 +69,8 @@
     </dependency>
 
     <dependency>
-        <groupId>javax.mail</groupId>
-        <artifactId>mail</artifactId>
+        <groupId>com.sun.mail</groupId>
+        <artifactId>javax.mail</artifactId>
         <version>${javax-mail-version}</version>
         <exclusions>
           <!-- javax activation is part of the JDK now -->
diff --git a/tests/test-bundles/mock-javamail_1.7/pom.xml b/tests/test-bundles/mock-javamail_1.7/pom.xml
index 36fec1d93a11e..7734684f66919 100644
--- a/tests/test-bundles/mock-javamail_1.7/pom.xml
+++ b/tests/test-bundles/mock-javamail_1.7/pom.xml
@@ -60,13 +60,13 @@
             <version>${pkgVersion}</version>
             <exclusions>
                  <exclusion>
-                     <groupId>com.sun.mail</groupId>
-                     <artifactId>javax.mail</artifactId>
+                     <groupId>javax.mail</groupId>
+                     <artifactId>mail</artifactId>
                  </exclusion>
             </exclusions>
         </dependency>
         <dependency>
-	    <groupId>com.sun.mail</groupId>
+            <groupId>com.sun.mail</groupId>
             <artifactId>javax.mail</artifactId>
             <version>${javax-mail-version}</version>
         </dependency>

From 9a165c35f3166ce108fd5da00e6cd913cfca08a3 Mon Sep 17 00:00:00 2001
From: Pascal Schumacher <pascalschumacher@gmx.net>
Date: Sat, 19 Dec 2015 18:01:12 +0100
Subject: [PATCH 2/3] aws-java-sdk does not have a (transitive) dependency on
 javax.mail anymore, so remove the exclusion

---
 components/camel-aws/pom.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/components/camel-aws/pom.xml b/components/camel-aws/pom.xml
index fc40fed18426f..28516d23990d7 100644
--- a/components/camel-aws/pom.xml
+++ b/components/camel-aws/pom.xml
@@ -89,10 +89,6 @@
                     <groupId>commons-codec</groupId>
                     <artifactId>commons-codec</artifactId>
                 </exclusion>
-                <exclusion>
-                    <groupId>com.sun.mail</groupId>
-                    <artifactId>javax.mail</artifactId>
-                </exclusion>
             </exclusions>
         </dependency>
         <dependency>

From d72867556830ea5e5430858a1c3bcf9f4aee6c98 Mon Sep 17 00:00:00 2001
From: Pascal Schumacher <pascalschumacher@gmx.net>
Date: Sat, 19 Dec 2015 18:03:28 +0100
Subject: [PATCH 3/3] axiom-api/axiom-impl do not have a (transitive)
 dependency on javax.mail anymore, but now use geronimo-javamail_1.4_spec so
 excluded that instead

abdera-parser does not have a (transitive) dependency on javax.mail anymore, so remove the exclusion
---
 components/camel-atom/pom.xml | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/components/camel-atom/pom.xml b/components/camel-atom/pom.xml
index cabe979e37cec..64f1bcbae62e5 100644
--- a/components/camel-atom/pom.xml
+++ b/components/camel-atom/pom.xml
@@ -75,10 +75,6 @@
       <artifactId>abdera-parser</artifactId>
       <version>${abdera-version}</version>
       <exclusions>
-          <exclusion>
-              <groupId>com.sun.mail</groupId>
-              <artifactId>javax.mail</artifactId>
-          </exclusion>
           <exclusion>
               <groupId>xml-apis</groupId>
               <artifactId>xml-apis</artifactId>
@@ -118,8 +114,8 @@
         <artifactId>axiom-api</artifactId>
         <exclusions>
             <exclusion>
-                <groupId>com.sun.mail</groupId>
-                <artifactId>javax.mail</artifactId>
+                <artifactId>geronimo-javamail_1.4_spec</artifactId>
+                <groupId>org.apache.geronimo.specs</groupId>
             </exclusion>
             <exclusion>
                 <groupId>xml-apis</groupId>
@@ -160,8 +156,8 @@
         <artifactId>axiom-impl</artifactId>
         <exclusions>
             <exclusion>
-                <groupId>com.sun.mail</groupId>
-                <artifactId>javax.mail</artifactId>
+                <artifactId>geronimo-javamail_1.4_spec</artifactId>
+                <groupId>org.apache.geronimo.specs</groupId>
             </exclusion>
             <exclusion>
                 <groupId>xml-apis</groupId>