This is an automated email from the ASF dual-hosted git repository.
martijnvisser 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 5423d51 [FLINK-30400][build] Stop bundling flink-connector-base. This
closes #76
5423d51 is described below
commit 5423d5126c885744511a009fc91eb47cc50a6304
Author: Hang Ruan <ruanhang1...@hotmail.com>
AuthorDate: Fri Oct 27 15:47:19 2023 +0800
[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 <martijnvis...@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 f859b1b..8a930bf 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 4f47574..51eaad1 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 4fc70bc..a4bf490 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 5f464d4..78ec83a 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 a40fe24..05fae5e 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 ed7dbd0..3f55bfb 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 f86dca4..6ecff56 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 013259d..81fb430 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>
