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 189fec3a [Improve] Support Flink 1.20 (#469)
189fec3a is described below
commit 189fec3a152422866e1427d077f14f353bfd7f29
Author: wudi <[email protected]>
AuthorDate: Thu Aug 15 15:24:05 2024 +0800
[Improve] Support Flink 1.20 (#469)
---
.github/workflows/build-connector.yml | 9 ++++++-
README.md | 2 +-
flink-doris-connector/build.sh | 7 ++++-
flink-doris-connector/pom.xml | 31 +++++++++++++++++-----
.../{log4j.properties => log4j2.properties} | 10 ++++---
.../resources/log4j2-test.properties} | 10 ++++---
6 files changed, 52 insertions(+), 17 deletions(-)
diff --git a/.github/workflows/build-connector.yml
b/.github/workflows/build-connector.yml
index 086db934..2b2a242b 100644
--- a/.github/workflows/build-connector.yml
+++ b/.github/workflows/build-connector.yml
@@ -71,4 +71,11 @@ jobs:
cd flink-doris-connector && mvn clean package \
-Dflink.version=1.19.0 \
-Dflink.minor.version=1.19 \
- -Dflink.python.id=flink-python
\ No newline at end of file
+ -Dflink.python.id=flink-python
+
+ - name: Build flink connector 1.20
+ run: |
+ cd flink-doris-connector && mvn clean package \
+ -Dflink.version=1.20.0 \
+ -Dflink.minor.version=1.20 \
+ -Dflink.python.id=flink-python
diff --git a/README.md b/README.md
index ebd9cbb0..51481f6f 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@ under the License.
## Flink Doris Connector
-Flink Doris Connector now support flink version from 1.11 to 1.19.
+Flink Doris Connector now support flink version from 1.11 to 1.20.
If you wish to contribute or use a connector from flink 1.13 (and earlier),
please use the
[branch-for-flink-before-1.13](https://github.com/apache/doris-flink-connector/tree/branch-for-flink-before-1.13)
diff --git a/flink-doris-connector/build.sh b/flink-doris-connector/build.sh
index 0c807d3a..4852553b 100755
--- a/flink-doris-connector/build.sh
+++ b/flink-doris-connector/build.sh
@@ -116,7 +116,7 @@ fi
selectFlink() {
echo 'Flink-Doris-Connector supports multiple versions of flink. Which
version do you need ?'
- select flink in "1.15.x" "1.16.x" "1.17.x" "1.18.x" "1.19.x"
+ select flink in "1.15.x" "1.16.x" "1.17.x" "1.18.x" "1.19.x" "1.20.x"
do
case $flink in
"1.15.x")
@@ -134,6 +134,9 @@ selectFlink() {
"1.19.x")
return 5
;;
+ "1.20.x")
+ return 6
+ ;;
*)
echo "invalid selected, exit.."
exit 1
@@ -157,6 +160,8 @@ elif [ ${flinkVer} -eq 4 ]; then
FLINK_VERSION="1.18.0"
elif [ ${flinkVer} -eq 5 ]; then
FLINK_VERSION="1.19.0"
+elif [ ${flinkVer} -eq 6 ]; then
+ FLINK_VERSION="1.20.0"
fi
# extract major version:
diff --git a/flink-doris-connector/pom.xml b/flink-doris-connector/pom.xml
index 4bf34d68..f7801ddf 100644
--- a/flink-doris-connector/pom.xml
+++ b/flink-doris-connector/pom.xml
@@ -67,7 +67,7 @@ under the License.
</mailingLists>
<properties>
- <revision>1.6.2-SNAPSHOT</revision>
+ <revision>24.0.0-SNAPSHOT</revision>
<flink.version>1.18.0</flink.version>
<flink.major.version>1.18</flink.major.version>
<flink.sql.cdc.version>3.1.1</flink.sql.cdc.version>
@@ -94,6 +94,7 @@ under the License.
<jsqlparser.version>4.9</jsqlparser.version>
<mysql.driver.version>8.0.26</mysql.driver.version>
<ojdbc.version>19.3.0.0</ojdbc.version>
+ <log4j.version>2.17.1</log4j.version>
<arrow.version>15.0.2</arrow.version>
<adbc.version>0.12.0</adbc.version>
</properties>
@@ -228,17 +229,35 @@ under the License.
<artifactId>jackson-databind</artifactId>
<version>${fasterxml.version}</version>
</dependency>
-
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j.version}</version>
- <scope>provided</scope>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <version>${log4j.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ <version>${log4j.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${log4j.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <!-- API bridge between log4j 1 and 2 -->
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-1.2-api</artifactId>
+ <version>${log4j.version}</version>
+ <scope>test</scope>
</dependency>
<!-- use cdc bundled jar for kafka connect class-->
<dependency>
diff --git a/flink-doris-connector/src/main/resources/log4j.properties
b/flink-doris-connector/src/main/resources/log4j2.properties
similarity index 77%
copy from flink-doris-connector/src/main/resources/log4j.properties
copy to flink-doris-connector/src/main/resources/log4j2.properties
index 5645e5c4..591598b9 100644
--- a/flink-doris-connector/src/main/resources/log4j.properties
+++ b/flink-doris-connector/src/main/resources/log4j2.properties
@@ -16,8 +16,10 @@
# limitations under the License.
################################################################################
-log4j.rootLogger=INFO, console
+rootLogger.level = INFO
+rootLogger.appenderRef.console.ref = ConsoleAppender
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern=%d{HH:mm:ss,SSS} %-5p %-60c
[%t] %x - %m%n
+appender.console.name = ConsoleAppender
+appender.console.type = CONSOLE
+appender.console.layout.type = PatternLayout
+appender.console.layout.pattern = %d{HH:mm:ss,SSS} %-5p %-60c [%t] %x - %m%n
diff --git a/flink-doris-connector/src/main/resources/log4j.properties
b/flink-doris-connector/src/test/resources/log4j2-test.properties
similarity index 78%
rename from flink-doris-connector/src/main/resources/log4j.properties
rename to flink-doris-connector/src/test/resources/log4j2-test.properties
index 5645e5c4..22b66ef9 100644
--- a/flink-doris-connector/src/main/resources/log4j.properties
+++ b/flink-doris-connector/src/test/resources/log4j2-test.properties
@@ -16,8 +16,10 @@
# limitations under the License.
################################################################################
-log4j.rootLogger=INFO, console
+rootLogger.level = INFO
+rootLogger.appenderRef.test.ref = TestLogger
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern=%d{HH:mm:ss,SSS} %-5p %-60c
[%t] %x - %m%n
+appender.testlogger.name = TestLogger
+appender.testlogger.type = CONSOLE
+appender.testlogger.layout.type = PatternLayout
+appender.testlogger.layout.pattern = %d{HH:mm:ss,SSS} %-5p %-60c [%t] %x - %m%n
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
