You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by al...@apache.org on 2017/07/11 15:05:29 UTC

flink git commit: [FLINK-7133] Exclude optional asm deps from Elasticsearch base module

Repository: flink
Updated Branches:
  refs/heads/master d0cc2c178 -> 211d0963e


[FLINK-7133] Exclude optional asm deps from Elasticsearch base module

These ASM dependencies where shaded into the elasticsearch-base module
which where then clashing with our newer (also shaded) ASM dependency.


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/211d0963
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/211d0963
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/211d0963

Branch: refs/heads/master
Commit: 211d0963e71cac88c18612822956b8312d68a1d7
Parents: d0cc2c1
Author: adebski <an...@gmail.com>
Authored: Sat Jul 8 17:03:18 2017 +0200
Committer: Aljoscha Krettek <al...@gmail.com>
Committed: Tue Jul 11 17:04:30 2017 +0200

----------------------------------------------------------------------
 .../flink-connector-elasticsearch-base/pom.xml         | 13 +++++++++++++
 1 file changed, 13 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/211d0963/flink-connectors/flink-connector-elasticsearch-base/pom.xml
----------------------------------------------------------------------
diff --git a/flink-connectors/flink-connector-elasticsearch-base/pom.xml b/flink-connectors/flink-connector-elasticsearch-base/pom.xml
index 79b4f50..04c254f 100644
--- a/flink-connectors/flink-connector-elasticsearch-base/pom.xml
+++ b/flink-connectors/flink-connector-elasticsearch-base/pom.xml
@@ -55,6 +55,19 @@ under the License.
 			<groupId>org.elasticsearch</groupId>
 			<artifactId>elasticsearch</artifactId>
 			<version>${elasticsearch.version}</version>
+			<!--
+			FLINK-7133: Excluding all org.ow2.asm from elasticsearch dependencies because
+			1. from the POV of client they are optional,
+			2. the version configured by default at the time of writing this comment (1.7.1) depends on asm 4.1
+			   and when it is shaded into elasticsearch-base artifact it conflicts with newer shaded versions of asm
+			   resulting in errors at the runtime when application is executed locally, e.g. from IDE.
+			-->
+			<exclusions>
+				<exclusion>
+					<groupId>org.ow2.asm</groupId>
+					<artifactId>*</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 
 		<!-- test dependencies -->