Skip to content

Commit

Permalink
Replace javax activation with jakarta activation (elastic#40247)
Browse files Browse the repository at this point in the history
The eclipse foundation has taken over the javax.activation dependency, which
resulted in a naming change of the dependency.
  • Loading branch information
spinscale authored and Gurkan Kaymak committed May 27, 2019
1 parent fe5fdf7 commit 441dd61
Show file tree
Hide file tree
Showing 7 changed files with 65 additions and 124 deletions.
6 changes: 2 additions & 4 deletions x-pack/plugin/watcher/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,9 @@ dependencies {

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

Expand Down
1 change: 0 additions & 1 deletion x-pack/plugin/watcher/licenses/activation-1.1.1.jar.sha1

This file was deleted.

119 changes: 0 additions & 119 deletions x-pack/plugin/watcher/licenses/activation-LICENSE.txt

This file was deleted.

Empty file.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
8013606426a73d8ba6b568370877251e91a38b89
29 changes: 29 additions & 0 deletions x-pack/plugin/watcher/licenses/jakarta.activation-LICENSE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@

Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:

- Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.

- Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.

- Neither the name of the Eclipse Foundation, Inc. nor the names of its
contributors may be used to endorse or promote products derived
from this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Loading

0 comments on commit 441dd61

Please sign in to comment.