Author: eric
Date: Wed Aug 15 15:22:58 2012
New Revision: 1373463

URL: http://svn.apache.org/viewvc?rev=1373463&view=rev
Log:
Upgrade to geronimo-javamail_1.4 1.8.3 and make replace geronimo profile 
instead with oracle-mail profile (JAMES-1433)

Modified:
    james/server/trunk/pom.xml

Modified: james/server/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=1373463&r1=1373462&r2=1373463&view=diff
==============================================================================
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Wed Aug 15 15:22:58 2012
@@ -94,11 +94,11 @@
         <hadoop.version>1.0.1</hadoop.version>
         <hbase.version>0.92.0</hbase.version>
         <imap.version>0.4-SNAPSHOT</imap.version>
+        <javax.mail.groupId>org.apache.geronimo.javamail</javax.mail.groupId>
+        
<javax.mail.artifactId>geronimo-javamail_1.4_mail</javax.mail.artifactId>
+        
<javax.activation.groupId>org.apache.geronimo.specs</javax.activation.groupId>
+        
<javax.activation.artifactId>geronimo-activation_1.1_spec</javax.activation.artifactId>
         <jackrabbit.version>2.2.5</jackrabbit.version>
-        <javax.activation.groupId>javax.activation</javax.activation.groupId>
-        <javax.activation.artifactId>activation</javax.activation.artifactId>
-        <javax.mail.groupId>javax.mail</javax.mail.groupId>
-        <javax.mail.artifactId>mail</javax.mail.artifactId>
         <jsieve.version>0.6-SNAPSHOT</jsieve.version>
         <mailbox.version>0.5-SNAPSHOT</mailbox.version>
         <mailet.version>2.4</mailet.version>
@@ -649,12 +649,12 @@
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-activation_1.1_spec</artifactId>
-                <version>1.0.2</version>
+                <version>1.1</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.javamail</groupId>
                 <artifactId>geronimo-javamail_1.4_mail</artifactId>
-                <version>1.6</version>
+                <version>1.8.3</version>
             </dependency>
             <dependency>
                 <groupId>commons-daemon</groupId>
@@ -1143,12 +1143,12 @@
 
     <profiles>
         <profile>
-            <id>geronimo</id>
+            <id>oracle-javamail</id>
             <properties>
-                
<javax.mail.groupId>org.apache.geronimo.javamail</javax.mail.groupId>
-                
<javax.mail.artifactId>geronimo-javamail_1.4_mail</javax.mail.artifactId>
-                
<javax.activation.groupId>org.apache.geronimo.specs</javax.activation.groupId>
-                
<javax.activation.artifactId>geronimo-activation_1.1_spec</javax.activation.artifactId>
+              
<javax.activation.groupId>javax.activation</javax.activation.groupId>
+              
<javax.activation.artifactId>activation</javax.activation.artifactId>
+              <javax.mail.groupId>javax.mail</javax.mail.groupId>
+              <javax.mail.artifactId>mail</javax.mail.artifactId>
             </properties>
         </profile>
     </profiles>



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

Reply via email to