This is an automated email from the ASF dual-hosted git repository.
chesnay pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/flink-connector-hbase.git
The following commit(s) were added to refs/heads/main by this push:
new d74e518 [FLINK-30062][Connectors/HBase] Bundle the exact same
dependencies as 1.16.0
d74e518 is described below
commit d74e518aa000506bccbb5da4604c0814d5840ecb
Author: Ferenc Csaky <ferenc.cs...@pm.me>
AuthorDate: Mon Dec 12 07:58:27 2022 -0500
[FLINK-30062][Connectors/HBase] Bundle the exact same dependencies as 1.16.0
---
.idea/vcs.xml | 3 +-
flink-connector-hbase-1.4/pom.xml | 63 ++--------------------
flink-connector-hbase-2.2/pom.xml | 37 ++++---------
flink-connector-hbase-base/pom.xml | 8 ---
flink-sql-connector-hbase-2.2/pom.xml | 6 ---
.../src/main/resources/META-INF/NOTICE | 2 +-
pom.xml | 52 +++++++++---------
7 files changed, 45 insertions(+), 126 deletions(-)
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 10fab3b..a5d93d8 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -20,5 +20,6 @@
</component>
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
+ <mapping directory="$PROJECT_DIR$/tools/releasing/shared" vcs="Git" />
</component>
-</project>
+</project>
\ No newline at end of file
diff --git a/flink-connector-hbase-1.4/pom.xml
b/flink-connector-hbase-1.4/pom.xml
index 50694b8..04526f1 100644
--- a/flink-connector-hbase-1.4/pom.xml
+++ b/flink-connector-hbase-1.4/pom.xml
@@ -51,12 +51,6 @@ under the License.
<groupId>org.apache.flink</groupId>
<artifactId>flink-connector-hbase-base</artifactId>
<version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<!-- Table ecosystem -->
@@ -69,6 +63,11 @@ under the License.
<optional>true</optional>
</dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-all</artifactId>
+ </dependency>
+
<!-- Tests -->
<dependency>
<groupId>org.apache.flink</groupId>
@@ -225,22 +224,10 @@ under the License.
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
</exclusion>
- <exclusion>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
<exclusion>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
</exclusion>
- <exclusion>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </exclusion>
</exclusions>
</dependency>
@@ -283,18 +270,6 @@ under the License.
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
</exclusion>
- <exclusion>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
</exclusions>
</dependency>
@@ -319,10 +294,6 @@ under the License.
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
- <exclusion>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </exclusion>
<exclusion>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
@@ -402,18 +373,6 @@ under the License.
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
</exclusion>
- <exclusion>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
<exclusion>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
@@ -443,18 +402,6 @@ under the License.
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
</exclusion>
- <exclusion>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
</exclusions>
</dependency>
diff --git a/flink-connector-hbase-2.2/pom.xml
b/flink-connector-hbase-2.2/pom.xml
index cd3f8fa..218582b 100644
--- a/flink-connector-hbase-2.2/pom.xml
+++ b/flink-connector-hbase-2.2/pom.xml
@@ -152,6 +152,10 @@ under the License.
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jruby.jcodings</groupId>
+ <artifactId>jcodings</artifactId>
+ </exclusion>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
@@ -163,6 +167,11 @@ under the License.
</exclusions>
</dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-all</artifactId>
+ </dependency>
+
<!-- Tests -->
<dependency>
<groupId>junit</groupId>
@@ -253,10 +262,6 @@ under the License.
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
</exclusion>
- <exclusion>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- </exclusion>
<exclusion>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
@@ -372,24 +377,6 @@ under the License.
<dependencyManagement>
<dependencies>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>2.11.0</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>3.12.0</version>
- </dependency>
-
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.2</version>
- </dependency>
-
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
@@ -407,12 +394,6 @@ under the License.
<artifactId>htrace-core4</artifactId>
<version>4.2.0-incubating</version>
</dependency>
-
- <dependency>
- <groupId>org.jruby.jcodings</groupId>
- <artifactId>jcodings</artifactId>
- <version>1.0.18</version>
- </dependency>
</dependencies>
</dependencyManagement>
</project>
diff --git a/flink-connector-hbase-base/pom.xml
b/flink-connector-hbase-base/pom.xml
index 63ffb37..0d1ead9 100644
--- a/flink-connector-hbase-base/pom.xml
+++ b/flink-connector-hbase-base/pom.xml
@@ -140,14 +140,6 @@ under the License.
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs</artifactId>
</exclusion>
- <exclusion>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </exclusion>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
diff --git a/flink-sql-connector-hbase-2.2/pom.xml
b/flink-sql-connector-hbase-2.2/pom.xml
index 0f636c8..29815d7 100644
--- a/flink-sql-connector-hbase-2.2/pom.xml
+++ b/flink-sql-connector-hbase-2.2/pom.xml
@@ -39,12 +39,6 @@ under the License.
<groupId>org.apache.flink</groupId>
<artifactId>flink-connector-hbase-2.2</artifactId>
<version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-client</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
diff --git a/flink-sql-connector-hbase-2.2/src/main/resources/META-INF/NOTICE
b/flink-sql-connector-hbase-2.2/src/main/resources/META-INF/NOTICE
index 1db3ea0..33e1d81 100644
--- a/flink-sql-connector-hbase-2.2/src/main/resources/META-INF/NOTICE
+++ b/flink-sql-connector-hbase-2.2/src/main/resources/META-INF/NOTICE
@@ -10,7 +10,7 @@ This project bundles the following dependencies under the
Apache Software Licens
- io.netty:netty-all:4.1.70.Final
- io.dropwizard.metrics:metrics-core:3.2.6
- org.apache.commons:commons-crypto:1.0.0
- - org.apache.commons:commons-lang3:3.12.0
+ - org.apache.commons:commons-lang3:3.3.2
- org.apache.hbase:hbase-client:2.2.3
- org.apache.hbase:hbase-common:2.2.3
- org.apache.hbase:hbase-protocol:2.2.3
diff --git a/pom.xml b/pom.xml
index 2afce15..56675c3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,6 +60,10 @@ under the License.
<scala.version>2.12.7</scala.version>
<assertj.version>3.21.0</assertj.version>
+ <commons.codec.version>1.15</commons.codec.version>
+ <commons.io.version>2.11.0</commons.io.version>
+ <commons.lang3.version>3.3.2</commons.lang3.version>
+ <commons.logging.version>1.1.3</commons.logging.version>
<hadoop.version>2.8.5</hadoop.version>
<hbase1.version>1.4.3</hbase1.version>
<hbase2.version>2.2.3</hbase2.version>
@@ -199,10 +203,6 @@ under the License.
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
</exclusion>
- <exclusion>
- <groupId>commons-codec</groupId>
-
<artifactId>commons-codec</artifactId>
- </exclusion>
<exclusion>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
@@ -215,10 +215,6 @@ under the License.
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</exclusion>
- <exclusion>
-
<groupId>commons-logging</groupId>
-
<artifactId>commons-logging</artifactId>
- </exclusion>
<exclusion>
<groupId>org.apache.commons</groupId>
<artifactId>commons-math3</artifactId>
@@ -280,18 +276,10 @@ under the License.
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
</exclusion>
- <exclusion>
- <groupId>commons-codec</groupId>
-
<artifactId>commons-codec</artifactId>
- </exclusion>
<exclusion>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</exclusion>
- <exclusion>
-
<groupId>commons-logging</groupId>
-
<artifactId>commons-logging</artifactId>
- </exclusion>
</exclusions>
</dependency>
@@ -320,18 +308,10 @@ under the License.
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</exclusion>
- <exclusion>
-
<groupId>commons-logging</groupId>
-
<artifactId>commons-logging</artifactId>
- </exclusion>
<exclusion>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
</exclusion>
- <exclusion>
- <groupId>commons-codec</groupId>
-
<artifactId>commons-codec</artifactId>
- </exclusion>
<exclusion>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
@@ -382,6 +362,30 @@ under the License.
<version>${netty.version}</version>
</dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>${commons.io.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>${commons.lang3.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>${commons.codec.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>${commons.logging.version}</version>
+ </dependency>
+
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
