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 2015/12/19 10:01:50 UTC
[2/2] camel git commit: CAMEL-9433: Upgrade java mail with new maven
coord. Closes #737
CAMEL-9433: Upgrade java mail with new maven coord. Closes #737
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b44997ac
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b44997ac
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b44997ac
Branch: refs/heads/master
Commit: b44997acc47cbf4ca528a87a7a690af1121e0072
Parents: 0249a4a
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Dec 19 10:01:32 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Dec 19 10:01:32 2015 +0100
----------------------------------------------------------------------
.../karaf/features/src/main/resources/features.xml | 12 ++++++------
tests/test-bundles/mock-javamail_1.7/pom.xml | 8 ++++----
2 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/b44997ac/platforms/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 81c7fce..4e8ac95 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -102,7 +102,7 @@
</feature>
<feature name='camel-atom' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
- <bundle dependency='true'>mvn:javax.mail/mail/${javax-mail-version}</bundle>
+ <bundle dependency='true'>mvn:com.sun.mail/javax.mail/${javax-mail-version}</bundle>
<bundle dependency='true'>mvn:org.apache.abdera/abdera-core/${abdera-version}</bundle>
<!--bundle dependency='true'>mvn:org.apache.abdera/abdera-extensions-json/${abdera-version}</bundle-->
<bundle dependency='true'>mvn:org.apache.abdera/abdera-extensions-main/${abdera-version}</bundle>
@@ -131,7 +131,7 @@
<bundle dependency='true'>mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}</bundle>
<bundle dependency='true'>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}</bundle>
<bundle dependency='true'>mvn:joda-time/joda-time/${jodatime2-bundle-version}</bundle>
- <bundle dependency='true'>mvn:javax.mail/mail/${javax-mail-version}</bundle>
+ <bundle dependency='true'>mvn:com.sun.mail/javax.mail/${javax-mail-version}</bundle>
<bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix-specs-version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle>
@@ -540,7 +540,7 @@
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient-bundle-version}</bundle>
<bundle dependency='true'>wrap:mvn:com.google.api-client/google-api-client/${google-api-client-version}</bundle>
- <bundle dependency='true'>mvn:javax.mail/mail/${javax-mail-version}</bundle>
+ <bundle dependency='true'>mvn:com.sun.mail/javax.mail/${javax-mail-version}</bundle>
<bundle dependency='true'>wrap:mvn:com.google.apis/google-api-services-gmail/${google-api-services-mail-version}</bundle>
<bundle dependency='true'>wrap:mvn:com.google.http-client/google-http-client/${google-api-client-version}</bundle>
<bundle dependency='true'>wrap:mvn:com.google.http-client/google-http-client-jackson2/${google-api-client-version}</bundle>
@@ -597,7 +597,7 @@
<bundle dependency="true">wrap:mvn:javax.servlet.jsp/jsp-api/2.1</bundle>
<feature>war</feature>
<bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle>
- <bundle dependency='true'>mvn:javax.mail/mail/${javax-mail-version}</bundle>
+ <bundle dependency='true'>mvn:com.sun.mail/javax.mail/${javax-mail-version}</bundle>
<bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/${commons-beanutils-bundle-version}</bundle>
<bundle dependency='true'>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
@@ -1001,7 +1001,7 @@
<bundle>mvn:org.apache.camel/camel-lucene/${project.version}</bundle>
</feature>
<feature name='camel-mail' version='${project.version}' resolver='(obr)' start-level='50'>
- <bundle dependency='true'>mvn:javax.mail/mail/${javax-mail-version}</bundle>
+ <bundle dependency='true'>mvn:com.sun.mail/javax.mail/${javax-mail-version}</bundle>
<feature version='${project.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-mail/${project.version}</bundle>
</feature>
@@ -1448,7 +1448,7 @@
<details>spring-ws doesn't support importing spring 4.x </details>
<feature>http</feature>
<feature version='${project.version}'>camel-spring</feature>
- <bundle dependency='true'>mvn:javax.mail/mail/${javax-mail-version}</bundle>
+ <bundle dependency='true'>mvn:com.sun.mail/javax.mail/${javax-mail-version}</bundle>
<bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version}</bundle>
<bundle dependency='true'>mvn:org.igniterealtime.smack/smack-core/${smack-version}</bundle>
<bundle dependency='true'>mvn:org.igniterealtime.smack/smack-tcp/${smack-version}</bundle>
http://git-wip-us.apache.org/repos/asf/camel/blob/b44997ac/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 0d6c1de..36fec1d 100644
--- a/tests/test-bundles/mock-javamail_1.7/pom.xml
+++ b/tests/test-bundles/mock-javamail_1.7/pom.xml
@@ -60,14 +60,14 @@
<version>${pkgVersion}</version>
<exclusions>
<exclusion>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
<version>${javax-mail-version}</version>
</dependency>
</dependencies>