diff --git a/dolphinscheduler-common/sql/soft_version b/dolphinscheduler-common/sql/soft_version
new file mode 100644
index 0000000000..5409e995b5
--- /dev/null
+++ b/dolphinscheduler-common/sql/soft_version
@@ -0,0 +1 @@
+32432423
\ No newline at end of file
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/JSONUtils.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/JSONUtils.java
index fc11a2add2..4ab04997d8 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/JSONUtils.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/JSONUtils.java
@@ -294,7 +294,11 @@ public class JSONUtils {
public static ObjectNode parseObject(String text) {
try {
- return (ObjectNode) objectMapper.readTree(text);
+ if (text.isEmpty()) {
+ return parseObject(text, ObjectNode.class);
+ } else {
+ return (ObjectNode) objectMapper.readTree(text);
+ }
} catch (Exception e) {
throw new RuntimeException("String json deserialization exception.", e);
}
diff --git a/dolphinscheduler-dist/release-docs/LICENSE b/dolphinscheduler-dist/release-docs/LICENSE
index 4f8afe6741..44892a242e 100644
--- a/dolphinscheduler-dist/release-docs/LICENSE
+++ b/dolphinscheduler-dist/release-docs/LICENSE
@@ -286,10 +286,10 @@ The text of each license is also included at licenses/LICENSE-[project].txt.
httpclient 4.4.1: https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient/4.4.1, Apache 2.0
httpcore 4.4.1: https://mvnrepository.com/artifact/org.apache.httpcomponents/httpcore/4.4.1, Apache 2.0
httpmime 4.5.7: https://mvnrepository.com/artifact/org.apache.httpcomponents/httpmime/4.5.7, Apache 2.0
- jackson-annotations 2.9.10: https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-annotations/2.9.10, Apache 2.0
- jackson-core 2.9.10: https://github.com/FasterXML/jackson-core, Apache 2.0
+ jackson-annotations 2.10.5: https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-annotations/2.10.5, Apache 2.0
+ jackson-core 2.10.5: https://github.com/FasterXML/jackson-core, Apache 2.0
jackson-core-asl 1.9.13: https://mvnrepository.com/artifact/org.codehaus.jackson/jackson-core-asl/1.9.13, Apache 2.0
- jackson-databind 2.9.10: https://github.com/FasterXML/jackson-databind, Apache 2.0
+ jackson-databind 2.10.5: https://github.com/FasterXML/jackson-databind, Apache 2.0
jackson-datatype-jdk8 2.9.10: https://mvnrepository.com/artifact/com.fasterxml.jackson.datatype/jackson-datatype-jdk8/2.9.10, Apache 2.0
jackson-datatype-jsr310 2.9.10: https://mvnrepository.com/artifact/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.9.10, Apache 2.0
jackson-jaxrs 1.9.13: https://mvnrepository.com/artifact/org.codehaus.jackson/jackson-jaxrs/1.9.13, Apache 2.0 and LGPL 2.1
diff --git a/pom.xml b/pom.xml
index 5c8dd67613..63776bdb03 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,7 +65,7 @@
1.2.3
2.7.3
2.3.0
- 2.9.10
+ 2.10.5
3.2.0
2.0.1
5.0.5
diff --git a/tools/dependencies/known-dependencies.txt b/tools/dependencies/known-dependencies.txt
index ebec45992f..188db804f1 100755
--- a/tools/dependencies/known-dependencies.txt
+++ b/tools/dependencies/known-dependencies.txt
@@ -79,10 +79,10 @@ httpclient-4.4.1.jar
httpcore-4.4.1.jar
httpmime-4.5.12.jar
j2objc-annotations-1.1.jar
-jackson-annotations-2.9.10.jar
-jackson-core-2.9.10.jar
+jackson-annotations-2.10.5.jar
+jackson-core-2.10.5.jar
jackson-core-asl-1.9.13.jar
-jackson-databind-2.9.10.jar
+jackson-databind-2.10.5.jar
jackson-datatype-jdk8-2.9.10.jar
jackson-datatype-jsr310-2.9.10.jar
jackson-jaxrs-1.9.13.jar