You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2012/06/06 12:27:10 UTC

svn commit: r1346812 - in /camel/branches/camel-2.9.x: ./ components/camel-mail/pom.xml

Author: davsclaus
Date: Wed Jun  6 10:27:10 2012
New Revision: 1346812

URL: http://svn.apache.org/viewvc?rev=1346812&view=rev
Log:
CAMEL-5339: Exclude javax actication from dependency as its embedded in the JVM/JDK now.

Modified:
    camel/branches/camel-2.9.x/   (props changed)
    camel/branches/camel-2.9.x/components/camel-mail/pom.xml

Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
  Merged /camel/trunk:r1346811

Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: camel/branches/camel-2.9.x/components/camel-mail/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-mail/pom.xml?rev=1346812&r1=1346811&r2=1346812&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-mail/pom.xml (original)
+++ camel/branches/camel-2.9.x/components/camel-mail/pom.xml Wed Jun  6 10:27:10 2012
@@ -44,6 +44,13 @@
             <groupId>javax.mail</groupId>
             <artifactId>mail</artifactId>
             <version>${javax-mail-version}</version>
+            <exclusions>
+              <!-- javax activation is part of the JDK now -->
+              <exclusion>
+                <groupId>javax.activation</groupId>
+                <artifactId>activation</artifactId>
+              </exclusion>
+            </exclusions>
         </dependency>
 
         <!-- testing -->