This is an automated email from the ASF dual-hosted git repository.
diwu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris-flink-connector.git
The following commit(s) were added to refs/heads/master by this push:
new 124879d [step4][Improve]Format suppressions files and pom files (#274)
124879d is described below
commit 124879d5b8312729f8f6c834a1c3ea65b48fac32
Author: wudongliang <[email protected]>
AuthorDate: Fri Dec 15 16:31:31 2023 +0800
[step4][Improve]Format suppressions files and pom files (#274)
---
flink-doris-connector/pom.xml | 40 +++++++++++++++++++++++++---------------
tools/maven/checkstyle.xml | 10 +++++-----
tools/maven/suppressions.xml | 3 ---
3 files changed, 30 insertions(+), 23 deletions(-)
diff --git a/flink-doris-connector/pom.xml b/flink-doris-connector/pom.xml
index 2d7c3fe..76156ad 100644
--- a/flink-doris-connector/pom.xml
+++ b/flink-doris-connector/pom.xml
@@ -77,12 +77,22 @@ under the License.
<maven-javadoc-plugin.version>3.3.0</maven-javadoc-plugin.version>
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <log4j2.version>2.18.0</log4j2.version>
<project.scm.id>github</project.scm.id>
<thrift-service.version>1.0.0</thrift-service.version>
<checkstyle.version>8.14</checkstyle.version>
<maven-checkstyle-plugin.version>2.17</maven-checkstyle-plugin.version>
<spotless.version>2.4.2</spotless.version>
+ <httpcomponents.version>4.5.13</httpcomponents.version>
+ <commons-codec.version>1.15</commons-codec.version>
+ <netty.version>4.1.77.Final</netty.version>
+ <fasterxml.version>2.13.3</fasterxml.version>
+ <guava.version>31.1-jre</guava.version>
+ <slf4j.version>1.7.25</slf4j.version>
+ <mockito.version>4.2.0</mockito.version>
+ <testcontainers.version>1.17.6</testcontainers.version>
+ <junit-jupiter.version>5.10.1</junit-jupiter.version>
+ <junit.version>4.11</junit.version>
+ <hamcrest.version>1.3</hamcrest.version>
</properties>
<dependencies>
@@ -146,7 +156,7 @@ under the License.
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.5.13</version>
+ <version>${httpcomponents.version}</version>
<exclusions>
<exclusion>
<groupId>commons-codec</groupId>
@@ -158,7 +168,7 @@ under the License.
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.15</version>
+ <version>${commons-codec.version}</version>
</dependency>
<dependency>
@@ -195,37 +205,37 @@ under the License.
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-common</artifactId>
- <version>4.1.77.Final</version>
+ <version>${netty.version}</version>
</dependency>
<!-- jackson -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
- <version>2.13.3</version>
+ <version>${fasterxml.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
- <version>2.13.3</version>
+ <version>${fasterxml.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>2.13.3</version>
+ <version>${fasterxml.version}</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>31.1-jre</version>
+ <version>${guava.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.7.25</version>
+ <version>${slf4j.version}</version>
<scope>provided</scope>
</dependency>
<!-- use cdc bundled jar for kafka connect class-->
@@ -287,39 +297,39 @@ under the License.
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
- <version>1.3</version>
+ <version>${hamcrest.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>4.2.0</version>
+ <version>${mockito.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-inline</artifactId>
- <version>4.2.0</version>
+ <version>${mockito.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.11</version>
+ <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
- <version>5.10.1</version>
+ <version>${junit-jupiter.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
- <version>1.17.6</version>
+ <version>${testcontainers.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/tools/maven/checkstyle.xml b/tools/maven/checkstyle.xml
index a3d8fa3..880563e 100644
--- a/tools/maven/checkstyle.xml
+++ b/tools/maven/checkstyle.xml
@@ -180,11 +180,11 @@ This file is based on the checkstyle file of Apache Beam.
<property name="severity" value="error"/>
</module>
- <module name="IllegalImport">
- <property name="illegalPkgs"
- value="org.mockito, org.powermock"/>
- <message key="import.illegal" value="{0}; Mocking is
discouraged. Please refer to the coding guidelines:
https://flink.apache.org/how-to-contribute/code-style-and-quality-common/#avoid-mockito---use-reusable-test-implementations."/>
- </module>
+<!-- <module name="IllegalImport">-->
+<!-- <property name="illegalPkgs"-->
+<!-- value="org.mockito,
org.powermock"/>-->
+<!-- <message key="import.illegal" value="{0}; Mocking is
discouraged. Please refer to the coding guidelines:
https://flink.apache.org/how-to-contribute/code-style-and-quality-common/#avoid-mockito---use-reusable-test-implementations."/>-->
+<!-- </module>-->
<module name="IllegalImport">
<property name="illegalPkgs"
value="autovalue.shaded, avro.shaded,
com.google.api.client.repackaged, com.google.appengine.repackaged"/>
diff --git a/tools/maven/suppressions.xml b/tools/maven/suppressions.xml
index 2577e5f..6a0417d 100644
--- a/tools/maven/suppressions.xml
+++ b/tools/maven/suppressions.xml
@@ -26,7 +26,4 @@ under the License.
<!-- Java doc -->
<suppress files="org[\\/]apache[\\/]doris[\\/]flink[/].*"
checks="JavadocType" />
- <!-- TODO for test case -->
- <suppress files="org[\\/]apache[\\/]doris[\\/]flink[\\/]sink[/].*"
checks="IllegalImport" />
-
</suppressions>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
