This is an automated email from the ASF dual-hosted git repository.
dannycranmer pushed a commit to branch v1.0
in repository https://gitbox.apache.org/repos/asf/flink-connector-mongodb.git
commit 23b37894e2bdd82f4956533e331f3aab22576694
Author: Sergey Nuyanzin <sergey.nuyan...@aiven.io>
AuthorDate: Thu May 25 12:06:10 2023 +0200
[FLINK-32187] Remove dependency on flink-shaded
---
.editorconfig | 2 +-
pom.xml | 12 ------------
tools/maven/checkstyle.xml | 2 +-
3 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/.editorconfig b/.editorconfig
index b66771d..ab5d802 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/pom.xml b/pom.xml
index 65ff786..8389f9b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,7 +54,6 @@ under the License.
<mongodb.version>4.7.2</mongodb.version>
<flink.version>1.17.0</flink.version>
- <flink.shaded.version>16.1</flink.shaded.version>
<junit5.version>5.8.1</junit5.version>
<assertj.version>3.21.0</assertj.version>
@@ -77,11 +76,6 @@ under the License.
</modules>
<dependencies>
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-shaded-force-shading</artifactId>
- </dependency>
-
<!-- Root dependencies for all projects -->
<!-- Logging API -->
@@ -194,12 +188,6 @@ under the License.
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.flink</groupId>
-
<artifactId>flink-shaded-force-shading</artifactId>
- <version>${flink.shaded.version}</version>
- </dependency>
-
<!-- Flink ArchUnit -->
<dependency>
diff --git a/tools/maven/checkstyle.xml b/tools/maven/checkstyle.xml
index 3fc4711..eb62611 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"/>
