You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ma...@apache.org on 2023/01/18 15:35:29 UTC

[flink-connector-elasticsearch] branch v3.0 updated: [BP-3.0][FLINK-30359][es] flink-sql-connector-elasticsearch6's jar should including the dependency of com.carrotsearch:hppc. (#51)

This is an automated email from the ASF dual-hosted git repository.

martijnvisser pushed a commit to branch v3.0
in repository https://gitbox.apache.org/repos/asf/flink-connector-elasticsearch.git


The following commit(s) were added to refs/heads/v3.0 by this push:
     new c6b15c4  [BP-3.0][FLINK-30359][es] flink-sql-connector-elasticsearch6's jar should including the dependency of com.carrotsearch:hppc. (#51)
c6b15c4 is described below

commit c6b15c4891147a0b39548db1897de4f3628c9eaa
Author: Weijie Guo <mi...@alibaba-inc.com>
AuthorDate: Wed Jan 18 23:35:24 2023 +0800

    [BP-3.0][FLINK-30359][es] flink-sql-connector-elasticsearch6's jar should including the dependency of com.carrotsearch:hppc. (#51)
    
    * [FLINK-30359][es] flink-sql-connector-elasticsearch6's jar should including the dependency of com.carrotsearch:hppc.
    
    Co-authored-by: Martijn Visser <mv...@confluent.io>
---
 flink-sql-connector-elasticsearch6/pom.xml                           | 5 ++++-
 .../src/main/resources/META-INF/NOTICE                               | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/flink-sql-connector-elasticsearch6/pom.xml b/flink-sql-connector-elasticsearch6/pom.xml
index f6d0ccb..ad8517e 100644
--- a/flink-sql-connector-elasticsearch6/pom.xml
+++ b/flink-sql-connector-elasticsearch6/pom.xml
@@ -71,7 +71,6 @@ under the License.
 								</includes>
 								<excludes>
 									<!-- These dependencies are not required. -->
-									<exclude>com.carrotsearch:hppc</exclude>
 									<exclude>com.tdunning:t-digest</exclude>
 									<exclude>joda-time:joda-time</exclude>
 									<exclude>net.sf.jopt-simple:jopt-simple</exclude>
@@ -148,6 +147,10 @@ under the License.
 									<pattern>com.github.mustachejava</pattern>
 									<shadedPattern>org.apache.flink.elasticsearch6.shaded.com.github.mustachejava</shadedPattern>
 								</relocation>
+								<relocation>
+									<pattern>com.carrotsearch.hppc</pattern>
+									<shadedPattern>org.apache.flink.elasticsearch6.shaded.com.carrotsearch.hppc</shadedPattern>
+								</relocation>
 							</relocations>
 						</configuration>
 					</execution>
diff --git a/flink-sql-connector-elasticsearch6/src/main/resources/META-INF/NOTICE b/flink-sql-connector-elasticsearch6/src/main/resources/META-INF/NOTICE
index 94b5744..20a2990 100644
--- a/flink-sql-connector-elasticsearch6/src/main/resources/META-INF/NOTICE
+++ b/flink-sql-connector-elasticsearch6/src/main/resources/META-INF/NOTICE
@@ -6,6 +6,7 @@ The Apache Software Foundation (http://www.apache.org/).
 
 This project bundles the following dependencies under the Apache Software License 2.0. (http://www.apache.org/licenses/LICENSE-2.0.txt)
 
+- com.carrotsearch:hppc:0.7.1
 - com.fasterxml.jackson.core:jackson-core:2.13.4
 - com.fasterxml.jackson.core:jackson-databind:2.13.4.2
 - com.fasterxml.jackson.core:jackson-annotations:2.13.4