Skip to content

Commit 26ea5ef

Browse files
authored
Replace javax activation with jakarta activation (#40247)
The eclipse foundation has taken over the javax.activation dependency, which resulted in a naming change of the dependency.
1 parent 8d5b75e commit 26ea5ef

File tree

7 files changed

+65
-124
lines changed

7 files changed

+65
-124
lines changed

x-pack/plugin/watcher/build.gradle

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,9 @@ dependencies {
3535

3636
// watcher deps
3737
compile 'com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:r239'
38-
compile 'com.google.guava:guava:16.0.1' // needed by watcher for the html sanitizer and security tests for jimfs
38+
compile 'com.google.guava:guava:16.0.1' // needed by watcher for the html sanitizer
3939
compile 'com.sun.mail:jakarta.mail:1.6.3'
40-
// HACK: java 9 removed javax.activation from the default modules, so instead of trying to add modules, which would have
41-
// to be conditionalized for java 8/9, we pull in the classes directly
42-
compile 'javax.activation:activation:1.1.1'
40+
compile 'com.sun.activation:jakarta.activation:1.2.1'
4341
compileOnly "org.apache.httpcomponents:httpclient:${versions.httpclient}"
4442
compileOnly "org.apache.httpcomponents:httpcore:${versions.httpcore}"
4543

x-pack/plugin/watcher/licenses/activation-1.1.1.jar.sha1

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

x-pack/plugin/watcher/licenses/activation-LICENSE.txt

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

x-pack/plugin/watcher/licenses/activation-NOTICE.txt

Whitespace-only changes.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
8013606426a73d8ba6b568370877251e91a38b89
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
2+
Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
3+
4+
Redistribution and use in source and binary forms, with or without
5+
modification, are permitted provided that the following conditions
6+
are met:
7+
8+
- Redistributions of source code must retain the above copyright
9+
notice, this list of conditions and the following disclaimer.
10+
11+
- Redistributions in binary form must reproduce the above copyright
12+
notice, this list of conditions and the following disclaimer in the
13+
documentation and/or other materials provided with the distribution.
14+
15+
- Neither the name of the Eclipse Foundation, Inc. nor the names of its
16+
contributors may be used to endorse or promote products derived
17+
from this software without specific prior written permission.
18+
19+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
20+
IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
21+
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
22+
PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
23+
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
24+
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
25+
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
26+
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
27+
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
28+
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
29+
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

0 commit comments

Comments
 (0)