Merge pull request #668 from darkv/javamail_update

use current JavaMail release
wocommunity · Aug 12, 2015 · 6dcb347 · 6dcb347
2 parents f31c829 + 67ece87
commit 6dcb347
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 21 deletions.
diff --git a/Frameworks/Core/ERJavaMail/.classpath b/Frameworks/Core/ERJavaMail/.classpath
@@ -4,11 +4,16 @@
 	<classpathentry kind="src" path="Tests"/>
 	<classpathentry exported="true" kind="lib" path="Libraries/activation-1.1.1.jar"/>
 	<classpathentry kind="lib" path="Libraries/mockmail.jar"/>
-	<classpathentry exported="true" kind="lib" path="Libraries/dsn-1.4.5.jar"/>
-	<classpathentry exported="true" kind="lib" path="Libraries/imap-1.4.5.jar"/>
-	<classpathentry exported="true" kind="lib" path="Libraries/mailapi-1.4.5.jar"/>
-	<classpathentry exported="true" kind="lib" path="Libraries/pop3-1.4.5.jar"/>
-	<classpathentry exported="true" kind="lib" path="Libraries/smtp-1.4.5.jar"/>
+	<classpathentry exported="true" kind="lib" path="Libraries/javax.mail-1.5.4.jar" sourcepath="LibrarySources/javax.mail-1.5.4-sources.jar">
+		<attributes>
+			<attribute name="javadoc_location" value="jar:platform:/resource/ERJavaMail/LibraryJavadocs/javax.mail-1.5.4-javadoc.jar!/"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry exported="true" kind="lib" path="Libraries/dsn-1.5.4.jar" sourcepath="LibrarySources/dsn-1.5.4-sources.jar">
+		<attributes>
+			<attribute name="javadoc_location" value="jar:platform:/resource/ERJavaMail/LibraryJavadocs/dsn-1.5.4-javadoc.jar!/"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="WOFramework/ERExtensions"/>
 	<classpathentry kind="con" path="WOFramework/ERJars"/>
 	<classpathentry kind="con" path="WOFramework/JavaEOAccess"/>

diff --git a/Frameworks/Core/ERJavaMail/Libraries/dsn-1.4.5.jar b/Frameworks/Core/ERJavaMail/Libraries/dsn-1.4.5.jar
diff --git a/Frameworks/Core/ERJavaMail/Libraries/dsn-1.5.4.jar b/Frameworks/Core/ERJavaMail/Libraries/dsn-1.5.4.jar
diff --git a/Frameworks/Core/ERJavaMail/Libraries/imap-1.4.5.jar b/Frameworks/Core/ERJavaMail/Libraries/imap-1.4.5.jar
diff --git a/Frameworks/Core/ERJavaMail/Libraries/javax.mail-1.5.4.jar b/Frameworks/Core/ERJavaMail/Libraries/javax.mail-1.5.4.jar
diff --git a/Frameworks/Core/ERJavaMail/Libraries/mailapi-1.4.5.jar b/Frameworks/Core/ERJavaMail/Libraries/mailapi-1.4.5.jar
diff --git a/Frameworks/Core/ERJavaMail/Libraries/pop3-1.4.5.jar b/Frameworks/Core/ERJavaMail/Libraries/pop3-1.4.5.jar
diff --git a/Frameworks/Core/ERJavaMail/Libraries/smtp-1.4.5.jar b/Frameworks/Core/ERJavaMail/Libraries/smtp-1.4.5.jar
diff --git a/Frameworks/Core/ERJavaMail/LibraryJavadocs/dsn-1.5.4-javadoc.jar b/Frameworks/Core/ERJavaMail/LibraryJavadocs/dsn-1.5.4-javadoc.jar
diff --git a/Frameworks/Core/ERJavaMail/LibraryJavadocs/javax.mail-1.5.4-javadoc.jar b/Frameworks/Core/ERJavaMail/LibraryJavadocs/javax.mail-1.5.4-javadoc.jar
diff --git a/Frameworks/Core/ERJavaMail/LibrarySources/dsn-1.5.4-sources.jar b/Frameworks/Core/ERJavaMail/LibrarySources/dsn-1.5.4-sources.jar
diff --git a/Frameworks/Core/ERJavaMail/LibrarySources/javax.mail-1.5.4-sources.jar b/Frameworks/Core/ERJavaMail/LibrarySources/javax.mail-1.5.4-sources.jar
diff --git a/Frameworks/Core/ERJavaMail/pom.xml b/Frameworks/Core/ERJavaMail/pom.xml
@@ -38,28 +38,15 @@
 			<groupId>javax.activation</groupId>
 			<artifactId>activation</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>javax.mail</groupId>
-			<artifactId>mail</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>com.sun.mail</groupId>
-			<artifactId>imap</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>com.sun.mail</groupId>
-			<artifactId>smtp</artifactId>
-			<optional>true</optional>
+			<artifactId>javax.mail</artifactId>
+			<version>1.5.4</version>
 		</dependency>
 		<dependency>
 			<groupId>com.sun.mail</groupId>
 			<artifactId>dsn</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>com.sun.mail</groupId>
-			<artifactId>pop3</artifactId>
+			<version>1.5.4</version>
 			<optional>true</optional>
 		</dependency>
 		<dependency>