You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2009/08/17 05:24:47 UTC
svn commit: r804835 - in /camel/trunk: components/camel-mail/pom.xml
parent/pom.xml
Author: ningjiang
Date: Mon Aug 17 03:24:44 2009
New Revision: 804835
URL: http://svn.apache.org/viewvc?rev=804835&view=rev
Log:
Let camel-mail dependent on spring javax.mail bundle
Modified:
camel/trunk/components/camel-mail/pom.xml
camel/trunk/parent/pom.xml
Modified: camel/trunk/components/camel-mail/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/pom.xml?rev=804835&r1=804834&r2=804835&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/pom.xml (original)
+++ camel/trunk/components/camel-mail/pom.xml Mon Aug 17 03:24:44 2009
@@ -42,6 +42,12 @@
<url>http://download.java.net/maven/2/</url>
<layout>default</layout>
</repository>
+ <!-- for java mail bundle -->
+ <repository>
+ <id>com.springsource.repository.bundles.external</id>
+ <name>SpringSource Enterprise Bundle Repository - External Bundle Releases</name>
+ <url>http://repository.springsource.com/maven/bundles/external</url>
+ </repository>
</repositories>
<dependencies>
@@ -60,22 +66,10 @@
</dependency>
<dependency>
<groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
+ <artifactId>com.springsource.javax.mail</artifactId>
<version>${javamail-version}</version>
</dependency>
- <!-- these 2 jars are buggy and not recommended to use -->
- <!--dependency>
- <groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.javamail-api-1.4</artifactId>
- <version>1.3.0</version>
- </dependency-->
- <!--dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javamail_1.4_spec</artifactId>
- <version>1.6</version>
- </dependency-->
-
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
@@ -87,6 +81,12 @@
<groupId>org.jvnet.mock-javamail</groupId>
<artifactId>mock-javamail</artifactId>
<version>1.7</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ </exclusion>
+ </exclusions>
<scope>test</scope>
</dependency>
<dependency>
@@ -106,4 +106,4 @@
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=804835&r1=804834&r2=804835&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Mon Aug 17 03:24:44 2009
@@ -80,7 +80,7 @@
<xbean-spring-version>3.5</xbean-spring-version>
<xstream-version>1.3.1</xstream-version>
<xmlsec-version>1.4.2</xmlsec-version>
- <javamail-version>1.4.2</javamail-version>
+ <javamail-version>1.4.1</javamail-version>
<xerces-version>2.8.0</xerces-version>
<xalan-version>2.7.1</xalan-version>