Author: schuch
Date: Fri Dec 10 22:31:07 2021
New Revision: 1895797
URL: http://svn.apache.org/viewvc?rev=1895797&view=rev
Log:
CONNECTORS-1682: Update to use Javamail 1.6.2
Modified:
manifoldcf/trunk/CHANGES.txt
manifoldcf/trunk/build.xml
manifoldcf/trunk/connectors/email/pom.xml
manifoldcf/trunk/framework/build.xml
manifoldcf/trunk/framework/buildfiles/connector-build.xml
manifoldcf/trunk/framework/core/pom.xml
manifoldcf/trunk/pom.xml
Modified: manifoldcf/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1895797&r1=1895796&r2=1895797&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Fri Dec 10 22:31:07 2021
@@ -3,6 +3,10 @@ $Id$
======================= 2.21-dev =====================
+CONNECTORS-1682: Update to use JavaMail 1.6.2 to support TLS 1.2
+in email repository and notification connector.
+(Markus Schuch)
+
CONNECTORS-1683: Update to use Log4j 2.15.0
(Markus Schuch)
Modified: manifoldcf/trunk/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/build.xml?rev=1895797&r1=1895796&r2=1895797&view=diff
==============================================================================
--- manifoldcf/trunk/build.xml (original)
+++ manifoldcf/trunk/build.xml Fri Dec 10 22:31:07 2021
@@ -85,7 +85,7 @@
<property name="hamcrest.version" value="1.3"/>
<property name="log4j12.version" value="1.2.17"/>
<property name="log4j.version" value="2.15.0"/>
- <property name="mail.version" value="1.4.5"/>
+ <property name="mail.version" value="1.6.2"/>
<property name="mimepull.version" value="1.3"/>
<property name="opensaml.version" value="1.1"/>
<property name="osgi.version" value="5.0.0"/>
@@ -1907,9 +1907,9 @@ Use Apache Forrest version forrest-0.9-d
<target name="download-mail">
<mkdir dir="lib"/>
<antcall target="download-via-maven"><param name="target" value="lib"/>
- <param name="project-path" value="javax/mail"/>
+ <param name="project-path" value="com/sun/mail"/>
<param name="artifact-version" value="${mail.version}"/>
- <param name="artifact-name" value="mail"/>
+ <param name="artifact-name" value="javax.mail"/>
<param name="artifact-type" value="jar"/>
</antcall>
</target>
Modified: manifoldcf/trunk/connectors/email/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/email/pom.xml?rev=1895797&r1=1895796&r2=1895797&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/email/pom.xml (original)
+++ manifoldcf/trunk/connectors/email/pom.xml Fri Dec 10 22:31:07 2021
@@ -357,9 +357,9 @@
</dependency>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <version>1.4</version>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
+ <version>${mail.version}</version>
</dependency>
</dependencies>
Modified: manifoldcf/trunk/framework/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/build.xml?rev=1895797&r1=1895796&r2=1895797&view=diff
==============================================================================
--- manifoldcf/trunk/framework/build.xml (original)
+++ manifoldcf/trunk/framework/build.xml Fri Dec 10 22:31:07 2021
@@ -70,7 +70,7 @@
<include name="xercesImpl*.jar"/>
<include name="xml-apis*.jar"/>
<include name="velocity*.jar"/>
- <include name="mail*.jar"/>
+ <include name="javax.mail*.jar"/>
<include name="commons-exec*.jar"/>
<include name="gson*.jar"/>
<include name="guava*.jar"/>
@@ -523,7 +523,7 @@
<include name="xercesImpl*.jar"/>
<include name="xml-apis*.jar"/>
<include name="slf4j*.jar"/>
- <include name="mail*.jar"/>
+ <include name="javax.mail*.jar"/>
<include name="commons-exec*.jar"/>
<include name="gson*.jar"/>
<include name="guava*.jar"/>
@@ -572,7 +572,7 @@
<include name="xercesImpl*.jar"/>
<include name="xml-apis*.jar"/>
<include name="slf4j*.jar"/>
- <include name="mail*.jar"/>
+ <include name="javax.mail*.jar"/>
<include name="commons-exec*.jar"/>
<include name="gson*.jar"/>
<include name="guava*.jar"/>
@@ -627,7 +627,7 @@
<include name="xercesImpl*.jar"/>
<include name="xml-apis*.jar"/>
<include name="slf4j*.jar"/>
- <include name="mail*.jar"/>
+ <include name="javax.mail*.jar"/>
<include name="commons-exec*.jar"/>
<include name="gson*.jar"/>
<include name="guava*.jar"/>
@@ -677,7 +677,7 @@
<include name="xercesImpl*.jar"/>
<include name="xml-apis*.jar"/>
<include name="slf4j*.jar"/>
- <include name="mail*.jar"/>
+ <include name="javax.mail*.jar"/>
<include name="commons-exec*.jar"/>
<include name="gson*.jar"/>
<include name="guava*.jar"/>
@@ -735,7 +735,7 @@
<include name="xml-apis*.jar"/>
<include name="velocity*.jar"/>
<include name="slf4j*.jar"/>
- <include name="mail*.jar"/>
+ <include name="javax.mail*.jar"/>
<include name="commons-exec*.jar"/>
<include name="gson*.jar"/>
<include name="guava*.jar"/>
@@ -797,7 +797,7 @@
<include name="xml-apis*.jar"/>
<include name="velocity*.jar"/>
<include name="slf4j*.jar"/>
- <include name="mail*.jar"/>
+ <include name="javax.mail*.jar"/>
<include name="commons-exec*.jar"/>
<include name="gson*.jar"/>
<include name="guava*.jar"/>
@@ -867,7 +867,7 @@
<include name="xml-apis*.jar"/>
<include name="velocity*.jar"/>
<include name="slf4j*.jar"/>
- <include name="mail*.jar"/>
+ <include name="javax.mail*.jar"/>
<include name="commons-exec*.jar"/>
<include name="gson*.jar"/>
<include name="guava*.jar"/>
@@ -931,7 +931,7 @@
<include name="xml-apis*.jar"/>
<include name="velocity*.jar"/>
<include name="slf4j*.jar"/>
- <include name="mail*.jar"/>
+ <include name="javax.mail*.jar"/>
<include name="commons-exec*.jar"/>
<include name="gson*.jar"/>
<include name="guava*.jar"/>
@@ -1066,7 +1066,7 @@
<include name="xml-apis*.jar"/>
<include name="velocity*.jar"/>
<include name="slf4j*.jar"/>
- <include name="mail*.jar"/>
+ <include name="javax.mail*.jar"/>
<include name="commons-exec*.jar"/>
<include name="gson*.jar"/>
<include name="guava*.jar"/>
@@ -1327,7 +1327,7 @@
<include name="slf4j-simple*.jar"/>
<include name="httpcore*.jar"/>
<include name="httpclient*.jar"/>
- <include name="mail*.jar"/>
+ <include name="javax.mail*.jar"/>
<include name="commons-exec*.jar"/>
<include name="gson*.jar"/>
<include name="guava*.jar"/>
Modified: manifoldcf/trunk/framework/buildfiles/connector-build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/buildfiles/connector-build.xml?rev=1895797&r1=1895796&r2=1895797&view=diff
==============================================================================
--- manifoldcf/trunk/framework/buildfiles/connector-build.xml (original)
+++ manifoldcf/trunk/framework/buildfiles/connector-build.xml Fri Dec 10
22:31:07 2021
@@ -116,7 +116,7 @@
</fileset>
<fileset dir="${mcf-dist}/lib">
<include name="zookeeper*.jar"/>
- <include name="mail*.jar"/>
+ <include name="javax.mail*.jar"/>
<include name="commons-exec*.jar"/>
<include name="guava*.jar"/>
<include name="gson*.jar"/>
@@ -463,7 +463,7 @@
<include name="axis*.jar"/>
<include name="saaj*.jar"/>
<include name="wsdl*.jar"/>
- <include name="mail*.jar"/>
+ <include name="javax.mail*.jar"/>
<include name="activation*.jar"/>
<include name="commons-discovery*.jar"/>
</fileset>
Modified: manifoldcf/trunk/framework/core/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/core/pom.xml?rev=1895797&r1=1895796&r2=1895797&view=diff
==============================================================================
--- manifoldcf/trunk/framework/core/pom.xml (original)
+++ manifoldcf/trunk/framework/core/pom.xml Fri Dec 10 22:31:07 2021
@@ -149,8 +149,8 @@
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
<version>${mail.version}</version>
<scope>runtime</scope>
</dependency>
Modified: manifoldcf/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/pom.xml?rev=1895797&r1=1895796&r2=1895797&view=diff
==============================================================================
--- manifoldcf/trunk/pom.xml (original)
+++ manifoldcf/trunk/pom.xml Fri Dec 10 22:31:07 2021
@@ -51,7 +51,7 @@
<jetty.version>9.4.25.v20191220</jetty.version>
<jetty-jsp-jdt.version>2.3.3</jetty-jsp-jdt.version>
<jetty-schemas.version>3.1.M0</jetty-schemas.version>
- <mail.version>1.4.5</mail.version>
+ <mail.version>1.6.2</mail.version>
<activation.version>1.1.1</activation.version>
<axis.version>1.4</axis.version>
<wsdl4j.version>1.6.2</wsdl4j.version>
