You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by jb...@apache.org on 2010/03/01 18:30:12 UTC
svn commit: r917604 - in /servicemix/smx4/features/trunk: ./ assembly/
assembly/src/main/filtered-resources/ examples/itests/tests/
examples/itests/tests/src/test/java/org/apache/servicemix/examples/
Author: jbonofre
Date: Mon Mar 1 17:30:12 2010
New Revision: 917604
URL: http://svn.apache.org/viewvc?rev=917604&view=rev
Log:
[SMX4-492] Upgrade to use JavaMail 1.4.3.
Modified:
servicemix/smx4/features/trunk/assembly/pom.xml
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
servicemix/smx4/features/trunk/examples/itests/tests/pom.xml
servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java
servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
servicemix/smx4/features/trunk/pom.xml
Modified: servicemix/smx4/features/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/pom.xml?rev=917604&r1=917603&r2=917604&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/features/trunk/assembly/pom.xml Mon Mar 1 17:30:12 2010
@@ -455,8 +455,8 @@
<version>${geronimo.transaction.version}</version>
</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>
<dependency>
Modified: servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml?rev=917604&r1=917603&r2=917604&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml Mon Mar 1 17:30:12 2010
@@ -59,7 +59,7 @@
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${servicemix.specs.version}</bundle>
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-${jaxb.api.version}/${servicemix.specs.version}</bundle>
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-${jaxws.api.version}/${servicemix.specs.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.asm/${asm.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.fastinfoset/${fastinfoset.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-impl/${jaxb.impl.version}</bundle>
@@ -221,7 +221,7 @@
<feature name="servicemix-mail" version="${servicemix-mail-version}">
<feature version="${servicemix-shared-version}">servicemix-shared</feature>
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix.specs.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/servicemix-mail/${servicemix-mail-version}</bundle>
</feature>
<feature name="servicemix-bean" version="${servicemix-bean-version}">
Modified: servicemix/smx4/features/trunk/examples/itests/tests/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/tests/pom.xml?rev=917604&r1=917603&r2=917604&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/tests/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/itests/tests/pom.xml Mon Mar 1 17:30:12 2010
@@ -274,8 +274,8 @@
<version>${geronimo.annotation.version}</version>
</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>
<dependency>
Modified: servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java?rev=917604&r1=917603&r2=917604&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java (original)
+++ servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java Mon Mar 1 17:30:12 2010
@@ -102,7 +102,7 @@
getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.xalan"),
getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.xmlsec"),
getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.jetty-bundle"),
- getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.javax.mail"),
+ getBundle("javax.mail", "mail"),
getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.commons-codec"),
getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.abdera"),
getBundle("org.codehaus.jettison", "jettison"),
Modified: servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java?rev=917604&r1=917603&r2=917604&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java (original)
+++ servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java Mon Mar 1 17:30:12 2010
@@ -125,7 +125,7 @@
getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.xalan"),
getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.xmlsec"),
getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.jetty-bundle"),
- getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.javax.mail"),
+ getBundle("javax.mail", "mail"),
getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.commons-codec"),
getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.commons-httpclient"),
getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.abdera"),
Modified: servicemix/smx4/features/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=917604&r1=917603&r2=917604&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Mon Mar 1 17:30:12 2010
@@ -140,7 +140,7 @@
<jaxb.impl.version>2.1.12_1</jaxb.impl.version>
<jaxws.api.version>2.1</jaxws.api.version>
<jaxrs.api.version>1.0</jaxrs.api.version>
- <javax.mail.version>1.4.1_2</javax.mail.version>
+ <javax.mail.version>1.4.3</javax.mail.version>
<jcr-api.version>1.0_2</jcr-api.version>
<jdt.core.version>3.2.3_2</jdt.core.version>
<jdom.version>1.1_2</jdom.version>