You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@flink.apache.org by tzulitai <gi...@git.apache.org> on 2018/02/07 18:11:47 UTC
[GitHub] flink pull request #5426: [FLINK-8362] [elasticsearch] Shade all ES connecto...
GitHub user tzulitai opened a pull request:
https://github.com/apache/flink/pull/5426
[FLINK-8362] [elasticsearch] Shade all ES connector dependencies
## What is the purpose of the change
This is an extended version of Nico's work in #5243.
This version additionally removes shading of the Elasticsearch connector base dependencies, as well as Elasticsearch itself.
It also fixes a Log4j2-to-SLF4j bridge adapter issue with Elasticsearch 5, which occurred because of the shading.
## Brief change log
- Remove shading of ES connector base + Elasticsearch dependencies
- Fix Log4j2-to-SLF4j shading to also include shading of log4j-core
- Add NOTICE files to all ES connector versions, stating all bundled dependencies and their licenses.
## Verifying this change
Manually verified.
All ES connectors work in the IDE, and in cluster jobs, without dependency clashes.
Elasticsearch logs are also correctly routed to TM logs.
## Does this pull request potentially affect one of the following parts:
- Dependencies (does it add or upgrade a dependency): (yes / **no**)
- The public API, i.e., is any changed class annotated with `@Public(Evolving)`: (yes / **no**)
- The serializers: (yes / **no** / don't know)
- The runtime per-record code paths (performance sensitive): (yes / **no** / don't know)
- Anything that affects deployment or recovery: JobManager (and its components), Checkpointing, Yarn/Mesos, ZooKeeper: (yes / **no** / don't know)
- The S3 file system connector: (yes / **no** / don't know)
## Documentation
- Does this pull request introduce a new feature? (yes / **no**)
- If yes, how is the feature documented? (**not applicable** / docs / JavaDocs / not documented)
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/tzulitai/flink FLINK-8362
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/flink/pull/5426.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #5426
----
commit a3950f29d45b34724f5483717168bac372ef90bf
Author: Nico Kruber <ni...@...>
Date: 2018-01-04T20:09:09Z
[FLINK-8362][elasticsearch] shade all dependencies
commit f302f0af51782785bfc6ac3f085c34480b51e6fa
Author: Tzu-Li (Gordon) Tai <tz...@...>
Date: 2018-02-05T13:16:56Z
[FLINK-8362] [elasticsearch] Further improvements for Elasticsearch connector shading
- Do not shade Elasticsearch dependencies
- Do not shade Flink Elasticseach Connector classes
- Also shade log4j-api dependency in Elasticsearch 5 connector. This is
required for the log4j-to-slf4j bridge adapter to work properly.
commit 5e1da0d9e6b824dbea3c34e0a5ff2f0f24f04815
Author: Tzu-Li (Gordon) Tai <tz...@...>
Date: 2018-02-07T18:01:18Z
[FLINK-8362] [elasticsearch] Add NOTICE files for license statements for all ES connectors
----
---
[GitHub] flink issue #5426: [FLINK-8362] [elasticsearch] Shade all ES connector depen...
Posted by tzulitai <gi...@git.apache.org>.
Github user tzulitai commented on the issue:
https://github.com/apache/flink/pull/5426
Build passing locally, merging ...
---
[GitHub] flink pull request #5426: [FLINK-8362] [elasticsearch] Shade all ES connecto...
Posted by zentol <gi...@git.apache.org>.
Github user zentol commented on a diff in the pull request:
https://github.com/apache/flink/pull/5426#discussion_r166904848
--- Diff: flink-connectors/flink-connector-elasticsearch/src/main/resources/META-INF/NOTICE ---
@@ -0,0 +1,57 @@
+This project includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+-------------------------------------------------------------
+
+This project bundles the following dependencies under
+the Apache Software License 2.0
+
+ - org.apache.lucene : lucene-core version 4.10.4
--- End diff --
isn't this list missing some dependencies? like jackson, joda-time, yaml, tartarus.
---
[GitHub] flink pull request #5426: [FLINK-8362] [elasticsearch] Shade all ES connecto...
Posted by zentol <gi...@git.apache.org>.
Github user zentol commented on a diff in the pull request:
https://github.com/apache/flink/pull/5426#discussion_r166906856
--- Diff: flink-connectors/flink-connector-elasticsearch2/src/main/resources/META-INF/NOTICE ---
@@ -0,0 +1,86 @@
+This project includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+-------------------------------------------------------------
+
+This project bundles the following dependencies under
+the Apache Software License 2.0
--- End diff --
yaml, tartarus missing?
---
[GitHub] flink pull request #5426: [FLINK-8362] [elasticsearch] Shade all ES connecto...
Posted by tzulitai <gi...@git.apache.org>.
Github user tzulitai commented on a diff in the pull request:
https://github.com/apache/flink/pull/5426#discussion_r166917488
--- Diff: flink-connectors/flink-connector-elasticsearch/src/main/resources/META-INF/NOTICE ---
@@ -0,0 +1,57 @@
+This project includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+-------------------------------------------------------------
+
+This project bundles the following dependencies under
+the Apache Software License 2.0
+
+ - org.apache.lucene : lucene-core version 4.10.4
--- End diff --
You're right, there seems to be some missing from this list. Fixing ..
---
[GitHub] flink pull request #5426: [FLINK-8362] [elasticsearch] Shade all ES connecto...
Posted by asfgit <gi...@git.apache.org>.
Github user asfgit closed the pull request at:
https://github.com/apache/flink/pull/5426
---
[GitHub] flink issue #5426: [FLINK-8362] [elasticsearch] Shade all ES connector depen...
Posted by tzulitai <gi...@git.apache.org>.
Github user tzulitai commented on the issue:
https://github.com/apache/flink/pull/5426
Thanks!
Since this is verified manually already, and we have a test that verifies everything is properly shaded, I'll merge this once Travis gives green.
---
[GitHub] flink issue #5426: [FLINK-8362] [elasticsearch] Shade all ES connector depen...
Posted by zentol <gi...@git.apache.org>.
Github user zentol commented on the issue:
https://github.com/apache/flink/pull/5426
notice files look good to me.
---