seg_yinzy
/
DolphinScheduler
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'dev' into alert_plugin_design

data_quality_design
Kirs 2021-01-22 18:16:23 +08:00 committed by GitHub
parent 64b4715b73 b290754f83
commit 1c5abbb2ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/JSONUtils.java
View File

@ -294,7 +294,11 @@ public class JSONUtils {
public static ObjectNode parseObject(String text) { public static ObjectNode parseObject(String text) {
try { try {
return (ObjectNode) objectMapper.readTree(text); if (text.isEmpty()) {
return parseObject(text, ObjectNode.class);
} else {
return (ObjectNode) objectMapper.readTree(text);
}
} catch (Exception e) { } catch (Exception e) {
throw new RuntimeException("String json deserialization exception.", e); throw new RuntimeException("String json deserialization exception.", e);
} }

6
dolphinscheduler-dist/release-docs/LICENSE
View File

@ -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 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 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 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-annotations 2.10.5: https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-annotations/2.10.5, Apache 2.0
jackson-core 2.9.10: https://github.com/FasterXML/jackson-core, 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-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-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-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 jackson-jaxrs 1.9.13: https://mvnrepository.com/artifact/org.codehaus.jackson/jackson-jaxrs/1.9.13, Apache 2.0 and LGPL 2.1

2
pom.xml
View File

@ -65,7 +65,7 @@
<logback.version>1.2.3</logback.version> <logback.version>1.2.3</logback.version>
<hadoop.version>2.7.3</hadoop.version> <hadoop.version>2.7.3</hadoop.version>
<quartz.version>2.3.0</quartz.version> <quartz.version>2.3.0</quartz.version>
<jackson.version>2.9.10</jackson.version> <jackson.version>2.10.5</jackson.version>
<mybatis-plus.version>3.2.0</mybatis-plus.version> <mybatis-plus.version>3.2.0</mybatis-plus.version>
<mybatis.spring.version>2.0.1</mybatis.spring.version> <mybatis.spring.version>2.0.1</mybatis.spring.version>
<cron.utils.version>5.0.5</cron.utils.version> <cron.utils.version>5.0.5</cron.utils.version>

6
tools/dependencies/known-dependencies.txt
View File

@ -79,10 +79,10 @@ httpclient-4.4.1.jar
httpcore-4.4.1.jar httpcore-4.4.1.jar
httpmime-4.5.12.jar httpmime-4.5.12.jar
j2objc-annotations-1.1.jar j2objc-annotations-1.1.jar
jackson-annotations-2.9.10.jar jackson-annotations-2.10.5.jar
jackson-core-2.9.10.jar jackson-core-2.10.5.jar
jackson-core-asl-1.9.13.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-jdk8-2.9.10.jar
jackson-datatype-jsr310-2.9.10.jar jackson-datatype-jsr310-2.9.10.jar
jackson-jaxrs-1.9.13.jar jackson-jaxrs-1.9.13.jar