From a5f31b75abee3ef12647dbb961013bd941bc78f1 Mon Sep 17 00:00:00 2001 From: cooper <1322849632@qq.com> Date: Mon, 25 Jan 2021 13:43:06 +0800 Subject: [PATCH] [Improvement-4506][LICENSE] upgrade the version of the commons-beanutils (#4525) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [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: 李长福 --- .../dolphinscheduler/common/utils/CollectionUtils.java | 6 +++--- dolphinscheduler-dist/release-docs/LICENSE | 2 +- pom.xml | 2 +- tools/dependencies/known-dependencies.txt | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/CollectionUtils.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/CollectionUtils.java index bc7c93af3..ba55a37f8 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/CollectionUtils.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/CollectionUtils.java @@ -263,13 +263,13 @@ public class CollectionUtils { } Map instanceMap; for (T instance : originList) { - Map dataMap = new BeanMap(instance); + BeanMap beanMap = new BeanMap(instance); instanceMap = new LinkedHashMap<>(16, 0.75f, true); - for (Map.Entry entry : dataMap.entrySet()) { + for (Map.Entry 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); } diff --git a/dolphinscheduler-dist/release-docs/LICENSE b/dolphinscheduler-dist/release-docs/LICENSE index 44892a242..416c7969a 100644 --- a/dolphinscheduler-dist/release-docs/LICENSE +++ b/dolphinscheduler-dist/release-docs/LICENSE @@ -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 diff --git a/pom.xml b/pom.xml index 2157f58d5..35ffa5827 100644 --- a/pom.xml +++ b/pom.xml @@ -81,7 +81,7 @@ 1.7.5 3.2.2 3.0.1 - 1.7.0 + 1.9.4 1.10 1.5 3.17 diff --git a/tools/dependencies/known-dependencies.txt b/tools/dependencies/known-dependencies.txt index 188db804f..dc09647c2 100755 --- a/tools/dependencies/known-dependencies.txt +++ b/tools/dependencies/known-dependencies.txt @@ -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