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-hbase.git
commit f4d4e70a292e1eed4bdc522e314d78a8f99dedde
Author: MartijnVisser <martijnvis...@apache.org>
AuthorDate: Fri Oct 13 18:41:06 2023 +0200
[hotfix] Exclude http-only available Maven dependencies and include
1.18-SNAPSHOT in PR tests. This closes #28
* [hotfix] Exclude `net.minidev:json-smart` since it tries to pull from
HTTP Maven repositories
* [hotfix] Make sure that PRs are tested against 1.18-SNAPSHOT
* [hotfix] Address dependency convergence
(cherry picked from commit e40ee4f7676659cb93bf85a5db42b98b12c091be)
---
.github/workflows/push_pr.yml | 2 +-
flink-connector-hbase-1.4/pom.xml | 6 ++++++
flink-connector-hbase-2.2/pom.xml | 10 ++++++++++
flink-connector-hbase-base/pom.xml | 4 ++++
flink-connector-hbase-e2e-tests/pom.xml | 12 ++++++++++++
pom.xml | 14 ++++++++++++++
6 files changed, 47 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/push_pr.yml b/.github/workflows/push_pr.yml
index cea37d4..f3e497a 100644
--- a/.github/workflows/push_pr.yml
+++ b/.github/workflows/push_pr.yml
@@ -25,7 +25,7 @@ jobs:
compile_and_test:
strategy:
matrix:
- flink: [1.16.2, 1.17.1]
+ flink: [1.16.2, 1.17.1, 1.18-SNAPSHOT]
uses: apache/flink-connector-shared-utils/.github/workflows/ci.yml@ci_utils
with:
flink_version: ${{ matrix.flink }}
diff --git a/flink-connector-hbase-1.4/pom.xml
b/flink-connector-hbase-1.4/pom.xml
index db27b0b..039803c 100644
--- a/flink-connector-hbase-1.4/pom.xml
+++ b/flink-connector-hbase-1.4/pom.xml
@@ -345,6 +345,12 @@ under the License.
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-minicluster</artifactId>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>net.minidev</groupId>
+ <artifactId>json-smart</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
diff --git a/flink-connector-hbase-2.2/pom.xml
b/flink-connector-hbase-2.2/pom.xml
index 5c6aa93..f199d0b 100644
--- a/flink-connector-hbase-2.2/pom.xml
+++ b/flink-connector-hbase-2.2/pom.xml
@@ -87,6 +87,10 @@ under the License.
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>net.minidev</groupId>
+ <artifactId>json-smart</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -358,6 +362,12 @@ under the License.
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-minicluster</artifactId>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>net.minidev</groupId>
+ <artifactId>json-smart</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
diff --git a/flink-connector-hbase-base/pom.xml
b/flink-connector-hbase-base/pom.xml
index 6c172fe..a204c72 100644
--- a/flink-connector-hbase-base/pom.xml
+++ b/flink-connector-hbase-base/pom.xml
@@ -74,6 +74,10 @@ under the License.
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>net.minidev</groupId>
+ <artifactId>json-smart</artifactId>
+ </exclusion>
</exclusions>
</dependency>
diff --git a/flink-connector-hbase-e2e-tests/pom.xml
b/flink-connector-hbase-e2e-tests/pom.xml
index 387448b..37e3667 100644
--- a/flink-connector-hbase-e2e-tests/pom.xml
+++ b/flink-connector-hbase-e2e-tests/pom.xml
@@ -76,6 +76,12 @@ under the License.
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>net.minidev</groupId>
+ <artifactId>json-smart</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -131,6 +137,12 @@ under the License.
<artifactId>hadoop-minicluster</artifactId>
<version>${hadoop.version}</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>net.minidev</groupId>
+ <artifactId>json-smart</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index 4f28754..92f90c6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -260,6 +260,10 @@ under the License.
<groupId>org.slf4j</groupId>
<artifactId>slf4j-reload4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>net.minidev</groupId>
+
<artifactId>json-smart</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -349,6 +353,10 @@ under the License.
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>net.minidev</groupId>
+
<artifactId>json-smart</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -403,6 +411,12 @@ under the License.
<version>${commons.logging.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
+ <version>1.23.0</version>
+ </dependency>
+
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
