From 5423d5126c885744511a009fc91eb47cc50a6304 Mon Sep 17 00:00:00 2001
From: Hang Ruan <ruanhang1993@hotmail.com>
Date: Fri, 27 Oct 2023 15:47:19 +0800
Subject: [PATCH] [FLINK-30400][build] Stop bundling flink-connector-base. This
 closes #76

* [FLINK-30400][build] Stop bundling flink-connector-base

* [FLINK-30400][build] Properly include other  `flink-connector-base` dependencies

---------

Co-authored-by: Martijn Visser <martijnvisser@apache.org>
---
 flink-connector-elasticsearch-base/pom.xml                 | 1 +
 .../flink-connector-elasticsearch-e2e-tests-common/pom.xml | 6 ++++++
 .../flink-connector-elasticsearch6-e2e-tests/pom.xml       | 6 ++++++
 .../flink-connector-elasticsearch7-e2e-tests/pom.xml       | 6 ++++++
 flink-connector-elasticsearch6/pom.xml                     | 7 +++++++
 flink-connector-elasticsearch7/pom.xml                     | 7 +++++++
 flink-sql-connector-elasticsearch6/pom.xml                 | 6 ++++++
 flink-sql-connector-elasticsearch7/pom.xml                 | 6 ++++++
 8 files changed, 45 insertions(+)

diff --git a/flink-connector-elasticsearch-base/pom.xml b/flink-connector-elasticsearch-base/pom.xml
index f859b1b4..8a930bfb 100644
--- a/flink-connector-elasticsearch-base/pom.xml
+++ b/flink-connector-elasticsearch-base/pom.xml
@@ -47,6 +47,7 @@ under the License.
 			<groupId>org.apache.flink</groupId>
 			<artifactId>flink-connector-base</artifactId>
 			<version>${flink.version}</version>
+			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.flink</groupId>
diff --git a/flink-connector-elasticsearch-e2e-tests/flink-connector-elasticsearch-e2e-tests-common/pom.xml b/flink-connector-elasticsearch-e2e-tests/flink-connector-elasticsearch-e2e-tests-common/pom.xml
index 4f47574d..51eaad18 100644
--- a/flink-connector-elasticsearch-e2e-tests/flink-connector-elasticsearch-e2e-tests-common/pom.xml
+++ b/flink-connector-elasticsearch-e2e-tests/flink-connector-elasticsearch-e2e-tests-common/pom.xml
@@ -83,6 +83,12 @@ under the License.
 			<artifactId>flink-table-api-java-bridge</artifactId>
 			<version>${flink.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.flink</groupId>
+			<artifactId>flink-connector-base</artifactId>
+			<version>${flink.version}</version>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 
 </project>
diff --git a/flink-connector-elasticsearch-e2e-tests/flink-connector-elasticsearch6-e2e-tests/pom.xml b/flink-connector-elasticsearch-e2e-tests/flink-connector-elasticsearch6-e2e-tests/pom.xml
index 4fc70bc7..a4bf4907 100644
--- a/flink-connector-elasticsearch-e2e-tests/flink-connector-elasticsearch6-e2e-tests/pom.xml
+++ b/flink-connector-elasticsearch-e2e-tests/flink-connector-elasticsearch6-e2e-tests/pom.xml
@@ -92,6 +92,12 @@ under the License.
 			<version>${flink.version}</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.flink</groupId>
+			<artifactId>flink-connector-base</artifactId>
+			<version>${flink.version}</version>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 
 	<build>
diff --git a/flink-connector-elasticsearch-e2e-tests/flink-connector-elasticsearch7-e2e-tests/pom.xml b/flink-connector-elasticsearch-e2e-tests/flink-connector-elasticsearch7-e2e-tests/pom.xml
index 5f464d42..78ec83a4 100644
--- a/flink-connector-elasticsearch-e2e-tests/flink-connector-elasticsearch7-e2e-tests/pom.xml
+++ b/flink-connector-elasticsearch-e2e-tests/flink-connector-elasticsearch7-e2e-tests/pom.xml
@@ -92,6 +92,12 @@ under the License.
 			<version>${flink.version}</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.flink</groupId>
+			<artifactId>flink-connector-base</artifactId>
+			<version>${flink.version}</version>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 
 	<build>
diff --git a/flink-connector-elasticsearch6/pom.xml b/flink-connector-elasticsearch6/pom.xml
index a40fe245..05fae5ee 100644
--- a/flink-connector-elasticsearch6/pom.xml
+++ b/flink-connector-elasticsearch6/pom.xml
@@ -81,6 +81,13 @@ under the License.
 			</exclusions>
 		</dependency>
 
+		<dependency>
+			<groupId>org.apache.flink</groupId>
+			<artifactId>flink-connector-base</artifactId>
+			<version>${flink.version}</version>
+			<scope>provided</scope>
+		</dependency>
+
 		<!-- Elasticsearch -->
 
 		<!-- Dependency for Elasticsearch 6.x REST Client -->
diff --git a/flink-connector-elasticsearch7/pom.xml b/flink-connector-elasticsearch7/pom.xml
index ed7dbd07..3f55bfbe 100644
--- a/flink-connector-elasticsearch7/pom.xml
+++ b/flink-connector-elasticsearch7/pom.xml
@@ -65,6 +65,13 @@ under the License.
 			</exclusions>
 		</dependency>
 
+		<dependency>
+			<groupId>org.apache.flink</groupId>
+			<artifactId>flink-connector-base</artifactId>
+			<version>${flink.version}</version>
+			<scope>provided</scope>
+		</dependency>
+
 		<!-- Table ecosystem -->
 
 		<!-- Projects depending on this project won't depend on flink-table-*. -->
diff --git a/flink-sql-connector-elasticsearch6/pom.xml b/flink-sql-connector-elasticsearch6/pom.xml
index f86dca41..6ecff569 100644
--- a/flink-sql-connector-elasticsearch6/pom.xml
+++ b/flink-sql-connector-elasticsearch6/pom.xml
@@ -50,6 +50,12 @@ under the License.
 			<version>${flink.version}</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.flink</groupId>
+			<artifactId>flink-connector-base</artifactId>
+			<version>${flink.version}</version>
+			<scope>provided</scope>
+		</dependency>
 	</dependencies>
 
 	<build>
diff --git a/flink-sql-connector-elasticsearch7/pom.xml b/flink-sql-connector-elasticsearch7/pom.xml
index 013259d5..81fb4309 100644
--- a/flink-sql-connector-elasticsearch7/pom.xml
+++ b/flink-sql-connector-elasticsearch7/pom.xml
@@ -50,6 +50,12 @@ under the License.
 			<version>${flink.version}</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.flink</groupId>
+			<artifactId>flink-connector-base</artifactId>
+			<version>${flink.version}</version>
+			<scope>provided</scope>
+		</dependency>
 	</dependencies>
 
 	<build>