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 11:26:42 UTC
svn commit: r917447 - in /servicemix/smx4/nmr/trunk: ./ assembly/
assembly/src/main/filtered-resources/ jbi/itests/
jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/
Author: jbonofre
Date: Mon Mar 1 10:26:42 2010
New Revision: 917447
URL: http://svn.apache.org/viewvc?rev=917447&view=rev
Log:
[SMX4-492] Upgrade to use JavaMail 1.4.3.
Modified:
servicemix/smx4/nmr/trunk/assembly/pom.xml
servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/features.xml
servicemix/smx4/nmr/trunk/jbi/itests/pom.xml
servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/IntegrationTest.java
servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/ManagementTest.java
servicemix/smx4/nmr/trunk/pom.xml
Modified: servicemix/smx4/nmr/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/assembly/pom.xml?rev=917447&r1=917446&r2=917447&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/assembly/pom.xml Mon Mar 1 10:26:42 2010
@@ -162,8 +162,8 @@
<artifactId>org.apache.servicemix.specs.activation-api-1.1</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.javax.mail</artifactId>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
Modified: servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/features.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/features.xml?rev=917447&r1=917446&r2=917447&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/features.xml (original)
+++ servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/features.xml Mon Mar 1 10:26:42 2010
@@ -54,7 +54,7 @@
<feature version="${version}">transaction</feature>
<feature version="${version}">nmr</feature>
<bundle>mvn:org.apache.xbean/xbean-classloader/${xbean.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.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix.specs.version}</bundle>
<bundle>mvn:org.codehaus.woodstox/stax2-api/${woodstox.stax2api.version}</bundle>
<bundle>mvn:org.codehaus.woodstox/woodstox-core-asl/${woodstox.version}</bundle>
Modified: servicemix/smx4/nmr/trunk/jbi/itests/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/itests/pom.xml?rev=917447&r1=917446&r2=917447&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/itests/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/itests/pom.xml Mon Mar 1 10:26:42 2010
@@ -213,8 +213,8 @@
<artifactId>geronimo-jta_1.1_spec</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.javax.mail</artifactId>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</dependency>
<dependency>
<groupId>org.apache.servicemix.specs</groupId>
Modified: servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/IntegrationTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/IntegrationTest.java?rev=917447&r1=917446&r2=917447&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/IntegrationTest.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/IntegrationTest.java Mon Mar 1 10:26:42 2010
@@ -287,7 +287,7 @@
mavenBundle("org.apache.xbean", "xbean-naming"),
mavenBundle("org.apache.servicemix.naming", "org.apache.servicemix.naming"),
mavenBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.ant"),
- mavenBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.javax.mail"),
+ mavenBundle("javax.mail", "mail"),
mavenBundle("org.codehaus.woodstox", "stax2-api"),
mavenBundle("org.codehaus.woodstox", "woodstox-core-asl"),
mavenBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.wsdl4j"),
Modified: servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/ManagementTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/ManagementTest.java?rev=917447&r1=917446&r2=917447&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/ManagementTest.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/ManagementTest.java Mon Mar 1 10:26:42 2010
@@ -303,7 +303,7 @@
mavenBundle("org.apache.xbean", "xbean-naming"),
mavenBundle("org.apache.servicemix.naming", "org.apache.servicemix.naming"),
mavenBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.ant"),
- mavenBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.javax.mail"),
+ mavenBundle("javax.mail", "mail"),
mavenBundle("org.codehaus.woodstox", "stax2-api"),
mavenBundle("org.codehaus.woodstox", "woodstox-core-asl"),
mavenBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.wsdl4j"),
Modified: servicemix/smx4/nmr/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/pom.xml?rev=917447&r1=917446&r2=917447&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/pom.xml Mon Mar 1 10:26:42 2010
@@ -107,7 +107,7 @@
<geronimo.transaction.version>2.1.3</geronimo.transaction.version>
<howl.version>1.0.1-1_1</howl.version>
<hsqldb.version>1.8.0.7</hsqldb.version>
- <javax.mail.version>1.4.1_2</javax.mail.version>
+ <javax.mail.version>1.4.3</javax.mail.version>
<jencks.version>2.2</jencks.version>
<jline.version>0.9.94</jline.version>
<junit.version>3.8.2_1</junit.version>
@@ -188,6 +188,18 @@
<enabled>false</enabled>
</snapshots>
</repository>
+ <!-- for javax.mail -->
+ <repository>
+ <id>java.net</id>
+ <name>Java.net Maven Repository</name>
+ <url>http://download.java.net/maven/2/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
</repositories>
<dependencies>
@@ -442,8 +454,8 @@
<version>${servicemix.specs.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>