Skip to content

Commit c46dd6a

Browse files
committed
Replace java mail with jakarta mail (elastic#40088)
The eclipse foundation has taken over the javax mail dependency, which resulted in a naming change of the dependency.
1 parent 1d8b5fc commit c46dd6a

7 files changed

+689
-761
lines changed

x-pack/plugin/watcher/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ dependencies {
3636
// watcher deps
3737
compile 'com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:r239'
3838
compile 'com.google.guava:guava:16.0.1' // needed by watcher for the html sanitizer and security tests for jimfs
39-
compile 'com.sun.mail:javax.mail:1.6.2'
39+
compile 'com.sun.mail:jakarta.mail:1.6.3'
4040
// HACK: java 9 removed javax.activation from the default modules, so instead of trying to add modules, which would have
4141
// to be conditionalized for java 8/9, we pull in the classes directly
4242
compile 'javax.activation:activation:1.1.1'
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
787e007e377223bba85a33599d3da416c135f99b

x-pack/plugin/watcher/licenses/jakarta.mail-LICENSE.txt

Lines changed: 637 additions & 0 deletions
Large diffs are not rendered by default.
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
# Notices for Eclipse Project for JavaMail
2+
3+
This content is produced and maintained by the Eclipse Project for JavaMail
4+
project.
5+
6+
* Project home: https://projects.eclipse.org/projects/ee4j.javamail
7+
8+
## Trademarks
9+
10+
Eclipse Project for JavaMail is a trademark of the Eclipse Foundation.
11+
12+
## Copyright
13+
14+
All content is the property of the respective authors or their employers. For
15+
more information regarding authorship of content, please consult the listed
16+
source code repository logs.
17+
18+
## Declared Project Licenses
19+
20+
This program and the accompanying materials are made available under the terms
21+
of the Eclipse Public License v. 2.0 which is available at
22+
http://www.eclipse.org/legal/epl-2.0. This Source Code may also be made
23+
available under the following Secondary Licenses when the conditions for such
24+
availability set forth in the Eclipse Public License v. 2.0 are satisfied: GNU
25+
General Public License, version 2 with the GNU Classpath Exception which is
26+
available at https://www.gnu.org/software/classpath/license.html.
27+
28+
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
29+
30+
## Source Code
31+
32+
The project maintains the following source code repositories:
33+
34+
* https://github.com/eclipse-ee4j/javamail
35+
36+
## Third-party Content
37+
38+
This project leverages the following third party content.
39+
40+
None
41+
42+
## Cryptography
43+
44+
Content may contain encryption software. The country in which you are currently
45+
may have restrictions on the import, possession, and use, and/or re-export to
46+
another country, of encryption software. BEFORE using any encryption software,
47+
please check the country's laws, regulations and policies concerning the import,
48+
possession, or use, and re-export of encryption software, to see if this is
49+
permitted.
50+

x-pack/plugin/watcher/licenses/javax.mail-1.6.2.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.

x-pack/plugin/watcher/licenses/javax.mail-LICENSE.txt

Lines changed: 0 additions & 759 deletions
This file was deleted.

x-pack/plugin/watcher/licenses/javax.mail-NOTICE.txt

Whitespace-only changes.

0 commit comments

Comments
 (0)