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

[Improvement-4506][LICENSE] upgrade the version of the commons-beanutils (#4525) 

* [Fix-3233][api-server] Fix the bug when compile the code in Java9 env

* [Fix-3233][api-server] Fix the bug when compile the code in Java9 env

* [Fix-3233][api-server] Fix the bug when compile the code in Java9 env

* [Fix-3233][api-server] rollback

* [Fix-3233][api-server] delete release-docs/licenses/LICENSE-jsp-api-2.1-6.1.14.txt

* [Fix-3233][api-server] delete ant-1.6.5.jar core-3.1.1.jar jsp-api-2.1-6.1.14.jar

* [Fix-3233][api-server] delete LICENSE-ant-1.6.5.txt,LICENSE-core-3.1.1.txt

* [Fix-3233][api-server] delete maven repository address of ant-1.6.5.jar ,core-3.1.1.jar ,jsp-api-2-1-6.1.14.jar

* [DS-4506][LICENSE] upgrade the version of the commons-beanutils

* [DS-4506][LICENSE] upgrade the version of the commons-beanutils

* [DS-4506][LICENSE] upgrade the version of the commons-beanutils

Co-authored-by: 李长福 <changfu.li@dmall.com>
data_quality_design
cooper 2021-01-25 13:43:06 +08:00 committed by GitHub
parent 829fdb52c1
commit a5f31b75ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 6 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/CollectionUtils.java
View File

@ -263,13 +263,13 @@ public class CollectionUtils {
}
Map<String, Object> instanceMap;
for (T instance : originList) {
Map<String, Object> dataMap = new BeanMap(instance);
BeanMap beanMap = new BeanMap(instance);
instanceMap = new LinkedHashMap<>(16, 0.75f, true);
for (Map.Entry<String, Object> entry : dataMap.entrySet()) {
for (Map.Entry<Object, Object> entry : beanMap.entrySet()) {
if (exclusionSet.contains(entry.getKey())) {
continue;
}
instanceMap.put(entry.getKey(), entry.getValue());
instanceMap.put((String) entry.getKey(), entry.getValue());
}
instanceList.add(instanceMap);
}

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

@ -227,7 +227,7 @@ The text of each license is also included at licenses/LICENSE-[project].txt.
byte-buddy 1.9.10: https://mvnrepository.com/artifact/net.bytebuddy/byte-buddy/1.9.10, Apache 2.0
classmate 1.4.0: https://mvnrepository.com/artifact/com.fasterxml/classmate/1.4.0, Apache 2.0
clickhouse-jdbc 0.1.52: https://mvnrepository.com/artifact/ru.yandex.clickhouse/clickhouse-jdbc/0.1.52, Apache 2.0
commons-beanutils 1.7.0 https://mvnrepository.com/artifact/commons-beanutils/commons-beanutils/1.7.0, Apache 2.0
commons-beanutils 1.9.4 https://mvnrepository.com/artifact/commons-beanutils/commons-beanutils/1.9.4, Apache 2.0
commons-cli 1.2: https://mvnrepository.com/artifact/commons-cli/commons-cli/1.2, Apache 2.0
commons-codec 1.11: https://mvnrepository.com/artifact/commons-codec/commons-codec/1.11, Apache 2.0
commons-collections 3.2.2: https://mvnrepository.com/artifact/commons-collections/commons-collections/3.2.2, Apache 2.0

2
pom.xml
View File

@ -81,7 +81,7 @@
<slf4j.log4j12.version>1.7.5</slf4j.log4j12.version>
<commons.collections.version>3.2.2</commons.collections.version>
<commons.httpclient>3.0.1</commons.httpclient>
<commons.beanutils.version>1.7.0</commons.beanutils.version>
<commons.beanutils.version>1.9.4</commons.beanutils.version>
<commons.configuration.version>1.10</commons.configuration.version>
<commons.email.version>1.5</commons.email.version>
<poi.version>3.17</poi.version>

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

@ -24,7 +24,7 @@ commons-compress-1.4.1.jar
commons-compiler-3.0.16.jar
commons-configuration-1.10.jar
commons-daemon-1.0.13.jar
commons-beanutils-1.7.0.jar
commons-beanutils-1.9.4.jar
commons-dbcp-1.4.jar
commons-httpclient-3.0.1.jar
commons-io-2.4.jar