Author: veithen
Date: Sun Oct  5 09:20:45 2008
New Revision: 701821

URL: http://svn.apache.org/viewvc?rev=701821&view=rev
Log:
Trying to fix a failure in the mail transport tests caused by an 
incompatibility with Geronimo's JavaMail implementation.

Modified:
    webservices/commons/trunk/modules/transport/modules/mail/pom.xml
    webservices/commons/trunk/modules/transport/modules/tests/pom.xml

Modified: webservices/commons/trunk/modules/transport/modules/mail/pom.xml
URL: 
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/mail/pom.xml?rev=701821&r1=701820&r2=701821&view=diff
==============================================================================
--- webservices/commons/trunk/modules/transport/modules/mail/pom.xml (original)
+++ webservices/commons/trunk/modules/transport/modules/mail/pom.xml Sun Oct  5 
09:20:45 2008
@@ -41,22 +41,7 @@
             <groupId>org.apache.axis2</groupId>
             <artifactId>axis2-transport-base</artifactId>
             <version>${axis2-transport-base.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-javamail_1.4_spec</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-activation_1.1_spec</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
-        <dependency>
-            <groupId>javax.mail</groupId>
-            <artifactId>mail</artifactId>
-            <version>1.4.1</version>
-        </dependency>            
     </dependencies>
 
     <properties>

Modified: webservices/commons/trunk/modules/transport/modules/tests/pom.xml
URL: 
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/tests/pom.xml?rev=701821&r1=701820&r2=701821&view=diff
==============================================================================
--- webservices/commons/trunk/modules/transport/modules/tests/pom.xml (original)
+++ webservices/commons/trunk/modules/transport/modules/tests/pom.xml Sun Oct  
5 09:20:45 2008
@@ -39,6 +39,25 @@
             <scope>test</scope>
         </dependency>
         <dependency>
+            <!-- Add axis2-kernel as an explicit dependency and exclude the
+                 Geronimo implementations of JavaMail and activation. They
+                 don't work well with the mail transport. -->
+            <groupId>org.apache.axis2</groupId>
+            <artifactId>axis2-kernel</artifactId>
+            <version>${pom.version}</version>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-javamail_1.4_spec</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-activation_1.1_spec</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
             <groupId>org.apache.axis2</groupId>
             <artifactId>axis2-transport-testkit</artifactId>
             <version>${pom.version}</version>


Reply via email to