You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by gu...@apache.org on 2023/05/29 11:48:47 UTC
[flink-connector-elasticsearch] branch main updated: [FLINK-32194][connectors/elasticsearch] Remove the dependency on flink-shaded
This is an automated email from the ASF dual-hosted git repository.
guoweijie pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/flink-connector-elasticsearch.git
The following commit(s) were added to refs/heads/main by this push:
new 71a8567 [FLINK-32194][connectors/elasticsearch] Remove the dependency on flink-shaded
71a8567 is described below
commit 71a8567bbd83a111df4f85d4465e4cda0ccae916
Author: Yuxin Tan <ta...@gmail.com>
AuthorDate: Thu May 25 23:16:15 2023 +0800
[FLINK-32194][connectors/elasticsearch] Remove the dependency on flink-shaded
---
.editorconfig | 2 +-
.../connector/elasticsearch/sink/ElasticsearchSinkBaseITCase.java | 5 ++---
pom.xml | 7 -------
tools/maven/checkstyle.xml | 6 +-----
4 files changed, 4 insertions(+), 16 deletions(-)
diff --git a/.editorconfig b/.editorconfig
index 2e26074..6fcca23 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -113,7 +113,7 @@ ij_java_doc_preserve_line_breaks = false
# ij_java_generate_final_locals = false
# ij_java_generate_final_parameters = false
# ij_java_if_brace_force = never
-ij_java_imports_layout = org.apache.flink.**,|,org.apache.flink.shaded.**,|,*,|,javax.**,|,java.**,|,scala.**,|,$*
+ij_java_imports_layout = org.apache.flink.**,|,*,|,javax.**,|,java.**,|,scala.**,|,$*
# ij_java_indent_case_from_switch = true
# ij_java_insert_inner_class_imports = false
# ij_java_insert_override_annotation = true
diff --git a/flink-connector-elasticsearch-base/src/test/java/org/apache/flink/connector/elasticsearch/sink/ElasticsearchSinkBaseITCase.java b/flink-connector-elasticsearch-base/src/test/java/org/apache/flink/connector/elasticsearch/sink/ElasticsearchSinkBaseITCase.java
index bd574d8..613a1b3 100644
--- a/flink-connector-elasticsearch-base/src/test/java/org/apache/flink/connector/elasticsearch/sink/ElasticsearchSinkBaseITCase.java
+++ b/flink-connector-elasticsearch-base/src/test/java/org/apache/flink/connector/elasticsearch/sink/ElasticsearchSinkBaseITCase.java
@@ -28,8 +28,6 @@ import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
import org.apache.flink.test.junit5.MiniClusterExtension;
import org.apache.flink.util.TestLoggerExtension;
-import org.apache.flink.shaded.guava30.com.google.common.collect.Lists;
-
import org.apache.http.HttpHost;
import org.apache.http.auth.AuthScope;
import org.apache.http.auth.UsernamePasswordCredentials;
@@ -51,6 +49,7 @@ import org.slf4j.LoggerFactory;
import javax.annotation.Nullable;
import java.io.IOException;
+import java.util.Arrays;
import java.util.List;
import java.util.UUID;
import java.util.function.BiFunction;
@@ -206,7 +205,7 @@ abstract class ElasticsearchSinkBaseITCase {
private static List<BiFunction<String, String, ElasticsearchEmitter<Tuple2<Integer, String>>>>
elasticsearchEmitters() {
- return Lists.newArrayList(TestEmitter::jsonEmitter, TestEmitter::smileEmitter);
+ return Arrays.asList(TestEmitter::jsonEmitter, TestEmitter::smileEmitter);
}
private static class FailingMapper implements MapFunction<Long, Long>, CheckpointListener {
diff --git a/pom.xml b/pom.xml
index 529c5a2..ca08811 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,7 +51,6 @@ under the License.
<properties>
<flink.version>1.17.0</flink.version>
- <flink.shaded.version>16.1</flink.shaded.version>
<jackson-bom.version>2.13.4.20221013</jackson-bom.version>
<junit4.version>4.13.2</junit4.version>
@@ -72,12 +71,6 @@ under the License.
</properties>
<dependencies>
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-shaded-force-shading</artifactId>
- <version>${flink.shaded.version}</version>
- </dependency>
-
<!-- Root dependencies for all projects -->
<!-- Logging API -->
diff --git a/tools/maven/checkstyle.xml b/tools/maven/checkstyle.xml
index 2048fd1..17888ee 100644
--- a/tools/maven/checkstyle.xml
+++ b/tools/maven/checkstyle.xml
@@ -195,7 +195,7 @@ This file is based on the checkstyle file of Apache Beam.
<!-- Checks for out of order import statements. -->
<property name="severity" value="error"/>
<property name="groups"
- value="org.apache.flink,org.apache.flink.shaded,*,javax,java,scala"/>
+ value="org.apache.flink,*,javax,java,scala"/>
<property name="separated" value="true"/>
<property name="sortStaticImportsAlphabetically" value="true"/>
<property name="option" value="bottom"/>
@@ -224,10 +224,6 @@ This file is based on the checkstyle file of Apache Beam.
<property name="illegalPkgs" value="io.netty"/>
<message key="import.illegal" value="{0}; Use flink-shaded-netty instead."/>
</module>
- <module name="IllegalImport">
- <property name="illegalPkgs" value="com.google.common"/>
- <message key="import.illegal" value="{0}; Use flink-shaded-guava instead."/>
- </module>
<module name="RedundantModifier">
<!-- Checks for redundant modifiers on various symbol definitions.