You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by no...@apache.org on 2010/01/15 11:17:58 UTC
svn commit: r899584 - in /james/server/trunk:
core-library/src/test/java/org/apache/james/core/MimeMessageTest.java
pom.xml stage/javax.activation/ stage/javax.mail/ stage/pom.xml
Author: norman
Date: Fri Jan 15 10:17:58 2010
New Revision: 899584
URL: http://svn.apache.org/viewvc?rev=899584&view=rev
Log:
pull javamail from maven repository.
Upgrade javamail to 1.4.3 (JAMES-914)
Removed:
james/server/trunk/stage/javax.activation/
james/server/trunk/stage/javax.mail/
james/server/trunk/stage/pom.xml
Modified:
james/server/trunk/core-library/src/test/java/org/apache/james/core/MimeMessageTest.java
james/server/trunk/pom.xml
Modified: james/server/trunk/core-library/src/test/java/org/apache/james/core/MimeMessageTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/test/java/org/apache/james/core/MimeMessageTest.java?rev=899584&r1=899583&r2=899584&view=diff
==============================================================================
--- james/server/trunk/core-library/src/test/java/org/apache/james/core/MimeMessageTest.java (original)
+++ james/server/trunk/core-library/src/test/java/org/apache/james/core/MimeMessageTest.java Fri Jan 15 10:17:58 2010
@@ -146,6 +146,7 @@
+"------=_Part_0_XXXXXXXXXXX.XXXXXXXXXXX--\r\n";
}
+
protected String getMultipartMessageExpected2() {
return "Subject: test\r\n"
+"MIME-Version: 1.0\r\n"
@@ -166,8 +167,13 @@
+"second part =E8=E8\r\n"
+"------=_Part_0_XXXXXXXXXXX.XXXXXXXXXXX\r\n"
+"Subject: test3\r\n"
- +"Content-Transfer-Encoding: 7bit\r\n"
- +"Content-Type: text/plain; charset=us-ascii\r\n"
+
+ // javamail 1.4.3 NOTES:
+ // this headers don't get added by version 1.4.3
+ //which should be the right behavoir anyway
+ //+"Content-Transfer-Encoding: 7bit\r\n"
+ //+"Content-Type: text/plain; charset=us-ascii\r\n"
+
+"\r\n"
+"second part\r\n"
+"------=_Part_0_XXXXXXXXXXX.XXXXXXXXXXX--\r\n";
Modified: james/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=899584&r1=899583&r2=899584&view=diff
==============================================================================
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Fri Jan 15 10:17:58 2010
@@ -34,7 +34,6 @@
<inceptionYear>2002</inceptionYear>
<packaging>pom</packaging>
<modules>
- <module>stage</module>
<module>javamail-util</module>
<module>common-util</module>
<module>core-api</module>
@@ -77,6 +76,32 @@
<developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/james/server/trunk</developerConnection>
<url>http://svn.apache.org/viewcvs.cgi/james/server/trunk?root=Apache-SVN</url>
</scm>
+
+ <repositories>
+ <!-- local repos -->
+ <repository>
+ <id>module-local</id>
+ <name>Local Repository</name>
+ <url>file://stage</url>
+ <layout>legacy</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+
+ <!-- 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>
<plugins>
<plugin>
@@ -623,7 +648,7 @@
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
- <version>1.4.1</version>
+ <version>1.4.3</version>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org