diff --git a/.github/workflows/build-connector.yml b/.github/workflows/build-connector.yml
index 086db9348..2b2a242be 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 ebd9cbb05..51481f6fd 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 0c807d3aa..4852553b5 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 4bf34d689..f7801ddfa 100644
--- a/flink-doris-connector/pom.xml
+++ b/flink-doris-connector/pom.xml
@@ -67,7 +67,7 @@ under the License.
- 1.6.2-SNAPSHOT
+ 24.0.0-SNAPSHOT
1.18.0
1.18
3.1.1
@@ -94,6 +94,7 @@ under the License.
4.9
8.0.26
19.3.0.0
+ 2.17.1
15.0.2
0.12.0
@@ -228,17 +229,35 @@ under the License.
jackson-databind
${fasterxml.version}
-
com.google.guava
guava
${guava.version}
- org.slf4j
- slf4j-log4j12
- ${slf4j.version}
- provided
+ org.apache.logging.log4j
+ log4j-slf4j-impl
+ ${log4j.version}
+ test
+
+
+ org.apache.logging.log4j
+ log4j-api
+ ${log4j.version}
+ test
+
+
+ org.apache.logging.log4j
+ log4j-core
+ ${log4j.version}
+ test
+
+
+
+ org.apache.logging.log4j
+ log4j-1.2-api
+ ${log4j.version}
+ test
diff --git a/flink-doris-connector/src/main/resources/log4j2.properties b/flink-doris-connector/src/main/resources/log4j2.properties
new file mode 100644
index 000000000..591598b95
--- /dev/null
+++ b/flink-doris-connector/src/main/resources/log4j2.properties
@@ -0,0 +1,25 @@
+################################################################################
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+################################################################################
+
+rootLogger.level = INFO
+rootLogger.appenderRef.console.ref = ConsoleAppender
+
+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 5645e5c42..22b66ef92 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