You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pa...@apache.org on 2019/08/29 05:38:04 UTC
[camel] branch master updated: Revert "Upgrade JavaMail to version
1.6.4", because the update was incomplete.
This is an automated email from the ASF dual-hosted git repository.
pascalschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 506d78f Revert "Upgrade JavaMail to version 1.6.4", because the update was incomplete.
506d78f is described below
commit 506d78f1c702d62eda6491f6e35dae7a1269138f
Author: Pascal Schumacher <pa...@gmx.net>
AuthorDate: Thu Aug 29 07:37:45 2019 +0200
Revert "Upgrade JavaMail to version 1.6.4", because the update was incomplete.
This reverts commit 936d39760028dc663baa62984177968c24a871c4.
---
components/camel-mail/pom.xml | 6 +++---
parent/pom.xml | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/components/camel-mail/pom.xml b/components/camel-mail/pom.xml
index 09e72fa..ac4353c 100644
--- a/components/camel-mail/pom.xml
+++ b/components/camel-mail/pom.xml
@@ -49,13 +49,13 @@
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
- <artifactId>jakarta.mail</artifactId>
+ <artifactId>javax.mail</artifactId>
<version>${javax-mail-version}</version>
<exclusions>
<!-- javax activation is part of the JDK now -->
<exclusion>
- <groupId>com.sun.activation</groupId>
- <artifactId>jakarta.activation</artifactId>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
</exclusion>
</exclusions>
</dependency>
diff --git a/parent/pom.xml b/parent/pom.xml
index 93ed2a8..143e7b4 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -320,7 +320,7 @@
<javax-activation-version>1.2.0</javax-activation-version>
<javax-annotation-api-version>1.3.2</javax-annotation-api-version>
<javax-inject-bundle-version>1_2</javax-inject-bundle-version>
- <javax-mail-version>1.6.4</javax-mail-version>
+ <javax-mail-version>1.6.1</javax-mail-version>
<javax-servlet-api-version>3.1.0</javax-servlet-api-version>
<jaxb-bundle-version>2.3.1_1</jaxb-bundle-version>
<jakarta-api-version>2.1.5</jakarta-api-version>