Author: ningjiang
Date: Thu Feb 25 02:54:05 2010
New Revision: 916096
URL: http://svn.apache.org/viewvc?rev=916096&view=rev
Log:
CAMEL-2490 Applied patch with thanks to Christian
Modified:
camel/trunk/components/camel-mail/pom.xml
camel/trunk/parent/pom.xml
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
camel/trunk/platforms/karaf/pom.xml
Modified: camel/trunk/components/camel-mail/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/pom.xml?rev=916096&r1=916095&r2=916096&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/pom.xml (original)
+++ camel/trunk/components/camel-mail/pom.xml Thu Feb 25 02:54:05 2010
@@ -35,7 +35,7 @@
</properties>
<repositories>
- <!-- for jvnet mock-mail -->
+ <!-- for javax mail and jvnet mock-mail -->
<repository>
<id>java.net.m2</id>
<name>Java.net Repository for Maven</name>
@@ -59,8 +59,9 @@
<artifactId>spring-context-support</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.javax.mail</artifactId>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ <version>${javax-mail-version}</version>
</dependency>
<!-- testing -->
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=916096&r1=916095&r2=916096&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Thu Feb 25 02:54:05 2010
@@ -73,8 +73,7 @@
<httpcore4-version>4.0.1</httpcore4-version>
<httpclient4-version>4.0.1</httpclient4-version>
<httpclient-version>3.1</httpclient-version>
- <javamail-version>1.4.1</javamail-version>
- <javax-mail-version>1.4.1_2</javax-mail-version>
+ <javax-mail-version>1.4.3</javax-mail-version>
<jaxb-version>2.1.12</jaxb-version>
<jaxb-api-version>2.1</jaxb-api-version>
<jetty-version>6.1.22</jetty-version>
@@ -1106,13 +1105,6 @@
<version>${hsqldb-version}</version>
</dependency>
- <!-- optional JavaMail -->
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.javax.mail</artifactId>
- <version>${javax-mail-version}</version>
- </dependency>
-
<!-- optional SNMP4J -->
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
Modified: camel/trunk/platforms/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features.xml?rev=916096&r1=916095&r2=916096&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Thu
Feb 25 02:54:05 2010
@@ -66,7 +66,7 @@
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/${velocity-bundle-version}</bundle>
<bundle>mvn:org.apache.ws.commons.axiom/axiom-impl/${axiom-version}</bundle>
<bundle>mvn:org.apache.ws.commons.axiom/axiom-api/${axiom-version}</bundle>
-
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax.mail/${javax-mail-version}</bundle>
+ <bundle>mvn:javax.mail/mail/${javax-mail-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.neethi/${neethi-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.abdera/${abdera-bundle-version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jaxws_2.1_spec/${geronimo-jaxws-spec-version}</bundle>
@@ -315,7 +315,7 @@
<feature name='camel-mail' version='${pom.version}'>
<bundle>mvn:org.springframework/spring-context/${spring-version}</bundle>
<bundle>mvn:org.springframework/spring-context-support/${spring-version}</bundle>
-
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax.mail/${javax-mail-version}</bundle>
+ <bundle>mvn:javax.mail/mail/${javax-mail-version}</bundle>
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-mail/${pom.version}</bundle>
</feature>
Modified: camel/trunk/platforms/karaf/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/pom.xml?rev=916096&r1=916095&r2=916096&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/pom.xml (original)
+++ camel/trunk/platforms/karaf/pom.xml Thu Feb 25 02:54:05 2010
@@ -78,6 +78,14 @@
<enabled>false</enabled>
</snapshots>
</repository>
+
+ <!-- Java.net Repository for javax mail -->
+ <repository>
+ <id>java.net.m2</id>
+ <name>Java.net Repository for Maven</name>
+ <url>http://download.java.net/maven/2/</url>
+ <layout>default</layout>
+ </repository>
</repositories>
</project>
