chore(deps): fix (commons-collections:commons-collections) (#14425)

Co-authored-by: david-leifker <114954101+david-leifker@users.noreply.github.com>
2025-12-25 17:08:29 +00:00 · 2025-08-13 21:24:33 +05:30 · 2025-08-13 21:24:33 +05:30 · de3c454fd6
commit de3c454fd6
parent f62a76e4d2
13 changed files with 12 additions and 13 deletions
--- a/build.gradle
+++ b/build.gradle
@ -136,7 +136,6 @@ project.ext.externalDependency = [
    'commonsIo': 'commons-io:commons-io:2.17.0',
    'commonsLang': 'commons-lang:commons-lang:2.6',
    'commonsText': 'org.apache.commons:commons-text:1.14.0',
-    'commonsCollections': 'commons-collections:commons-collections:3.2.2',
    'caffeine': 'com.github.ben-manes.caffeine:caffeine:3.1.8',
    'datastaxOssNativeProtocol': 'com.datastax.oss:native-protocol:1.5.1',
    'datastaxOssCore': 'org.apache.cassandra:java-driver-core:4.19.0',
@ -398,6 +397,7 @@ configure(subprojects.findAll {! it.name.startsWith('spark-lineage')}) {
    exclude group: 'com.typesafe.play', module: 'shaded-asynchttpclient'
    exclude group: "com.typesafe.akka", module: "akka-protobuf-v3_$playScalaVersion"
    exclude group: 'com.typesafe.play', module: 'shaded-oauth'
+    exclude group: 'commons-collections', module: 'commons-collections'
    
    // Tomcat excluded for jetty
    exclude group: 'org.apache.tomcat.embed', module: 'tomcat-embed-el'
@ -408,6 +408,7 @@ configure(subprojects.findAll {! it.name.startsWith('spark-lineage')}) {
    resolutionStrategy.force 'org.apache.mina:mina-core:2.2.4'
    resolutionStrategy.force 'org.mozilla:rhino:1.7.12'
    resolutionStrategy.force 'commons-beanutils:commons-beanutils:1.11.0'
+    resolutionStrategy.force 'org.apache.commons:commons-collections4:4.5.0'
    resolutionStrategy {
      force "org.eclipse.jetty:jetty-security:${jettyVersion}"
      force "org.eclipse.jetty:jetty-server:${jettyVersion}"
--- a/metadata-io/build.gradle
+++ b/metadata-io/build.gradle
@ -38,7 +38,6 @@ dependencies {
  runtimeOnly externalDependency.logbackClassic
  compileOnly externalDependency.lombok
  compileOnly externalDependency.hazelcast
-  implementation externalDependency.commonsCollections
  api externalDependency.datastaxOssNativeProtocol
  api(externalDependency.datastaxOssCore) {
    exclude group: 'com.fasterxml.jackson.core'
--- a/metadata-io/src/main/java/com/linkedin/metadata/dataHubUsage/DataHubUsageServiceImpl.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/dataHubUsage/DataHubUsageServiceImpl.java
@ -21,7 +21,7 @@ import java.util.List;
 import java.util.Map;
 import javax.annotation.Nonnull;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.opensearch.action.search.SearchRequest;
 import org.opensearch.action.search.SearchResponse;
--- a/metadata-io/src/main/java/com/linkedin/metadata/forms/validation/FormPromptValidator.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/forms/validation/FormPromptValidator.java
@ -30,7 +30,7 @@ import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;

@Setter
@Getter
--- a/metadata-io/src/main/java/com/linkedin/metadata/graph/elastic/ESGraphQueryDAO.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/graph/elastic/ESGraphQueryDAO.java
@ -63,7 +63,7 @@ import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.Value;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.tuple.Pair;
 import org.opensearch.action.search.SearchRequest;
 import org.opensearch.action.search.SearchResponse;
--- a/metadata-io/src/main/java/com/linkedin/metadata/search/LineageSearchService.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/search/LineageSearchService.java
@ -54,7 +54,7 @@ import javax.annotation.Nullable;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.cache.Cache;

@RequiredArgsConstructor
--- a/metadata-io/src/main/java/com/linkedin/metadata/search/client/CachingEntitySearchService.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/search/client/CachingEntitySearchService.java
@ -22,7 +22,7 @@ import java.util.Optional;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import lombok.RequiredArgsConstructor;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.javatuples.Octet;
 import org.javatuples.Septet;
 import org.javatuples.Sextet;
--- a/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/query/request/SearchRequestHandler.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/query/request/SearchRequestHandler.java
@ -66,7 +66,7 @@ import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.opensearch.action.search.SearchRequest;
 import org.opensearch.action.search.SearchResponse;
 import org.opensearch.common.unit.TimeValue;
--- a/metadata-io/src/main/java/com/linkedin/metadata/service/UpdateGraphIndicesService.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/service/UpdateGraphIndicesService.java
@ -58,7 +58,7 @@ import javax.annotation.Nullable;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;

@Slf4j
 public class UpdateGraphIndicesService implements SearchIndicesService {
--- a/metadata-io/src/main/java/com/linkedin/metadata/structuredproperties/validation/ShowPropertyAsBadgeValidator.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/structuredproperties/validation/ShowPropertyAsBadgeValidator.java
@ -36,7 +36,7 @@ import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;

@Setter
@Getter
--- a/metadata-io/src/main/java/com/linkedin/metadata/timeline/TimelineServiceImpl.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/timeline/TimelineServiceImpl.java
@ -45,7 +45,7 @@ import java.util.TreeMap;
 import java.util.TreeSet;
 import java.util.stream.Collectors;
 import javax.annotation.Nonnull;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;

 public class TimelineServiceImpl implements TimelineService {

--- a/metadata-service/services/build.gradle
+++ b/metadata-service/services/build.gradle
@ -31,7 +31,6 @@ dependencies {
    implementation externalDependency.swaggerAnnotations
    runtimeOnly externalDependency.logbackClassic
    compileOnly externalDependency.lombok
-    implementation externalDependency.commonsCollections
    implementation externalDependency.javatuples
    implementation externalDependency.javaxValidation
    implementation externalDependency.opentelemetryAnnotations
--- a/metadata-service/services/src/main/java/com/linkedin/metadata/search/utils/QueryUtils.java
+++ b/metadata-service/services/src/main/java/com/linkedin/metadata/search/utils/QueryUtils.java
@ -34,7 +34,7 @@ import java.util.stream.Stream;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.validation.constraints.Null;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;

 public class QueryUtils {