camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [3/8] camel git commit: CAMEL-9433: Upgrade java mail with new maven coord.
Date Sun, 20 Dec 2015 07:00:07 GMT
CAMEL-9433: Upgrade java mail with new maven coord.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bfa79add
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bfa79add
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bfa79add

Branch: refs/heads/master
Commit: bfa79add0edd5f6d00353b3d7ca370383a27f349
Parents: 929d437
Author: Pascal Schumacher <pascalschumacher@gmx.net>
Authored: Sat Dec 19 11:19:12 2015 +0100
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Sun Dec 20 07:05:46 2015 +0100

----------------------------------------------------------------------
 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(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/bfa79add/components/camel-atom/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-atom/pom.xml b/components/camel-atom/pom.xml
index 3bf1b4b..cabe979 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>

http://git-wip-us.apache.org/repos/asf/camel/blob/bfa79add/components/camel-aws/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-aws/pom.xml b/components/camel-aws/pom.xml
index 426d135..fc40fed 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>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/bfa79add/components/camel-google-mail/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-google-mail/pom.xml b/components/camel-google-mail/pom.xml
index ff1af15..3ebb677 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 -->

http://git-wip-us.apache.org/repos/asf/camel/blob/bfa79add/tests/test-bundles/mock-javamail_1.7/pom.xml
----------------------------------------------------------------------
diff --git a/tests/test-bundles/mock-javamail_1.7/pom.xml b/tests/test-bundles/mock-javamail_1.7/pom.xml
index 36fec1d..7734684 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>


Mime
View raw message