Author: norman
Date: Tue Oct 25 15:41:48 2011
New Revision: 1188727
URL: http://svn.apache.org/viewvc?rev=1188727&view=rev
Log:
Use geronimo as a dependency for javamail instead of oracle javamail so that we
don't need "repositories" entry in pom. See PROTOCOLS-40
Modified:
james/protocols/trunk/lmtp/pom.xml
james/protocols/trunk/pom.xml
james/protocols/trunk/smtp/pom.xml
Modified: james/protocols/trunk/lmtp/pom.xml
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/lmtp/pom.xml?rev=1188727&r1=1188726&r2=1188727&view=diff
==============================================================================
--- james/protocols/trunk/lmtp/pom.xml (original)
+++ james/protocols/trunk/lmtp/pom.xml Tue Oct 25 15:41:48 2011
@@ -53,8 +53,8 @@
<artifactId>apache-mailet</artifactId>
</dependency>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
+ <groupId>org.apache.geronimo.javamail</groupId>
+ <artifactId>geronimo-javamail_1.4_mail</artifactId>
</dependency>
<dependency>
Modified: james/protocols/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/pom.xml?rev=1188727&r1=1188726&r2=1188727&view=diff
==============================================================================
--- james/protocols/trunk/pom.xml (original)
+++ james/protocols/trunk/pom.xml Tue Oct 25 15:41:48 2011
@@ -140,14 +140,14 @@
</exclusions>
</dependency>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <version>1.4.4</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ <version>1.0.2</version>
</dependency>
<dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <version>1.1.1</version>
+ <groupId>org.apache.geronimo.javamail</groupId>
+ <artifactId>geronimo-javamail_1.4_mail</artifactId>
+ <version>1.6</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
@@ -168,16 +168,6 @@
</dependencies>
</dependencyManagement>
- <repositories>
- <!-- needed for javamail -->
- <repository>
- <id>maven2-repository.dev.java.net</id>
- <name>Java.net Repository for Maven</name>
- <url>http://download.java.net/maven/2/</url>
- <layout>default</layout>
- </repository>
- </repositories>
-
<build>
<pluginManagement>
<plugins>
Modified: james/protocols/trunk/smtp/pom.xml
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/smtp/pom.xml?rev=1188727&r1=1188726&r2=1188727&view=diff
==============================================================================
--- james/protocols/trunk/smtp/pom.xml (original)
+++ james/protocols/trunk/smtp/pom.xml Tue Oct 25 15:41:48 2011
@@ -57,10 +57,9 @@
<artifactId>apache-mailet</artifactId>
</dependency>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
+ <groupId>org.apache.geronimo.javamail</groupId>
+ <artifactId>geronimo-javamail_1.4_mail</artifactId>
</dependency>
-
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
