Skip to content

Commit 83b5a60

Browse files
VladyslNarekmat
andauthored
added commons-collections4 library instead of commons-collections (#4427)
Co-authored-by: Narekmat <[email protected]>
1 parent 3dc4446 commit 83b5a60

File tree

4 files changed

+14
-5
lines changed

4 files changed

+14
-5
lines changed

kafka-ui-api/pom.xml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,12 @@
8181
<groupId>io.confluent</groupId>
8282
<artifactId>kafka-json-schema-serializer</artifactId>
8383
<version>${confluent.version}</version>
84+
<exclusions>
85+
<exclusion>
86+
<groupId>commons-collections</groupId>
87+
<artifactId>commons-collections</artifactId>
88+
</exclusion>
89+
</exclusions>
8490
</dependency>
8591
<dependency>
8692
<groupId>io.confluent</groupId>
@@ -135,6 +141,11 @@
135141
<artifactId>commons-pool2</artifactId>
136142
<version>${apache.commons.version}</version>
137143
</dependency>
144+
<dependency>
145+
<groupId>org.apache.commons</groupId>
146+
<artifactId>commons-collections4</artifactId>
147+
<version>4.4</version>
148+
</dependency>
138149
<dependency>
139150
<groupId>org.testcontainers</groupId>
140151
<artifactId>testcontainers</artifactId>
@@ -238,8 +249,6 @@
238249
<groupId>org.springframework.security</groupId>
239250
<artifactId>spring-security-ldap</artifactId>
240251
</dependency>
241-
242-
243252
<dependency>
244253
<groupId>org.codehaus.groovy</groupId>
245254
<artifactId>groovy-jsr223</artifactId>

kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/Permission.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import lombok.EqualsAndHashCode;
2424
import lombok.Getter;
2525
import lombok.ToString;
26-
import org.apache.commons.collections.CollectionUtils;
26+
import org.apache.commons.collections4.CollectionUtils;
2727
import org.springframework.util.Assert;
2828

2929
@Getter

kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/ConnectorInfo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import java.util.function.Function;
99
import java.util.stream.Stream;
1010
import javax.annotation.Nullable;
11-
import org.apache.commons.collections.CollectionUtils;
11+
import org.apache.commons.collections4.CollectionUtils;
1212
import org.opendatadiscovery.oddrn.JdbcUrlParser;
1313
import org.opendatadiscovery.oddrn.model.HivePath;
1414
import org.opendatadiscovery.oddrn.model.MysqlPath;

kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/AccessControlService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import javax.annotation.Nullable;
3434
import lombok.RequiredArgsConstructor;
3535
import lombok.extern.slf4j.Slf4j;
36-
import org.apache.commons.collections.CollectionUtils;
36+
import org.apache.commons.collections4.CollectionUtils;
3737
import org.apache.commons.lang3.StringUtils;
3838
import org.springframework.boot.context.properties.EnableConfigurationProperties;
3939
import org.springframework.core.env.Environment;

0 commit comments

Comments
 (0)