This is an automated email from the ASF dual-hosted git repository.
jialiang pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new ab6c075863 AMBARI-26185: Upgrade commons-collections to resolve CVEs
(#3936)
ab6c075863 is described below
commit ab6c07586327912e20b8b168df2899be52234b77
Author: Sandeep Kumar <[email protected]>
AuthorDate: Thu Jan 23 07:01:05 2025 +0530
AMBARI-26185: Upgrade commons-collections to resolve CVEs (#3936)
---
ambari-agent/pom.xml | 5 ++--
ambari-agent/src/packages/tarball/all.xml | 2 +-
ambari-project/pom.xml | 10 ++++----
ambari-server/pom.xml | 27 ++++++++++++++--------
.../server/actionmanager/ActionScheduler.java | 2 +-
.../ambari/server/agent/HeartBeatHandler.java | 2 +-
.../ambari/server/agent/HeartbeatProcessor.java | 2 +-
.../server/agent/stomp/AgentConfigsHolder.java | 2 +-
.../server/agent/stomp/AlertDefinitionsHolder.java | 2 +-
.../server/agent/stomp/HostLevelParamsHolder.java | 2 +-
.../ambari/server/agent/stomp/MetadataHolder.java | 4 ++--
.../ambari/server/agent/stomp/TopologyHolder.java | 2 +-
.../server/agent/stomp/dto/TopologyCluster.java | 4 ++--
.../server/agent/stomp/dto/TopologyComponent.java | 4 ++--
.../ConfigurationRecommendationCommand.java | 2 +-
.../stackadvisor/commands/StackAdvisorCommand.java | 2 +-
...MetricsHadoopSinkVersionCompatibilityCheck.java | 2 +-
.../checks/DatabaseConsistencyCheckHelper.java | 2 +-
.../ambari/server/collections/Predicate.java | 4 ++--
.../server/collections/functors/AndPredicate.java | 8 +++----
.../collections/functors/ContextTransformer.java | 2 +-
.../DelegatedMultiplePredicateContainer.java | 8 +++----
.../DelegatedSinglePredicateContainer.java | 8 +++----
.../collections/functors/EqualsPredicate.java | 8 +++----
.../server/collections/functors/NotPredicate.java | 8 +++----
.../collections/functors/OperationPredicate.java | 8 +++----
.../server/collections/functors/OrPredicate.java | 8 +++----
.../controller/AmbariManagementControllerImpl.java | 4 ++--
.../server/controller/DeleteIdentityHandler.java | 2 +-
.../server/controller/KerberosHelperImpl.java | 2 +-
.../controller/RootServiceResponseFactory.java | 4 ++--
.../internal/AbstractProviderModule.java | 4 ++--
.../ClusterStackVersionResourceProvider.java | 2 +-
.../internal/ConfigGroupResourceProvider.java | 2 +-
.../internal/HostStackVersionResourceProvider.java | 2 +-
.../RepositoryVersionResourceProvider.java | 2 +-
...viceComponentConfigurationResourceProvider.java | 2 +-
.../internal/ServiceResourceProvider.java | 2 +-
.../internal/UpgradeResourceProvider.java | 2 +-
.../logging/LogSearchDataRetrievalService.java | 2 +-
.../logging/LoggingRequestHelperImpl.java | 2 +-
.../events/publishers/AgentCommandsPublisher.java | 2 +-
.../metrics/system/impl/AmbariMetricSinkImpl.java | 2 +-
.../server/orm/dao/ConfigGroupHostMappingDAO.java | 4 ++--
.../server/orm/dao/HostConfigMappingDAO.java | 4 ++--
.../ambari/server/orm/dao/HostRoleCommandDAO.java | 2 +-
.../ambari/server/orm/dao/KerberosKeytabDAO.java | 2 +-
.../server/orm/dao/KerberosKeytabPrincipalDAO.java | 2 +-
.../server/orm/dao/KerberosPrincipalDAO.java | 2 +-
.../apache/ambari/server/orm/dao/RequestDAO.java | 2 +-
.../orm/dao/ServiceComponentDesiredStateDAO.java | 2 +-
.../ambari/server/orm/dao/ServiceConfigDAO.java | 4 ++--
.../org/apache/ambari/server/orm/dao/StageDAO.java | 2 +-
.../AmbariAuthToLocalUserDetailsService.java | 2 +-
.../AmbariLdapAuthenticationProvider.java | 2 +-
.../server/security/authorization/Users.java | 2 +-
.../security/encryption/PropertiesEncryptor.java | 2 +-
.../AbstractPrepareKerberosServerAction.java | 2 +-
.../kerberos/DestroyPrincipalsServerAction.java | 4 ++--
.../kerberos/IPAKerberosOperationHandler.java | 2 +-
.../kerberos/KDCKerberosOperationHandler.java | 2 +-
.../kerberos/MITKerberosOperationHandler.java | 2 +-
.../PrepareDisableKerberosServerAction.java | 2 +-
.../PrepareKerberosIdentitiesServerAction.java | 2 +-
.../stageutils/KerberosKeytabController.java | 2 +-
.../DeleteUnsupportedServicesAndComponents.java | 2 +-
.../upgrades/PreconfigureKerberosAction.java | 4 ++--
.../org/apache/ambari/server/stack/RepoUtil.java | 2 +-
.../apache/ambari/server/stack/StackContext.java | 2 +-
.../server/stack/upgrade/ColocatedGrouping.java | 2 +-
.../server/stack/upgrade/HostOrderGrouping.java | 2 +-
.../ambari/server/stack/upgrade/UpgradePack.java | 2 +-
.../orchestrate/ParallelClientGroupingBuilder.java | 2 +-
.../stack/upgrade/orchestrate/StageWrapper.java | 2 +-
.../upgrade/orchestrate/StageWrapperBuilder.java | 2 +-
.../upgrade/orchestrate/TaskWrapperBuilder.java | 2 +-
.../stack/upgrade/orchestrate/UpgradeContext.java | 2 +-
.../stack/upgrade/orchestrate/UpgradeHelper.java | 2 +-
.../apache/ambari/server/state/CheckHelper.java | 2 +-
.../apache/ambari/server/state/ConfigHelper.java | 4 ++--
.../ambari/server/state/ConfigMergeHelper.java | 2 +-
.../apache/ambari/server/state/DependencyInfo.java | 2 +-
.../ambari/server/state/ServiceComponentImpl.java | 4 ++--
.../server/state/ServiceComponentSupport.java | 2 +-
.../ambari/server/state/cluster/ClusterImpl.java | 4 ++--
.../state/kerberos/KerberosIdentityDescriptor.java | 2 +-
.../ambari/server/state/stack/RepoVdfCallable.java | 2 +-
.../server/state/stack/StackRoleCommandOrder.java | 2 +-
.../topology/ClusterConfigurationRequest.java | 2 +-
.../ambari/server/upgrade/UpgradeCatalog252.java | 2 +-
.../ambari/server/upgrade/UpgradeCatalog270.java | 2 +-
.../ambari/server/upgrade/UpgradeCatalog271.java | 2 +-
.../apache/ambari/server/view/ViewRegistry.java | 2 +-
.../server/actionmanager/TestActionManager.java | 2 +-
.../server/agent/stomp/AgentDataHolderTest.java | 2 +-
.../ambari/server/api/AmbariErrorHandlerTest.java | 17 +++++++-------
.../api/services/DeleteResultMetaDataTest.java | 2 +-
.../AmbariMetricsHadoopSinkVersionCheckTest.java | 4 ++--
.../checks/ComponentsInstallationCheckTest.java | 12 +++++-----
.../checks/DatabaseConsistencyCheckHelperTest.java | 2 +-
.../server/collections/PredicateUtilsTest.java | 2 +-
.../AmbariCustomCommandExecutionHelperTest.java | 2 +-
.../controller/AmbariManagementControllerTest.java | 4 ++--
.../internal/ClientConfigResourceProviderTest.java | 6 ++++-
.../internal/DeleteStatusMetaDataTest.java | 2 +-
.../internal/UpgradeResourceProviderTest.java | 2 +-
.../internal/WidgetResourceProviderTest.java | 17 +++++++++++---
.../ganglia/GangliaPropertyProviderTest.java | 4 ++--
.../upgrades/PreconfigureKerberosActionTest.java | 2 +-
.../apache/ambari/server/state/ServiceTest.java | 2 +-
.../server/state/cluster/ClusterImplTest.java | 2 +-
.../state/kerberos/KerberosDescriptorTest.java | 2 +-
ambari-utility/pom.xml | 9 ++++----
contrib/views/pom.xml | 6 ++---
114 files changed, 211 insertions(+), 186 deletions(-)
diff --git a/ambari-agent/pom.xml b/ambari-agent/pom.xml
index f1587d2bfa..6df63da55f 100644
--- a/ambari-agent/pom.xml
+++ b/ambari-agent/pom.xml
@@ -75,8 +75,9 @@
<artifactId>commons-cli</artifactId>
</dependency>
<dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
+ <version>4.4</version>
</dependency>
<dependency>
<groupId>commons-configuration</groupId>
diff --git a/ambari-agent/src/packages/tarball/all.xml
b/ambari-agent/src/packages/tarball/all.xml
index 62ab5be870..50e5d4265e 100644
--- a/ambari-agent/src/packages/tarball/all.xml
+++ b/ambari-agent/src/packages/tarball/all.xml
@@ -240,7 +240,7 @@
<unpack>false</unpack>
<includes>
<include>commons-cli:commons-cli</include>
- <include>commons-collections:commons-collections</include>
+ <include>org.apache.commons:commons-collections4</include>
<include>commons-configuration:commons-configuration</include>
<include>commons-io:commons-io</include>
<include>commons-lang:commons-lang</include>
diff --git a/ambari-project/pom.xml b/ambari-project/pom.xml
index e856315691..263eeb3c55 100644
--- a/ambari-project/pom.xml
+++ b/ambari-project/pom.xml
@@ -109,9 +109,9 @@
<version>1.3.1</version>
</dependency>
<dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2.2</version>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
+ <version>4.4</version>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
@@ -119,8 +119,8 @@
<version>1.9.4</version>
<exclusions>
<exclusion>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
</exclusion>
</exclusions>
</dependency>
diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml
index 105fddb7ac..bc30011d8e 100644
--- a/ambari-server/pom.xml
+++ b/ambari-server/pom.xml
@@ -1188,8 +1188,9 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
+ <version>4.4</version>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
@@ -1330,6 +1331,12 @@
<version>3.5.10</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-inline</artifactId>
+ <version>3.5.10</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-security</artifactId>
@@ -1657,8 +1664,8 @@
<version>2.3</version>
<exclusions>
<exclusion>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -1795,8 +1802,8 @@
<version>${hadoop.version}</version>
<exclusions>
<exclusion>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
</exclusion>
<exclusion>
<groupId>commons-beanutils</groupId>
@@ -1894,8 +1901,8 @@
<scope>provided</scope> <!-- for @ApiIgnore -->
<exclusions>
<exclusion>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
</exclusion>
<exclusion>
<groupId>commons-beanutils</groupId>
@@ -1934,8 +1941,8 @@
<version>2.0.0-M24</version>
<exclusions>
<exclusion>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.directory.api</groupId>
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java
b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java
index 6c9252d37e..17c6e94fd5 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java
@@ -70,7 +70,7 @@ import
org.apache.ambari.server.state.ServiceComponentHostEvent;
import org.apache.ambari.server.state.fsm.InvalidStateTransitionException;
import
org.apache.ambari.server.state.svccomphost.ServiceComponentHostOpFailedEvent;
import org.apache.ambari.server.utils.StageUtils;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java
b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java
index 3b1f572868..4e79f0154e 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java
@@ -54,7 +54,7 @@ import
org.apache.ambari.server.state.host.HostHealthyHeartbeatEvent;
import org.apache.ambari.server.state.host.HostRegistrationRequestEvent;
import org.apache.ambari.server.state.host.HostStatusUpdatesReceivedEvent;
import org.apache.ambari.server.utils.VersionUtils;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatProcessor.java
b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatProcessor.java
index 1d17ff245b..7af01b1a27 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatProcessor.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatProcessor.java
@@ -76,7 +76,7 @@ import
org.apache.ambari.server.state.svccomphost.ServiceComponentHostOpSucceede
import
org.apache.ambari.server.state.svccomphost.ServiceComponentHostStartedEvent;
import
org.apache.ambari.server.state.svccomphost.ServiceComponentHostStoppedEvent;
import org.apache.ambari.spi.upgrade.UpgradeType;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/AgentConfigsHolder.java
b/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/AgentConfigsHolder.java
index 5845f90da9..22eebe909e 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/AgentConfigsHolder.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/AgentConfigsHolder.java
@@ -29,7 +29,7 @@ import org.apache.ambari.server.state.Clusters;
import org.apache.ambari.server.state.ConfigHelper;
import org.apache.ambari.server.state.Host;
import org.apache.ambari.server.utils.ThreadPools;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/AlertDefinitionsHolder.java
b/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/AlertDefinitionsHolder.java
index 6f3723f360..30faa16be4 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/AlertDefinitionsHolder.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/AlertDefinitionsHolder.java
@@ -45,7 +45,7 @@ import org.apache.ambari.server.state.alert.AlertDefinition;
import org.apache.ambari.server.state.alert.AlertDefinitionFactory;
import org.apache.ambari.server.state.alert.AlertDefinitionHash;
import org.apache.ambari.server.state.alert.AlertHelper;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/HostLevelParamsHolder.java
b/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/HostLevelParamsHolder.java
index ce96cbdb28..5c0efd5b42 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/HostLevelParamsHolder.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/HostLevelParamsHolder.java
@@ -36,7 +36,7 @@ import org.apache.ambari.server.state.Cluster;
import org.apache.ambari.server.state.Clusters;
import org.apache.ambari.server.state.Host;
import org.apache.ambari.server.state.ServiceComponentHost;
-import org.apache.commons.collections.MapUtils;
+import org.apache.commons.collections4.MapUtils;
import com.google.common.eventbus.Subscribe;
import com.google.inject.Inject;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/MetadataHolder.java
b/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/MetadataHolder.java
index 8fd895163e..f0fbf25026 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/MetadataHolder.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/MetadataHolder.java
@@ -33,8 +33,8 @@ import org.apache.ambari.server.events.UpdateEventType;
import org.apache.ambari.server.events.publishers.AmbariEventPublisher;
import org.apache.ambari.server.state.Cluster;
import org.apache.ambari.server.state.Clusters;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections.MapUtils;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.MapUtils;
import com.google.common.eventbus.Subscribe;
import com.google.inject.Inject;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/TopologyHolder.java
b/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/TopologyHolder.java
index 4eb877ce67..4ee2088e4f 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/TopologyHolder.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/TopologyHolder.java
@@ -43,7 +43,7 @@ import org.apache.ambari.server.state.Host;
import org.apache.ambari.server.state.Service;
import org.apache.ambari.server.state.ServiceComponent;
import org.apache.ambari.server.state.ServiceComponentHost;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/dto/TopologyCluster.java
b/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/dto/TopologyCluster.java
index 272f1e189f..10996081db 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/dto/TopologyCluster.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/dto/TopologyCluster.java
@@ -23,8 +23,8 @@ import java.util.Set;
import org.apache.ambari.server.NullHostNameException;
import org.apache.ambari.server.events.UpdateEventType;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections.SetUtils;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.SetUtils;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/dto/TopologyComponent.java
b/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/dto/TopologyComponent.java
index 1351e79e6a..2e902f7fde 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/dto/TopologyComponent.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/dto/TopologyComponent.java
@@ -24,8 +24,8 @@ import java.util.Set;
import java.util.TreeMap;
import org.apache.ambari.server.state.State;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections.MapUtils;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.MapUtils;
import org.apache.commons.lang.StringUtils;
import com.fasterxml.jackson.annotation.JsonInclude;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/ConfigurationRecommendationCommand.java
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/ConfigurationRecommendationCommand.java
index d30b6295d8..25b0c9ea85 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/ConfigurationRecommendationCommand.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/ConfigurationRecommendationCommand.java
@@ -33,7 +33,7 @@ import
org.apache.ambari.server.api.services.stackadvisor.recommendations.Recomm
import
org.apache.ambari.server.api.services.stackadvisor.recommendations.RecommendationResponse.HostGroup;
import
org.apache.ambari.server.controller.internal.AmbariServerConfigurationHandler;
import org.apache.ambari.server.state.ServiceInfo;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import com.fasterxml.jackson.databind.JsonNode;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/StackAdvisorCommand.java
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/StackAdvisorCommand.java
index e38c5ea2e9..d621df3999 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/StackAdvisorCommand.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/StackAdvisorCommand.java
@@ -52,7 +52,7 @@ import
org.apache.ambari.server.controller.internal.AmbariServerConfigurationHan
import org.apache.ambari.server.controller.spi.Resource;
import org.apache.ambari.server.state.ServiceInfo;
import org.apache.ambari.server.utils.DateUtils;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/checks/AmbariMetricsHadoopSinkVersionCompatibilityCheck.java
b/ambari-server/src/main/java/org/apache/ambari/server/checks/AmbariMetricsHadoopSinkVersionCompatibilityCheck.java
index 4891ea7e93..0e484f7672 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/checks/AmbariMetricsHadoopSinkVersionCompatibilityCheck.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/checks/AmbariMetricsHadoopSinkVersionCompatibilityCheck.java
@@ -50,7 +50,7 @@ import org.apache.ambari.spi.upgrade.UpgradeCheckRequest;
import org.apache.ambari.spi.upgrade.UpgradeCheckResult;
import org.apache.ambari.spi.upgrade.UpgradeCheckStatus;
import org.apache.ambari.spi.upgrade.UpgradeCheckType;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java
b/ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java
index 81153ea7e7..5f2c491817 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java
@@ -72,7 +72,7 @@ import org.apache.ambari.server.state.State;
import org.apache.ambari.server.state.UpgradeState;
import org.apache.ambari.server.state.configgroup.ConfigGroup;
import org.apache.ambari.server.utils.VersionUtils;
-import org.apache.commons.collections.MapUtils;
+import org.apache.commons.collections4.MapUtils;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/collections/Predicate.java
b/ambari-server/src/main/java/org/apache/ambari/server/collections/Predicate.java
index f7e20ddcf2..42c816700e 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/collections/Predicate.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/collections/Predicate.java
@@ -23,10 +23,10 @@ import java.util.Map;
import com.google.gson.Gson;
/**
- * {@link Predicate} wraps {@link org.apache.commons.collections.Predicate} to
+ * {@link Predicate} wraps {@link org.apache.commons.collections4.Predicate} to
* provide additional functionality like serializing to and from a Map and
JSON formatted data.
*/
-public abstract class Predicate implements
org.apache.commons.collections.Predicate {
+public abstract class Predicate implements
org.apache.commons.collections4.Predicate {
/**
* The name of this predicate. For example "and", "or", etc...
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/collections/functors/AndPredicate.java
b/ambari-server/src/main/java/org/apache/ambari/server/collections/functors/AndPredicate.java
index 737e540759..bc32e3d0d6 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/collections/functors/AndPredicate.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/collections/functors/AndPredicate.java
@@ -23,11 +23,11 @@ import java.util.Iterator;
import java.util.Map;
import org.apache.ambari.server.collections.PredicateUtils;
-import org.apache.commons.collections.Predicate;
-import org.apache.commons.collections.functors.PredicateDecorator;
+import org.apache.commons.collections4.Predicate;
+import org.apache.commons.collections4.functors.PredicateDecorator;
/**
- * {@link AndPredicate} wraps {@link
org.apache.commons.collections.functors.AndPredicate} to
+ * {@link AndPredicate} wraps {@link
org.apache.commons.collections4.functors.AndPredicate} to
* provide additional functionality like serializing to and from a Map and
JSON formatted data.
* <p>
* See {@link DelegatedMultiplePredicateContainer}
@@ -80,7 +80,7 @@ public class AndPredicate extends
DelegatedMultiplePredicateContainer {
*/
public AndPredicate(Predicate predicate1, Predicate predicate2) {
super(NAME,
- (PredicateDecorator)
org.apache.commons.collections.functors.AndPredicate.getInstance(predicate1,
predicate2));
+ (PredicateDecorator)
org.apache.commons.collections4.functors.AndPredicate.andPredicate(predicate1,
predicate2));
}
@Override
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/collections/functors/ContextTransformer.java
b/ambari-server/src/main/java/org/apache/ambari/server/collections/functors/ContextTransformer.java
index af20eafcf6..e4bf8cabc8 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/collections/functors/ContextTransformer.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/collections/functors/ContextTransformer.java
@@ -20,7 +20,7 @@ package org.apache.ambari.server.collections.functors;
import java.util.Map;
-import org.apache.commons.collections.Transformer;
+import org.apache.commons.collections4.Transformer;
/**
* {@link ContextTransformer} is a {@link Transformer} implementation that
traverses a {@link Map}
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/collections/functors/DelegatedMultiplePredicateContainer.java
b/ambari-server/src/main/java/org/apache/ambari/server/collections/functors/DelegatedMultiplePredicateContainer.java
index 229f1ec6dc..271c3dd352 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/collections/functors/DelegatedMultiplePredicateContainer.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/collections/functors/DelegatedMultiplePredicateContainer.java
@@ -24,7 +24,7 @@ import java.util.List;
import java.util.Map;
import org.apache.ambari.server.collections.Predicate;
-import org.apache.commons.collections.functors.PredicateDecorator;
+import org.apache.commons.collections4.functors.PredicateDecorator;
/**
* DelegatedMultiplePredicateContainer is an abstract class providing
functionality related to
@@ -60,7 +60,7 @@ abstract class DelegatedMultiplePredicateContainer extends
Predicate implements
}
@Override
- public org.apache.commons.collections.Predicate[] getPredicates() {
+ public org.apache.commons.collections4.Predicate[] getPredicates() {
return delegate.getPredicates();
}
@@ -95,10 +95,10 @@ abstract class DelegatedMultiplePredicateContainer extends
Predicate implements
List<Map<String, Object>> list = new ArrayList<>();
if (delegate != null) {
- org.apache.commons.collections.Predicate[] predicates =
delegate.getPredicates();
+ org.apache.commons.collections4.Predicate[] predicates =
delegate.getPredicates();
if (predicates != null) {
- for (org.apache.commons.collections.Predicate p : predicates) {
+ for (org.apache.commons.collections4.Predicate p : predicates) {
if (p instanceof Predicate) {
list.add(((Predicate) p).toMap());
} else {
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/collections/functors/DelegatedSinglePredicateContainer.java
b/ambari-server/src/main/java/org/apache/ambari/server/collections/functors/DelegatedSinglePredicateContainer.java
index ed441519c8..dd0cf7f750 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/collections/functors/DelegatedSinglePredicateContainer.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/collections/functors/DelegatedSinglePredicateContainer.java
@@ -22,7 +22,7 @@ import java.util.Collections;
import java.util.Map;
import org.apache.ambari.server.collections.Predicate;
-import org.apache.commons.collections.functors.PredicateDecorator;
+import org.apache.commons.collections4.functors.PredicateDecorator;
/**
* DelegatedSinglePredicateContainer is an abstract class providing
functionality to managing a
@@ -57,7 +57,7 @@ abstract class DelegatedSinglePredicateContainer extends
Predicate implements Pr
}
@Override
- public org.apache.commons.collections.Predicate[] getPredicates() {
+ public org.apache.commons.collections4.Predicate[] getPredicates() {
return delegate.getPredicates();
}
@@ -92,11 +92,11 @@ abstract class DelegatedSinglePredicateContainer extends
Predicate implements Pr
Map<String, Object> map = null;
if (delegate != null) {
- org.apache.commons.collections.Predicate[] predicates =
delegate.getPredicates();
+ org.apache.commons.collections4.Predicate[] predicates =
delegate.getPredicates();
if ((predicates != null) && (predicates.length > 0)) {
// Only process the 1st predicate.
- org.apache.commons.collections.Predicate p = predicates[0];
+ org.apache.commons.collections4.Predicate p = predicates[0];
if (p instanceof Predicate) {
map = ((Predicate) p).toMap();
} else {
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/collections/functors/EqualsPredicate.java
b/ambari-server/src/main/java/org/apache/ambari/server/collections/functors/EqualsPredicate.java
index f1bba47093..2749c06f95 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/collections/functors/EqualsPredicate.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/collections/functors/EqualsPredicate.java
@@ -26,10 +26,10 @@ import java.util.Iterator;
import java.util.Map;
import org.apache.ambari.server.collections.Predicate;
-import org.apache.commons.collections.functors.EqualPredicate;
+import org.apache.commons.collections4.functors.EqualPredicate;
/**
- * {@link EqualsPredicate} wraps {@link
org.apache.commons.collections.functors.EqualPredicate} to
+ * {@link EqualsPredicate} wraps {@link
org.apache.commons.collections4.functors.EqualPredicate} to
* provide additional functionality like serializing to and from a Map and
JSON formatted data as well
* as obtaining data using a {@link ContextTransformer}
*/
@@ -41,9 +41,9 @@ public class EqualsPredicate extends OperationPredicate {
public static final String NAME = "equals";
/**
- * The {@link org.apache.commons.collections.functors.EqualPredicate} to
delegate operations to
+ * The {@link org.apache.commons.collections4.functors.EqualPredicate} to
delegate operations to
*/
- private final org.apache.commons.collections.functors.EqualPredicate
delegate;
+ private final org.apache.commons.collections4.functors.EqualPredicate
delegate;
/**
* Creates a new {@link EqualsPredicate} using the given {@link Map} of data.
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/collections/functors/NotPredicate.java
b/ambari-server/src/main/java/org/apache/ambari/server/collections/functors/NotPredicate.java
index 72ad788004..15b4ee672c 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/collections/functors/NotPredicate.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/collections/functors/NotPredicate.java
@@ -21,11 +21,11 @@ package org.apache.ambari.server.collections.functors;
import java.util.Map;
import org.apache.ambari.server.collections.PredicateUtils;
-import org.apache.commons.collections.Predicate;
-import org.apache.commons.collections.functors.PredicateDecorator;
+import org.apache.commons.collections4.Predicate;
+import org.apache.commons.collections4.functors.PredicateDecorator;
/**
- * {@link NotPredicate} wraps {@link
org.apache.commons.collections.functors.NotPredicate} to
+ * {@link NotPredicate} wraps {@link
org.apache.commons.collections4.functors.NotPredicate} to
* provide additional functionality like serializing to and from a Map and
JSON formatted data.
* <p>
* See {@link DelegatedSinglePredicateContainer}
@@ -64,7 +64,7 @@ public class NotPredicate extends
DelegatedSinglePredicateContainer {
*/
public NotPredicate(Predicate predicate) {
super(NAME,
- (PredicateDecorator)
org.apache.commons.collections.functors.NotPredicate.getInstance(predicate));
+ (PredicateDecorator)
org.apache.commons.collections4.functors.NotPredicate.notPredicate(predicate));
}
@Override
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/collections/functors/OperationPredicate.java
b/ambari-server/src/main/java/org/apache/ambari/server/collections/functors/OperationPredicate.java
index c57f7c262e..f52d230271 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/collections/functors/OperationPredicate.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/collections/functors/OperationPredicate.java
@@ -19,12 +19,12 @@
package org.apache.ambari.server.collections.functors;
import org.apache.ambari.server.collections.Predicate;
-import org.apache.commons.collections.Transformer;
+import org.apache.commons.collections4.Transformer;
/**
* OperationPredicate is an abstract class providing functionality of
transforming the input context
* before executing the implementation-specific
- * {@link org.apache.commons.collections.Predicate#evaluate(Object)} method.
+ * {@link org.apache.commons.collections4.Predicate#evaluate(Object)} method.
*/
abstract class OperationPredicate extends Predicate {
/**
@@ -66,7 +66,7 @@ abstract class OperationPredicate extends Predicate {
* Gets the context key assigned to the {@link ContextTransformer}.
* <p>
* This key is used to identify which value from the context a passed to the
- * {@link org.apache.commons.collections.Predicate#evaluate(Object)} method
+ * {@link org.apache.commons.collections4.Predicate#evaluate(Object)} method
*
* @return a key name
*/
@@ -105,7 +105,7 @@ abstract class OperationPredicate extends Predicate {
*
* @param data the transformed data to use
* @return the result of the evaluation (<code>true</code>,
<code>false</code>)
- * @see org.apache.commons.collections.Predicate#evaluate(Object)
+ * @see org.apache.commons.collections4.Predicate#evaluate(Object)
*/
protected abstract boolean evaluateTransformedData(Object data);
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/collections/functors/OrPredicate.java
b/ambari-server/src/main/java/org/apache/ambari/server/collections/functors/OrPredicate.java
index 4134c654fd..5b2b4e10ba 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/collections/functors/OrPredicate.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/collections/functors/OrPredicate.java
@@ -23,11 +23,11 @@ import java.util.Iterator;
import java.util.Map;
import org.apache.ambari.server.collections.PredicateUtils;
-import org.apache.commons.collections.Predicate;
-import org.apache.commons.collections.functors.PredicateDecorator;
+import org.apache.commons.collections4.Predicate;
+import org.apache.commons.collections4.functors.PredicateDecorator;
/**
- * {@link OrPredicate} wraps {@link
org.apache.commons.collections.functors.OrPredicate} to
+ * {@link OrPredicate} wraps {@link
org.apache.commons.collections4.functors.OrPredicate} to
* provide additional functionality like serializing to and from a Map and
JSON formatted data.
* <p>
* See {@link DelegatedMultiplePredicateContainer}
@@ -80,7 +80,7 @@ public class OrPredicate extends
DelegatedMultiplePredicateContainer {
*/
public OrPredicate(Predicate predicate1, Predicate predicate2) {
super(NAME,
- (PredicateDecorator)
org.apache.commons.collections.functors.OrPredicate.getInstance(predicate1,
predicate2));
+ (PredicateDecorator)
org.apache.commons.collections4.functors.OrPredicate.orPredicate(predicate1,
predicate2));
}
@Override
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
index cec5cccbc2..6a6e3daf1d 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
@@ -251,8 +251,8 @@ import org.apache.ambari.server.topology.Setting;
import org.apache.ambari.server.utils.SecretReference;
import org.apache.ambari.server.utils.StageUtils;
import org.apache.ambari.server.utils.URLCredentialsHider;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections.MapUtils;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.MapUtils;
import org.apache.commons.lang.BooleanUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.math.NumberUtils;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/DeleteIdentityHandler.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/DeleteIdentityHandler.java
index 23abaceb67..c58a763a97 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/DeleteIdentityHandler.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/DeleteIdentityHandler.java
@@ -56,7 +56,7 @@ import org.apache.ambari.server.state.StackId;
import org.apache.ambari.server.state.kerberos.KerberosDescriptor;
import
org.apache.ambari.server.state.svccomphost.ServiceComponentHostServerActionEvent;
import org.apache.ambari.server.utils.StageUtils;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import com.google.gson.reflect.TypeToken;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java
index 9a40938ada..866a1cd7f3 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java
@@ -135,7 +135,7 @@ import
org.apache.ambari.server.state.kerberos.KerberosServiceDescriptor;
import org.apache.ambari.server.state.kerberos.VariableReplacementHelper;
import
org.apache.ambari.server.state.svccomphost.ServiceComponentHostServerActionEvent;
import org.apache.ambari.server.utils.StageUtils;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.directory.server.kerberos.shared.keytab.Keytab;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/RootServiceResponseFactory.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/RootServiceResponseFactory.java
index 63d41fd7cf..e4e43ceb0a 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/RootServiceResponseFactory.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/RootServiceResponseFactory.java
@@ -30,8 +30,8 @@ import org.apache.ambari.server.ObjectNotFoundException;
import org.apache.ambari.server.api.services.AmbariMetaInfo;
import org.apache.ambari.server.configuration.Configuration;
import org.apache.ambari.server.utils.StageUtils;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections.Predicate;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.Predicate;
import org.apache.commons.lang.ArrayUtils;
import com.google.inject.Inject;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java
index 90c0616e08..2f170c9b40 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java
@@ -68,8 +68,8 @@ import org.apache.ambari.server.state.DesiredConfig;
import org.apache.ambari.server.state.Host;
import org.apache.ambari.server.state.Service;
import org.apache.ambari.server.state.ServiceComponentHost;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections.MapUtils;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.MapUtils;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
index e1c91e979b..8971fe3b99 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
@@ -83,7 +83,7 @@ import
org.apache.ambari.server.state.repository.VersionDefinitionXml;
import org.apache.ambari.server.utils.StageUtils;
import org.apache.ambari.server.utils.VersionUtils;
import org.apache.ambari.spi.RepositoryType;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProvider.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProvider.java
index df3ba4cebe..8548e45214 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProvider.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProvider.java
@@ -62,7 +62,7 @@ import org.apache.ambari.server.state.ConfigHelper;
import org.apache.ambari.server.state.Host;
import org.apache.ambari.server.state.configgroup.ConfigGroup;
import org.apache.ambari.server.state.configgroup.ConfigGroupFactory;
-import org.apache.commons.collections.MapUtils;
+import org.apache.commons.collections4.MapUtils;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProvider.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProvider.java
index 04d98376ad..dd415de727 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProvider.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProvider.java
@@ -63,7 +63,7 @@ import org.apache.ambari.server.state.RepositoryVersionState;
import org.apache.ambari.server.state.ServiceComponentHost;
import org.apache.ambari.server.state.StackId;
import org.apache.ambari.server.utils.StageUtils;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.BooleanUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.Validate;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProvider.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProvider.java
index 9fcda17944..f5ab7d84f2 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProvider.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProvider.java
@@ -66,7 +66,7 @@ import org.apache.ambari.server.state.StackInfo;
import org.apache.ambari.server.state.repository.ManifestServiceInfo;
import org.apache.ambari.server.state.repository.VersionDefinitionXml;
import org.apache.ambari.server.utils.URLCredentialsHider;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.ObjectUtils;
import org.apache.commons.lang.StringUtils;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RootServiceComponentConfigurationResourceProvider.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RootServiceComponentConfigurationResourceProvider.java
index 1c20bfd1f4..3f1bc62293 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RootServiceComponentConfigurationResourceProvider.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RootServiceComponentConfigurationResourceProvider.java
@@ -41,7 +41,7 @@ import
org.apache.ambari.server.controller.utilities.PredicateHelper;
import org.apache.ambari.server.controller.utilities.PropertyHelper;
import org.apache.ambari.server.security.authorization.RoleAuthorization;
import org.apache.ambari.server.utils.SecretReference;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import com.google.inject.Inject;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceResourceProvider.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceResourceProvider.java
index 7d0ec624a0..392ba7f35c 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceResourceProvider.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceResourceProvider.java
@@ -81,7 +81,7 @@ import
org.apache.ambari.server.topology.addservice.AddServiceOrchestrator;
import org.apache.ambari.server.topology.addservice.AddServiceRequest;
import org.apache.ambari.server.utils.LoggingPreconditions;
import org.apache.ambari.spi.RepositoryType;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.Validate;
import org.slf4j.Logger;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
index 0f7ddf73ce..ec39569bc2 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
@@ -113,7 +113,7 @@ import org.apache.ambari.server.state.StackInfo;
import
org.apache.ambari.server.state.svccomphost.ServiceComponentHostServerActionEvent;
import org.apache.ambari.spi.upgrade.UpgradeAction;
import org.apache.ambari.spi.upgrade.UpgradeType;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LogSearchDataRetrievalService.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LogSearchDataRetrievalService.java
index 8c61c0f2db..d7d99bfd39 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LogSearchDataRetrievalService.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LogSearchDataRetrievalService.java
@@ -30,7 +30,7 @@ import org.apache.ambari.server.AmbariService;
import org.apache.ambari.server.configuration.Configuration;
import org.apache.ambari.server.controller.AmbariManagementController;
import org.apache.ambari.server.controller.AmbariServer;
-import org.apache.commons.collections.MapUtils;
+import org.apache.commons.collections4.MapUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LoggingRequestHelperImpl.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LoggingRequestHelperImpl.java
index f3807769c0..3f63c9f07a 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LoggingRequestHelperImpl.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LoggingRequestHelperImpl.java
@@ -51,7 +51,7 @@ import
org.apache.ambari.server.security.encryption.CredentialStoreService;
import org.apache.ambari.server.state.Cluster;
import org.apache.ambari.server.state.Config;
import org.apache.commons.codec.binary.Base64;
-import org.apache.commons.collections.MapUtils;
+import org.apache.commons.collections4.MapUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.http.client.utils.URIBuilder;
import org.slf4j.Logger;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/events/publishers/AgentCommandsPublisher.java
b/ambari-server/src/main/java/org/apache/ambari/server/events/publishers/AgentCommandsPublisher.java
index a31db1f848..3f4c266042 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/events/publishers/AgentCommandsPublisher.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/events/publishers/AgentCommandsPublisher.java
@@ -61,7 +61,7 @@ import org.apache.ambari.server.utils.StageUtils;
import org.apache.ambari.server.utils.ThreadPools;
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.codec.digest.DigestUtils;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.io.IOUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/AmbariMetricSinkImpl.java
b/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/AmbariMetricSinkImpl.java
index 2a5b69e816..f8e5be4ba9 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/AmbariMetricSinkImpl.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/AmbariMetricSinkImpl.java
@@ -49,7 +49,7 @@ import org.apache.ambari.server.state.ConfigHelper;
import org.apache.ambari.server.state.Service;
import org.apache.ambari.server.state.ServiceComponent;
import org.apache.ambari.server.state.ServiceComponentHost;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.hadoop.metrics2.sink.timeline.AbstractTimelineMetricsSink;
import org.apache.hadoop.metrics2.sink.timeline.TimelineMetric;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ConfigGroupHostMappingDAO.java
b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ConfigGroupHostMappingDAO.java
index 7deec43b43..7a574df7c3 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ConfigGroupHostMappingDAO.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ConfigGroupHostMappingDAO.java
@@ -43,8 +43,8 @@ import org.apache.ambari.server.state.cluster.ClusterFactory;
import org.apache.ambari.server.state.configgroup.ConfigGroup;
import org.apache.ambari.server.state.configgroup.ConfigGroupFactory;
import org.apache.ambari.server.state.host.HostFactory;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections.Predicate;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.Predicate;
import com.google.inject.Inject;
import com.google.inject.Provider;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/HostConfigMappingDAO.java
b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/HostConfigMappingDAO.java
index 3efc4f6a1b..75329543e0 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/HostConfigMappingDAO.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/HostConfigMappingDAO.java
@@ -35,8 +35,8 @@ import org.apache.ambari.server.orm.cache.HostConfigMapping;
import org.apache.ambari.server.orm.cache.HostConfigMappingImpl;
import org.apache.ambari.server.orm.entities.HostConfigMappingEntity;
import org.apache.ambari.server.orm.entities.HostEntity;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections.Predicate;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.Predicate;
import com.google.inject.Inject;
import com.google.inject.Provider;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/HostRoleCommandDAO.java
b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/HostRoleCommandDAO.java
index feac89696c..1da7677049 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/HostRoleCommandDAO.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/HostRoleCommandDAO.java
@@ -65,7 +65,7 @@ import
org.apache.ambari.server.orm.entities.HostRoleCommandEntity_;
import org.apache.ambari.server.orm.entities.StageEntity;
import org.apache.ambari.server.orm.helpers.SQLConstants;
import org.apache.ambari.server.orm.helpers.SQLOperations;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.eclipse.persistence.config.HintValues;
import org.eclipse.persistence.config.QueryHints;
import org.slf4j.Logger;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/KerberosKeytabDAO.java
b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/KerberosKeytabDAO.java
index 5b7927062e..9bf4c40416 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/KerberosKeytabDAO.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/KerberosKeytabDAO.java
@@ -30,7 +30,7 @@ import org.apache.ambari.server.orm.RequiresSession;
import org.apache.ambari.server.orm.entities.KerberosKeytabEntity;
import org.apache.ambari.server.orm.entities.KerberosKeytabPrincipalEntity;
import
org.apache.ambari.server.serveraction.kerberos.stageutils.ResolvedKerberosKeytab;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/KerberosKeytabPrincipalDAO.java
b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/KerberosKeytabPrincipalDAO.java
index 7257acb26f..2ea1e33f8b 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/KerberosKeytabPrincipalDAO.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/KerberosKeytabPrincipalDAO.java
@@ -39,7 +39,7 @@ import
org.apache.ambari.server.orm.entities.KerberosKeytabServiceMappingEntity;
import org.apache.ambari.server.orm.entities.KerberosPrincipalEntity;
import org.apache.ambari.server.orm.helpers.SQLConstants;
import org.apache.ambari.server.orm.helpers.SQLOperations;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import com.google.inject.Inject;
import com.google.inject.Provider;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/KerberosPrincipalDAO.java
b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/KerberosPrincipalDAO.java
index 5db85909d4..bb02f2cb9d 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/KerberosPrincipalDAO.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/KerberosPrincipalDAO.java
@@ -28,7 +28,7 @@ import javax.persistence.TypedQuery;
import org.apache.ambari.server.orm.RequiresSession;
import org.apache.ambari.server.orm.entities.KerberosKeytabPrincipalEntity;
import org.apache.ambari.server.orm.entities.KerberosPrincipalEntity;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/RequestDAO.java
b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/RequestDAO.java
index 42e5ca669f..a7139fe3a5 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/RequestDAO.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/RequestDAO.java
@@ -48,7 +48,7 @@ import
org.apache.ambari.server.orm.entities.TopologyLogicalTaskEntity;
import org.apache.ambari.server.orm.helpers.SQLConstants;
import org.apache.ambari.server.orm.helpers.SQLOperations;
import org.apache.ambari.server.state.Clusters;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.eclipse.persistence.config.HintValues;
import org.eclipse.persistence.config.QueryHints;
import org.slf4j.Logger;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ServiceComponentDesiredStateDAO.java
b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ServiceComponentDesiredStateDAO.java
index f519974288..4114321ca9 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ServiceComponentDesiredStateDAO.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ServiceComponentDesiredStateDAO.java
@@ -34,7 +34,7 @@ import javax.persistence.criteria.Root;
import org.apache.ambari.server.orm.RequiresSession;
import
org.apache.ambari.server.orm.entities.ServiceComponentDesiredStateEntity;
import org.apache.ambari.server.orm.entities.ServiceComponentVersionEntity;
-import org.apache.commons.collections.MapUtils;
+import org.apache.commons.collections4.MapUtils;
import com.google.inject.Inject;
import com.google.inject.Provider;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ServiceConfigDAO.java
b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ServiceConfigDAO.java
index 978540a37c..8516dfdda7 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ServiceConfigDAO.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ServiceConfigDAO.java
@@ -35,8 +35,8 @@ import org.apache.ambari.server.orm.RequiresSession;
import org.apache.ambari.server.orm.entities.ServiceConfigEntity;
import org.apache.ambari.server.orm.entities.StackEntity;
import org.apache.ambari.server.state.StackId;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections.Predicate;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.Predicate;
import com.google.inject.Inject;
import com.google.inject.Provider;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/StageDAO.java
b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/StageDAO.java
index f088026100..dbe149a8f2 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/StageDAO.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/StageDAO.java
@@ -47,7 +47,7 @@ import org.apache.ambari.server.orm.entities.StageEntity_;
import org.apache.ambari.server.orm.helpers.SQLConstants;
import org.apache.ambari.server.orm.helpers.SQLOperations;
import org.apache.ambari.server.utils.StageUtils;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.eclipse.persistence.config.HintValues;
import org.eclipse.persistence.config.QueryHints;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/security/authentication/kerberos/AmbariAuthToLocalUserDetailsService.java
b/ambari-server/src/main/java/org/apache/ambari/server/security/authentication/kerberos/AmbariAuthToLocalUserDetailsService.java
index b90a8ca9b1..3be7b11830 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/security/authentication/kerberos/AmbariAuthToLocalUserDetailsService.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/security/authentication/kerberos/AmbariAuthToLocalUserDetailsService.java
@@ -35,7 +35,7 @@ import
org.apache.ambari.server.security.authentication.UserNotFoundException;
import org.apache.ambari.server.security.authorization.User;
import org.apache.ambari.server.security.authorization.UserAuthenticationType;
import org.apache.ambari.server.security.authorization.Users;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.hadoop.security.authentication.util.KerberosName;
import org.slf4j.Logger;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/AmbariLdapAuthenticationProvider.java
b/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/AmbariLdapAuthenticationProvider.java
index 7c2f50a2f8..5e0db4f7eb 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/AmbariLdapAuthenticationProvider.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/AmbariLdapAuthenticationProvider.java
@@ -32,7 +32,7 @@ import
org.apache.ambari.server.security.authentication.AmbariUserDetails;
import org.apache.ambari.server.security.authentication.AmbariUserDetailsImpl;
import
org.apache.ambari.server.security.authentication.InvalidUsernamePasswordCombinationException;
import
org.apache.ambari.server.security.authentication.TooManyLoginFailuresException;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/Users.java
b/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/Users.java
index 69ad595e61..9e0650bb58 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/Users.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/Users.java
@@ -64,7 +64,7 @@ import org.apache.ambari.server.security.ldap.LdapBatchDto;
import org.apache.ambari.server.security.ldap.LdapGroupDto;
import org.apache.ambari.server.security.ldap.LdapUserDto;
import org.apache.ambari.server.security.ldap.LdapUserGroupMemberDto;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/security/encryption/PropertiesEncryptor.java
b/ambari-server/src/main/java/org/apache/ambari/server/security/encryption/PropertiesEncryptor.java
index 655a5526e8..1d65081d87 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/security/encryption/PropertiesEncryptor.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/security/encryption/PropertiesEncryptor.java
@@ -30,7 +30,7 @@ import org.apache.ambari.server.state.Cluster;
import org.apache.ambari.server.state.PropertyInfo;
import org.apache.ambari.server.state.StackId;
import org.apache.ambari.server.utils.TextEncoding;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
/**
* A common base class for various encryptor implementations
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/AbstractPrepareKerberosServerAction.java
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/AbstractPrepareKerberosServerAction.java
index 240e95acca..a8b0d99b94 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/AbstractPrepareKerberosServerAction.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/AbstractPrepareKerberosServerAction.java
@@ -48,7 +48,7 @@ import
org.apache.ambari.server.state.kerberos.KerberosDescriptor;
import org.apache.ambari.server.state.kerberos.KerberosIdentityDescriptor;
import org.apache.ambari.server.state.kerberos.KerberosServiceDescriptor;
import org.apache.ambari.server.utils.StageUtils;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/DestroyPrincipalsServerAction.java
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/DestroyPrincipalsServerAction.java
index 5daec26696..9e4b09ef41 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/DestroyPrincipalsServerAction.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/DestroyPrincipalsServerAction.java
@@ -42,8 +42,8 @@ import
org.apache.ambari.server.orm.entities.KerberosKeytabServiceMappingEntity;
import org.apache.ambari.server.orm.entities.KerberosPrincipalEntity;
import org.apache.ambari.server.security.credential.PrincipalKeyCredential;
import
org.apache.ambari.server.serveraction.kerberos.stageutils.ResolvedKerberosPrincipal;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections.MapUtils;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.MapUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/IPAKerberosOperationHandler.java
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/IPAKerberosOperationHandler.java
index d9732e9dd8..add8610c73 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/IPAKerberosOperationHandler.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/IPAKerberosOperationHandler.java
@@ -24,7 +24,7 @@ import java.util.Set;
import org.apache.ambari.server.security.credential.PrincipalKeyCredential;
import org.apache.ambari.server.utils.ShellCommandUtil;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.directory.shared.kerberos.codec.types.EncryptionType;
import org.slf4j.Logger;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/KDCKerberosOperationHandler.java
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/KDCKerberosOperationHandler.java
index a708d7156e..b13ef89d86 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/KDCKerberosOperationHandler.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/KDCKerberosOperationHandler.java
@@ -31,7 +31,7 @@ import
org.apache.ambari.server.security.credential.PrincipalKeyCredential;
import org.apache.ambari.server.utils.HTTPUtils;
import org.apache.ambari.server.utils.HostAndPort;
import org.apache.ambari.server.utils.ShellCommandUtil;
-import org.apache.commons.collections.MapUtils;
+import org.apache.commons.collections4.MapUtils;
import org.apache.directory.server.kerberos.shared.keytab.Keytab;
import org.apache.directory.shared.kerberos.codec.types.EncryptionType;
import org.slf4j.Logger;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/MITKerberosOperationHandler.java
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/MITKerberosOperationHandler.java
index 0bf7b3d600..be5b6460a0 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/MITKerberosOperationHandler.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/MITKerberosOperationHandler.java
@@ -29,7 +29,7 @@ import org.apache.ambari.server.configuration.Configuration;
import org.apache.ambari.server.security.credential.PrincipalKeyCredential;
import org.apache.ambari.server.state.kerberos.VariableReplacementHelper;
import org.apache.ambari.server.utils.ShellCommandUtil;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.directory.shared.kerberos.codec.types.EncryptionType;
import org.slf4j.Logger;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/PrepareDisableKerberosServerAction.java
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/PrepareDisableKerberosServerAction.java
index 6e139c9024..c9c7c904a9 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/PrepareDisableKerberosServerAction.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/PrepareDisableKerberosServerAction.java
@@ -37,7 +37,7 @@ import org.apache.ambari.server.state.ServiceComponent;
import org.apache.ambari.server.state.ServiceComponentHost;
import org.apache.ambari.server.state.StackId;
import org.apache.ambari.server.state.kerberos.KerberosDescriptor;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/PrepareKerberosIdentitiesServerAction.java
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/PrepareKerberosIdentitiesServerAction.java
index d8f3b52903..d2d13b62ec 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/PrepareKerberosIdentitiesServerAction.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/PrepareKerberosIdentitiesServerAction.java
@@ -39,7 +39,7 @@ import
org.apache.ambari.server.state.kerberos.KerberosComponentDescriptor;
import org.apache.ambari.server.state.kerberos.KerberosDescriptor;
import org.apache.ambari.server.state.kerberos.KerberosIdentityDescriptor;
import org.apache.ambari.server.state.kerberos.KerberosServiceDescriptor;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/stageutils/KerberosKeytabController.java
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/stageutils/KerberosKeytabController.java
index 037c796643..08f9448ccf 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/stageutils/KerberosKeytabController.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/stageutils/KerberosKeytabController.java
@@ -44,7 +44,7 @@ import org.apache.ambari.server.state.Service;
import org.apache.ambari.server.state.kerberos.KerberosDescriptor;
import org.apache.ambari.server.state.kerberos.KerberosIdentityDescriptor;
import org.apache.ambari.server.utils.StageUtils;
-import org.apache.commons.collections.MapUtils;
+import org.apache.commons.collections4.MapUtils;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Lists;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/DeleteUnsupportedServicesAndComponents.java
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/DeleteUnsupportedServicesAndComponents.java
index 708e656e5e..f6318a0a09 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/DeleteUnsupportedServicesAndComponents.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/DeleteUnsupportedServicesAndComponents.java
@@ -21,7 +21,7 @@
package org.apache.ambari.server.serveraction.upgrades;
import static java.util.stream.Collectors.toList;
-import static org.apache.commons.collections.CollectionUtils.union;
+import static org.apache.commons.collections4.CollectionUtils.union;
import java.util.HashSet;
import java.util.List;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/PreconfigureKerberosAction.java
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/PreconfigureKerberosAction.java
index 6cbb41cab4..5df429d4a7 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/PreconfigureKerberosAction.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/PreconfigureKerberosAction.java
@@ -64,8 +64,8 @@ import
org.apache.ambari.server.state.kerberos.KerberosIdentityDescriptor;
import org.apache.ambari.server.state.kerberos.KerberosServiceDescriptor;
import org.apache.ambari.server.state.kerberos.VariableReplacementHelper;
import org.apache.ambari.server.utils.StageUtils;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections.MapUtils;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.MapUtils;
import org.apache.commons.lang.StringUtils;
import com.google.inject.Inject;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/stack/RepoUtil.java
b/ambari-server/src/main/java/org/apache/ambari/server/stack/RepoUtil.java
index a12b526f35..88a65f45fb 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/stack/RepoUtil.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/stack/RepoUtil.java
@@ -34,7 +34,7 @@ import
org.apache.ambari.server.orm.entities.RepoDefinitionEntity;
import org.apache.ambari.server.orm.entities.RepoOsEntity;
import org.apache.ambari.server.state.RepositoryInfo;
import org.apache.ambari.server.state.stack.RepositoryXml;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/stack/StackContext.java
b/ambari-server/src/main/java/org/apache/ambari/server/stack/StackContext.java
index fbf114da72..d944d023e0 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/stack/StackContext.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/stack/StackContext.java
@@ -37,7 +37,7 @@ import org.apache.ambari.server.state.stack.OsFamily;
import org.apache.ambari.server.state.stack.RepoUrlInfoCallable;
import
org.apache.ambari.server.state.stack.RepoUrlInfoCallable.RepoUrlInfoResult;
import org.apache.ambari.server.state.stack.RepoVdfCallable;
-import org.apache.commons.collections.MapUtils;
+import org.apache.commons.collections4.MapUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/ColocatedGrouping.java
b/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/ColocatedGrouping.java
index f90a489c84..9a2dfc5ed5 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/ColocatedGrouping.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/ColocatedGrouping.java
@@ -44,7 +44,7 @@ import
org.apache.ambari.server.stack.upgrade.orchestrate.TaskWrapperBuilder;
import org.apache.ambari.server.stack.upgrade.orchestrate.UpgradeContext;
import org.apache.ambari.server.utils.SetUtils;
import org.apache.ambari.spi.upgrade.OrchestrationOptions;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.ArrayUtils;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/HostOrderGrouping.java
b/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/HostOrderGrouping.java
index 8381020e36..06d80e6595 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/HostOrderGrouping.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/HostOrderGrouping.java
@@ -46,7 +46,7 @@ import org.apache.ambari.server.state.Cluster;
import org.apache.ambari.server.state.ComponentInfo;
import org.apache.ambari.server.state.ServiceComponentHost;
import org.apache.ambari.server.state.StackId;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/UpgradePack.java
b/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/UpgradePack.java
index 92e219938b..cb0eb2e8ea 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/UpgradePack.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/UpgradePack.java
@@ -41,7 +41,7 @@ import org.apache.ambari.server.api.services.AmbariMetaInfo;
import org.apache.ambari.server.stack.upgrade.Task.Type;
import org.apache.ambari.server.state.StackId;
import org.apache.ambari.spi.upgrade.UpgradeType;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.builder.EqualsBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/orchestrate/ParallelClientGroupingBuilder.java
b/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/orchestrate/ParallelClientGroupingBuilder.java
index 0ed9931ae6..7b2f6c0f28 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/orchestrate/ParallelClientGroupingBuilder.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/orchestrate/ParallelClientGroupingBuilder.java
@@ -36,7 +36,7 @@ import org.apache.ambari.server.stack.upgrade.Task;
import org.apache.ambari.server.stack.upgrade.Task.Type;
import org.apache.ambari.server.stack.upgrade.UpgradePack.ProcessingComponent;
import org.apache.ambari.server.utils.StageUtils;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
/**
* Responsible for building the stages for {@link ParallelClientGrouping}
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/orchestrate/StageWrapper.java
b/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/orchestrate/StageWrapper.java
index f82bbde149..64ea9fa42f 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/orchestrate/StageWrapper.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/orchestrate/StageWrapper.java
@@ -27,7 +27,7 @@ import java.util.Set;
import org.apache.ambari.server.configuration.Configuration;
import org.apache.ambari.server.stack.upgrade.Task;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/orchestrate/StageWrapperBuilder.java
b/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/orchestrate/StageWrapperBuilder.java
index c3d586cb5d..b2100f5078 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/orchestrate/StageWrapperBuilder.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/orchestrate/StageWrapperBuilder.java
@@ -32,7 +32,7 @@ import
org.apache.ambari.server.stack.upgrade.ServiceCheckGrouping;
import org.apache.ambari.server.stack.upgrade.Task;
import org.apache.ambari.server.stack.upgrade.UpgradePack.ProcessingComponent;
import org.apache.ambari.server.state.ConfigHelper;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils;
/**
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/orchestrate/TaskWrapperBuilder.java
b/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/orchestrate/TaskWrapperBuilder.java
index ac0b514bf3..6c00cc470d 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/orchestrate/TaskWrapperBuilder.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/orchestrate/TaskWrapperBuilder.java
@@ -30,7 +30,7 @@ import org.apache.ambari.server.stack.upgrade.ExecuteHostType;
import org.apache.ambari.server.stack.upgrade.ExecuteTask;
import org.apache.ambari.server.stack.upgrade.Task;
import org.apache.ambari.server.utils.StageUtils;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/orchestrate/UpgradeContext.java
b/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/orchestrate/UpgradeContext.java
index 546ec30453..b654002841 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/orchestrate/UpgradeContext.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/orchestrate/UpgradeContext.java
@@ -92,7 +92,7 @@ import org.apache.ambari.spi.upgrade.OrchestrationOptions;
import org.apache.ambari.spi.upgrade.UpgradeCheckStatus;
import org.apache.ambari.spi.upgrade.UpgradeInformation;
import org.apache.ambari.spi.upgrade.UpgradeType;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/orchestrate/UpgradeHelper.java
b/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/orchestrate/UpgradeHelper.java
index 508a6db8f0..414ee4dfa4 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/orchestrate/UpgradeHelper.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/orchestrate/UpgradeHelper.java
@@ -90,7 +90,7 @@ import org.apache.ambari.server.state.StackId;
import org.apache.ambari.server.state.UpgradeState;
import org.apache.ambari.server.state.ValueAttributesInfo;
import org.apache.ambari.spi.upgrade.UpgradeType;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/state/CheckHelper.java
b/ambari-server/src/main/java/org/apache/ambari/server/state/CheckHelper.java
index f52b2e5e8e..69b1dc74bc 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/state/CheckHelper.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/state/CheckHelper.java
@@ -38,7 +38,7 @@ import org.apache.ambari.spi.upgrade.UpgradeCheck;
import org.apache.ambari.spi.upgrade.UpgradeCheckRequest;
import org.apache.ambari.spi.upgrade.UpgradeCheckResult;
import org.apache.ambari.spi.upgrade.UpgradeCheckStatus;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigHelper.java
b/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigHelper.java
index 4c0a940095..71efb4edb6 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigHelper.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigHelper.java
@@ -58,8 +58,8 @@ import org.apache.ambari.server.stack.StackDirectory;
import org.apache.ambari.server.state.PropertyInfo.PropertyType;
import org.apache.ambari.server.state.configgroup.ConfigGroup;
import org.apache.ambari.server.utils.SecretReference;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections.MapUtils;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.MapUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.math.NumberUtils;
import org.apache.commons.lang3.StringEscapeUtils;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigMergeHelper.java
b/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigMergeHelper.java
index b04314b8d0..a1a45ff66e 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigMergeHelper.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigMergeHelper.java
@@ -28,7 +28,7 @@ import java.util.regex.Pattern;
import org.apache.ambari.server.AmbariException;
import org.apache.ambari.server.StackAccessException;
import org.apache.ambari.server.api.services.AmbariMetaInfo;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/state/DependencyInfo.java
b/ambari-server/src/main/java/org/apache/ambari/server/state/DependencyInfo.java
index f8408d9661..1f2e618d64 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/state/DependencyInfo.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/state/DependencyInfo.java
@@ -26,7 +26,7 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElementWrapper;
import javax.xml.bind.annotation.XmlElements;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
/**
* Represents stack component dependency information.
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponentImpl.java
b/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponentImpl.java
index 4cfa00d109..aae5970fd4 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponentImpl.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponentImpl.java
@@ -54,8 +54,8 @@ import
org.apache.ambari.server.orm.entities.ServiceComponentDesiredStateEntity;
import org.apache.ambari.server.orm.entities.ServiceComponentVersionEntity;
import org.apache.ambari.server.orm.entities.StackEntity;
import org.apache.ambari.server.state.cluster.ClusterImpl;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections.MapUtils;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.MapUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponentSupport.java
b/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponentSupport.java
index 9bb1ca422c..ca88b3ef9b 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponentSupport.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponentSupport.java
@@ -21,7 +21,7 @@
package org.apache.ambari.server.state;
import static java.util.stream.Collectors.toSet;
-import static org.apache.commons.collections.CollectionUtils.union;
+import static org.apache.commons.collections4.CollectionUtils.union;
import java.util.Collection;
import java.util.HashSet;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
b/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
index c9765086fe..37970acbff 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
@@ -151,8 +151,8 @@ import org.apache.ambari.server.topology.TopologyRequest;
import org.apache.ambari.spi.ClusterInformation;
import org.apache.ambari.spi.RepositoryType;
import org.apache.ambari.spi.RepositoryVersion;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections.MapUtils;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.MapUtils;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/state/kerberos/KerberosIdentityDescriptor.java
b/ambari-server/src/main/java/org/apache/ambari/server/state/kerberos/KerberosIdentityDescriptor.java
index 200a069431..ed0820d60f 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/state/kerberos/KerberosIdentityDescriptor.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/state/kerberos/KerberosIdentityDescriptor.java
@@ -24,7 +24,7 @@ import java.util.Map;
import org.apache.ambari.server.collections.Predicate;
import org.apache.ambari.server.collections.PredicateUtils;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import com.google.common.base.Optional;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/RepoVdfCallable.java
b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/RepoVdfCallable.java
index 81657a7f5b..a6a0ee4682 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/RepoVdfCallable.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/RepoVdfCallable.java
@@ -29,7 +29,7 @@ import org.apache.ambari.server.state.RepositoryInfo;
import org.apache.ambari.server.state.StackId;
import org.apache.ambari.server.state.StackInfo;
import org.apache.ambari.server.state.repository.VersionDefinitionXml;
-import org.apache.commons.collections.MapUtils;
+import org.apache.commons.collections4.MapUtils;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/StackRoleCommandOrder.java
b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/StackRoleCommandOrder.java
index 93ae8101b5..293186891b 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/StackRoleCommandOrder.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/StackRoleCommandOrder.java
@@ -25,7 +25,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.commons.collections.map.MultiValueMap;
+import org.apache.commons.collections4.map.MultiValueMap;
import org.slf4j.Logger;
/**
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/topology/ClusterConfigurationRequest.java
b/ambari-server/src/main/java/org/apache/ambari/server/topology/ClusterConfigurationRequest.java
index 65f31360f3..8d46f4bf2c 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/topology/ClusterConfigurationRequest.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/topology/ClusterConfigurationRequest.java
@@ -43,7 +43,7 @@ import org.apache.ambari.server.state.Cluster;
import org.apache.ambari.server.state.ConfigHelper;
import org.apache.ambari.server.state.SecurityType;
import org.apache.ambari.server.utils.StageUtils;
-import org.apache.commons.collections.MapUtils;
+import org.apache.commons.collections4.MapUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog252.java
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog252.java
index 62e56fcc59..da20c8ea90 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog252.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog252.java
@@ -43,7 +43,7 @@ import
org.apache.ambari.server.state.kerberos.KerberosConfigurationDescriptor;
import org.apache.ambari.server.state.kerberos.KerberosDescriptor;
import org.apache.ambari.server.state.kerberos.KerberosDescriptorFactory;
import org.apache.ambari.server.state.kerberos.KerberosServiceDescriptor;
-import org.apache.commons.collections.MapUtils;
+import org.apache.commons.collections4.MapUtils;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog270.java
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog270.java
index 8031b0cd09..d053b73331 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog270.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog270.java
@@ -93,7 +93,7 @@ import
org.apache.ambari.server.state.kerberos.KerberosDescriptor;
import org.apache.ambari.server.state.kerberos.KerberosDescriptorFactory;
import org.apache.ambari.server.state.kerberos.KerberosServiceDescriptor;
import org.apache.ambari.server.topology.validators.HiveServiceValidator;
-import org.apache.commons.collections.MapUtils;
+import org.apache.commons.collections4.MapUtils;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog271.java
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog271.java
index c1e2544806..179113cb90 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog271.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog271.java
@@ -47,7 +47,7 @@ import org.apache.ambari.server.state.Cluster;
import org.apache.ambari.server.state.Clusters;
import org.apache.ambari.server.state.Config;
import org.apache.ambari.server.state.ServiceComponent;
-import org.apache.commons.collections.MapUtils;
+import org.apache.commons.collections4.MapUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java
b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java
index 8e573e4c09..15ebb0121b 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java
@@ -125,7 +125,7 @@ import org.apache.ambari.view.events.Event;
import org.apache.ambari.view.events.Listener;
import org.apache.ambari.view.migration.ViewDataMigrationException;
import org.apache.ambari.view.validation.Validator;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.log4j.PropertyConfigurator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionManager.java
b/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionManager.java
index d73371eaf0..9ed33264ba 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionManager.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionManager.java
@@ -52,7 +52,7 @@ import org.apache.ambari.server.state.StackId;
import
org.apache.ambari.server.state.svccomphost.ServiceComponentHostStartEvent;
import org.apache.ambari.server.utils.CommandUtils;
import org.apache.ambari.server.utils.StageUtils;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.easymock.EasyMock;
import org.junit.After;
import org.junit.Before;
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/agent/stomp/AgentDataHolderTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/agent/stomp/AgentDataHolderTest.java
index 284c8d0d4b..a0c12a2cbc 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/agent/stomp/AgentDataHolderTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/agent/stomp/AgentDataHolderTest.java
@@ -26,7 +26,7 @@ import org.apache.ambari.server.events.MetadataUpdateEvent;
import org.apache.ambari.server.events.UpdateEventType;
import org.apache.ambari.server.events.publishers.AmbariEventPublisher;
import org.apache.ambari.server.security.encryption.Encryptor;
-import org.apache.commons.collections.MapUtils;
+import org.apache.commons.collections4.MapUtils;
import org.junit.Test;
public class AgentDataHolderTest {
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/api/AmbariErrorHandlerTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/api/AmbariErrorHandlerTest.java
index ed00b0705f..c28b7e5b78 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/api/AmbariErrorHandlerTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/api/AmbariErrorHandlerTest.java
@@ -23,8 +23,7 @@ import static org.easymock.EasyMock.eq;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.expectLastCall;
import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.when;
-import static org.powermock.api.mockito.PowerMockito.mockStatic;
+import static org.powermock.api.easymock.PowerMock.mockStatic;
import java.io.IOException;
import java.io.PrintWriter;
@@ -78,16 +77,18 @@ public class AmbariErrorHandlerTest extends EasyMockSupport
{
//given
final UUID requestId =
UUID.fromString("4db659b2-7902-477b-b8e6-c35261d3334a");
- mockStatic(HttpConnection.class, UUID.class, LoggerFactory.class);
- when(HttpConnection.getCurrentConnection()).thenReturn(httpConnection);
- when(UUID.randomUUID()).thenReturn(requestId);
- when(LoggerFactory.getLogger(AmbariErrorHandler.class)).thenReturn(logger);
+ mockStatic(HttpConnection.class);
+ mockStatic(UUID.class);
+ mockStatic(LoggerFactory.class);
+ expect(HttpConnection.getCurrentConnection()).andReturn(httpConnection);
+ expect(UUID.randomUUID()).andReturn(requestId);
+
expect(LoggerFactory.getLogger(AmbariErrorHandler.class)).andReturn(logger);
Throwable th = createNiceMock(Throwable.class);
Capture<String> captureLogMessage = EasyMock.newCapture();
logger.error(capture(captureLogMessage), eq(th));
- expectLastCall();
+ expectLastCall().anyTimes();
expect(httpConnection.getHttpChannel()).andReturn(httpChannel);
expect(httpChannel.getRequest()).andReturn(request);
@@ -125,7 +126,7 @@ public class AmbariErrorHandlerTest extends EasyMockSupport
{
//given
mockStatic(HttpConnection.class);
- when(HttpConnection.getCurrentConnection()).thenReturn(httpConnection);
+ expect(HttpConnection.getCurrentConnection()).andReturn(httpConnection);
expect(httpConnection.getHttpChannel()).andReturn(httpChannel);
expect(httpChannel.getRequest()).andReturn(request);
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/api/services/DeleteResultMetaDataTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/api/services/DeleteResultMetaDataTest.java
index 1a9586d359..23c001d8c8 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/api/services/DeleteResultMetaDataTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/api/services/DeleteResultMetaDataTest.java
@@ -29,7 +29,7 @@ import org.apache.ambari.server.controller.spi.Resource;
import org.apache.ambari.server.controller.spi.SystemException;
import org.apache.ambari.server.controller.spi.UnsupportedPropertyException;
import org.apache.ambari.server.security.authorization.AuthorizationException;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.junit.Test;
import com.google.common.collect.Sets;
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/checks/AmbariMetricsHadoopSinkVersionCheckTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/checks/AmbariMetricsHadoopSinkVersionCheckTest.java
index ef2e4230db..6b5976af2d 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/checks/AmbariMetricsHadoopSinkVersionCheckTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/checks/AmbariMetricsHadoopSinkVersionCheckTest.java
@@ -173,7 +173,7 @@ public class AmbariMetricsHadoopSinkVersionCheckTest {
ResourceProvider resourceProviderMock = mock(ResourceProvider.class);
PowerMockito.mockStatic(AbstractControllerResourceProvider.class);
-
when(AbstractControllerResourceProvider.getResourceProvider(eq(Resource.Type.Request),
any(AmbariManagementController.class))).thenReturn(resourceProviderMock);
+
when(AbstractControllerResourceProvider.getResourceProvider(Mockito.eq(Resource.Type.Request),
any(AmbariManagementController.class))).thenReturn(resourceProviderMock);
PowerMockito.mockStatic(PropertyHelper.class);
Request requestMock = mock(Request.class);
@@ -220,7 +220,7 @@ public class AmbariMetricsHadoopSinkVersionCheckTest {
ResourceProvider resourceProviderMock = mock(ResourceProvider.class);
PowerMockito.mockStatic(AbstractControllerResourceProvider.class);
-
when(AbstractControllerResourceProvider.getResourceProvider(eq(Resource.Type.Request),
any(AmbariManagementController.class))).thenReturn(resourceProviderMock);
+
when(AbstractControllerResourceProvider.getResourceProvider(Mockito.eq(Resource.Type.Request),
any(AmbariManagementController.class))).thenReturn(resourceProviderMock);
PowerMockito.mockStatic(PropertyHelper.class);
Request requestMock = mock(Request.class);
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/checks/ComponentsInstallationCheckTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/checks/ComponentsInstallationCheckTest.java
index f029e00608..40b556a1c2 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/checks/ComponentsInstallationCheckTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/checks/ComponentsInstallationCheckTest.java
@@ -293,12 +293,12 @@ public class ComponentsInstallationCheckTest {
Mockito.when(hcsMetricsMonitor.getHostName()).thenReturn("host3");
// Mock the static method
- Mockito.when(HostComponentSummary.getHostComponentSummaries("HDFS",
"NAMENODE")).thenReturn(Arrays.asList(hcsNameNode));
- Mockito.when(HostComponentSummary.getHostComponentSummaries("HDFS",
"DATANODE")).thenReturn(Arrays.asList(hcsDataNode1, hcsDataNode2,
hcsDataNode3));
- Mockito.when(HostComponentSummary.getHostComponentSummaries("HDFS",
"ZKFC")).thenReturn(Arrays.asList(hcsZKFC));
- Mockito.when(HostComponentSummary.getHostComponentSummaries("TEZ",
"TEZ_CLIENT")).thenReturn(Arrays.asList(hcsTezClient));
-
Mockito.when(HostComponentSummary.getHostComponentSummaries("AMBARI_METRICS",
"METRICS_COLLECTOR")).thenReturn(Arrays.asList(hcsMetricsCollector));
-
Mockito.when(HostComponentSummary.getHostComponentSummaries("AMBARI_METRICS",
"METRICS_MONITOR")).thenReturn(Arrays.asList(hcsMetricsMonitor));
+ PowerMockito.when(HostComponentSummary.getHostComponentSummaries("HDFS",
"NAMENODE")).thenReturn(Arrays.asList(hcsNameNode));
+ PowerMockito.when(HostComponentSummary.getHostComponentSummaries("HDFS",
"DATANODE")).thenReturn(Arrays.asList(hcsDataNode1, hcsDataNode2,
hcsDataNode3));
+ PowerMockito.when(HostComponentSummary.getHostComponentSummaries("HDFS",
"ZKFC")).thenReturn(Arrays.asList(hcsZKFC));
+ PowerMockito.when(HostComponentSummary.getHostComponentSummaries("TEZ",
"TEZ_CLIENT")).thenReturn(Arrays.asList(hcsTezClient));
+
PowerMockito.when(HostComponentSummary.getHostComponentSummaries("AMBARI_METRICS",
"METRICS_COLLECTOR")).thenReturn(Arrays.asList(hcsMetricsCollector));
+
PowerMockito.when(HostComponentSummary.getHostComponentSummaries("AMBARI_METRICS",
"METRICS_MONITOR")).thenReturn(Arrays.asList(hcsMetricsMonitor));
for (String hostName : hosts.keySet()) {
Mockito.when(clusters.getHost(hostName)).thenReturn(hosts.get(hostName));
}
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelperTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelperTest.java
index 190359d5bb..43c15f7b2d 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelperTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelperTest.java
@@ -70,7 +70,7 @@ import org.apache.ambari.server.state.alert.AlertDefinition;
import org.apache.ambari.server.state.configgroup.ConfigGroup;
import org.apache.ambari.server.state.stack.OsFamily;
import org.apache.ambari.server.testutils.PartialNiceMockBinder;
-import org.apache.commons.collections.MapUtils;
+import org.apache.commons.collections4.MapUtils;
import org.easymock.EasyMockSupport;
import org.junit.After;
import org.junit.Assert;
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/collections/PredicateUtilsTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/collections/PredicateUtilsTest.java
index b3da55b4c9..12ae6cd38d 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/collections/PredicateUtilsTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/collections/PredicateUtilsTest.java
@@ -104,7 +104,7 @@ public class PredicateUtilsTest {
Assert.assertEquals(NotPredicate.NAME, predicate.getName());
Assert.assertTrue(predicate instanceof NotPredicate);
- org.apache.commons.collections.Predicate[] predicates;
+ org.apache.commons.collections4.Predicate[] predicates;
predicates = ((NotPredicate) predicate).getPredicates();
Assert.assertEquals(1, predicates.length);
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelperTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelperTest.java
index c37186df2d..d9b94910e3 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelperTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelperTest.java
@@ -81,7 +81,7 @@ import org.apache.ambari.server.state.UserGroupInfo;
import org.apache.ambari.server.state.ValueAttributesInfo;
import org.apache.ambari.server.topology.TopologyManager;
import org.apache.ambari.server.utils.StageUtils;
-import org.apache.commons.collections.MapUtils;
+import org.apache.commons.collections4.MapUtils;
import org.easymock.Capture;
import org.easymock.EasyMock;
import org.easymock.EasyMockRule;
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
index eeeef4d979..e0c80b34d4 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
@@ -147,7 +147,7 @@ import
org.apache.ambari.server.state.svccomphost.ServiceComponentHostStoppedEve
import org.apache.ambari.server.topology.TopologyManager;
import org.apache.ambari.server.utils.EventBusSynchronizer;
import org.apache.ambari.server.utils.StageUtils;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.easymock.Capture;
import org.easymock.EasyMock;
import org.junit.After;
@@ -9084,7 +9084,7 @@ public class AmbariManagementControllerTest {
assertTrue(smokeTestRequired);
}
- private class RolePredicate implements
org.apache.commons.collections.Predicate {
+ private class RolePredicate implements
org.apache.commons.collections4.Predicate {
private String role;
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProviderTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProviderTest.java
index 9c30ccf114..0284fdd8e5 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProviderTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProviderTest.java
@@ -26,6 +26,7 @@ import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.replay;
import static org.easymock.EasyMock.verify;
import static org.junit.Assert.assertFalse;
+import static org.mockito.Mockito.mockStatic;
import java.io.ByteArrayInputStream;
import java.io.File;
@@ -81,6 +82,7 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.mockito.MockedStatic;
import org.powermock.api.easymock.PowerMock;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
@@ -599,6 +601,7 @@ public class ClientConfigResourceProviderTest {
expect(managementController.getHostComponents(EasyMock.anyObject())).andReturn(responses).anyTimes();
PowerMock.mockStaticPartial(StageUtils.class, "getClusterHostInfo");
+ try (MockedStatic<StageUtils> mockedStageUtils =
mockStatic(StageUtils.class)) {
Map<String, Set<String>> clusterHostInfo = new HashMap<>();
@@ -615,7 +618,7 @@ public class ClientConfigResourceProviderTest {
}
}
clusterHostInfo.put("all_hosts", all_hosts);
- expect(StageUtils.getClusterHostInfo(cluster)).andReturn(clusterHostInfo);
+ mockedStageUtils.when(() ->
StageUtils.getClusterHostInfo(cluster)).thenReturn(clusterHostInfo);
expect(stackId.getStackName()).andReturn(stackName).anyTimes();
expect(stackId.getStackVersion()).andReturn(stackVersion).anyTimes();
@@ -680,6 +683,7 @@ public class ClientConfigResourceProviderTest {
clusterConfig, host, service, serviceComponent, serviceComponentHost,
serviceInfo, configHelper,
runtime, process);
PowerMock.verifyAll();
+ }
}
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/DeleteStatusMetaDataTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/DeleteStatusMetaDataTest.java
index 5b1148a684..30b8f4dc36 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/DeleteStatusMetaDataTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/DeleteStatusMetaDataTest.java
@@ -18,7 +18,7 @@
package org.apache.ambari.server.controller.internal;
-import static org.apache.commons.collections.CollectionUtils.isEqualCollection;
+import static
org.apache.commons.collections4.CollectionUtils.isEqualCollection;
import static org.junit.Assert.assertTrue;
import org.apache.ambari.server.ObjectNotFoundException;
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java
index 712469e540..1ec7fab6dd 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java
@@ -119,7 +119,7 @@ import org.apache.ambari.server.utils.StageUtils;
import org.apache.ambari.server.view.ViewRegistry;
import org.apache.ambari.spi.RepositoryType;
import org.apache.ambari.spi.upgrade.UpgradeType;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import org.easymock.Capture;
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/WidgetResourceProviderTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/WidgetResourceProviderTest.java
index 0551356d50..8160d13ecd 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/WidgetResourceProviderTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/WidgetResourceProviderTest.java
@@ -60,6 +60,8 @@ import org.powermock.api.easymock.PowerMock;
import org.springframework.security.access.AccessDeniedException;
import org.springframework.security.core.context.SecurityContextHolder;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
import com.google.inject.Binder;
import com.google.inject.Guice;
import com.google.inject.Injector;
@@ -257,9 +259,18 @@ public class WidgetResourceProviderTest {
Assert.assertEquals(null, entity.getDefaultSectionName());
Assert.assertEquals("GAUGE", entity.getWidgetType());
Assert.assertEquals("admin", entity.getAuthor());
- Assert.assertEquals("[{\"name\":\"value\",\"name2\":\"value2\"}]",
entity.getMetrics());
- Assert.assertEquals("[{\"name\":\"value\",\"name2\":\"value2\"}]",
entity.getWidgetValues());
- Assert.assertEquals("{\"property2\":\"value2\",\"property1\":\"value1\"}",
entity.getProperties());
+
+ Gson gson = new GsonBuilder().setPrettyPrinting().create();
+ String expectedMetrics = gson.toJson(testSet);
+ String expectedWidgetValues = gson.toJson(testSet);
+ Map<String, String> propertiesMap = new HashMap<>();
+ propertiesMap.put("property1", "value1");
+ propertiesMap.put("property2", "value2");
+ String expectedProperties = gson.toJson(propertiesMap);
+
+ Assert.assertEquals(expectedMetrics, entity.getMetrics());
+ Assert.assertEquals(expectedWidgetValues, entity.getWidgetValues());
+ Assert.assertEquals(expectedProperties, entity.getProperties());
verify(amc, clusters, cluster, dao);
}
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/ganglia/GangliaPropertyProviderTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/ganglia/GangliaPropertyProviderTest.java
index 0d4d3f2af6..9730f36fcf 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/ganglia/GangliaPropertyProviderTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/ganglia/GangliaPropertyProviderTest.java
@@ -57,8 +57,8 @@ import
org.apache.ambari.server.security.authorization.AuthorizationHelperInitia
import org.apache.ambari.server.state.Cluster;
import org.apache.ambari.server.state.Clusters;
import org.apache.ambari.server.utils.CollectionPresentationUtils;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections.Predicate;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.Predicate;
import org.apache.http.NameValuePair;
import org.apache.http.client.utils.URIBuilder;
import org.junit.After;
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/PreconfigureKerberosActionTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/PreconfigureKerberosActionTest.java
index ba7f7ff9fa..a7697c56c1 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/PreconfigureKerberosActionTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/PreconfigureKerberosActionTest.java
@@ -137,7 +137,7 @@ import org.apache.ambari.server.topology.PersistedState;
import org.apache.ambari.server.topology.TopologyManager;
import org.apache.ambari.server.topology.tasks.ConfigureClusterTaskFactory;
import org.apache.ambari.server.utils.StageUtils;
-import org.apache.commons.collections.MapUtils;
+import org.apache.commons.collections4.MapUtils;
import org.easymock.Capture;
import org.easymock.EasyMockSupport;
import org.easymock.IAnswer;
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/state/ServiceTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/state/ServiceTest.java
index 8768d47920..9e4611ac76 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/state/ServiceTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/state/ServiceTest.java
@@ -45,7 +45,7 @@ import
org.apache.ambari.server.orm.entities.ClusterConfigEntity;
import org.apache.ambari.server.orm.entities.ClusterServiceEntity;
import org.apache.ambari.server.orm.entities.RepositoryVersionEntity;
import org.apache.ambari.server.state.configgroup.ConfigGroup;
-import org.apache.commons.collections.MapUtils;
+import org.apache.commons.collections4.MapUtils;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterImplTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterImplTest.java
index 53113675d8..88d981933e 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterImplTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterImplTest.java
@@ -52,7 +52,7 @@ import org.apache.ambari.server.state.ServiceComponent;
import org.apache.ambari.server.state.ServiceComponentHost;
import org.apache.ambari.server.state.StackId;
import org.apache.ambari.server.state.configgroup.ConfigGroup;
-import org.apache.commons.collections.MapUtils;
+import org.apache.commons.collections4.MapUtils;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/state/kerberos/KerberosDescriptorTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/state/kerberos/KerberosDescriptorTest.java
index 079096de5f..e759999bd7 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/state/kerberos/KerberosDescriptorTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/state/kerberos/KerberosDescriptorTest.java
@@ -33,7 +33,7 @@ import java.util.TreeMap;
import java.util.TreeSet;
import org.apache.ambari.server.AmbariException;
-import org.apache.commons.collections.map.HashedMap;
+import org.apache.commons.collections4.map.HashedMap;
import org.junit.Test;
import org.junit.experimental.categories.Category;
diff --git a/ambari-utility/pom.xml b/ambari-utility/pom.xml
index 0b0f3ec17a..cb1c4ce4be 100644
--- a/ambari-utility/pom.xml
+++ b/ambari-utility/pom.xml
@@ -82,8 +82,9 @@
<artifactId>commons-beanutils</artifactId>
</dependency>
<dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
+ <version>4.4</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -103,8 +104,8 @@
<artifactId>commons-beanutils</artifactId>
</exclusion>
<exclusion>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
</exclusion>
</exclusions>
</dependency>
diff --git a/contrib/views/pom.xml b/contrib/views/pom.xml
index bfbc2ad0cf..1a3b668080 100644
--- a/contrib/views/pom.xml
+++ b/contrib/views/pom.xml
@@ -157,9 +157,9 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2.2</version>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
+ <version>4.4</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
