This is an automated email from the ASF dual-hosted git repository.
zhaojinchao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new efcd1878609 Remove the dependency on commons-collections4. (#29450)
efcd1878609 is described below
commit efcd187860916b0954c145380d2654e223dbce83
Author: Cong Hu <[email protected]>
AuthorDate: Tue Dec 19 21:51:55 2023 +0800
Remove the dependency on commons-collections4. (#29450)
---
agent/pom.xml | 5 -----
distribution/proxy/src/main/release-docs/LICENSE | 1 -
.../apache/shardingsphere/sharding/rule/ShardingRuleTest.java | 2 +-
.../infra/rule/identifier/type/TableNamesMapper.java | 2 +-
pom.xml | 10 ----------
5 files changed, 2 insertions(+), 18 deletions(-)
diff --git a/agent/pom.xml b/agent/pom.xml
index 37024203149..ae07ea1096b 100644
--- a/agent/pom.xml
+++ b/agent/pom.xml
@@ -55,11 +55,6 @@
<artifactId>commons-lang3</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-collections4</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
diff --git a/distribution/proxy/src/main/release-docs/LICENSE
b/distribution/proxy/src/main/release-docs/LICENSE
index 4d8651e6f08..ebbf7974ca6 100644
--- a/distribution/proxy/src/main/release-docs/LICENSE
+++ b/distribution/proxy/src/main/release-docs/LICENSE
@@ -225,7 +225,6 @@ The text of each license is the standard Apache 2.0 license.
calcite-core 1.35.0: https://calcite.apache.org, Apache 2.0
calcite-linq4j 1.35.0: https://calcite.apache.org, Apache 2.0
commons-codec 1.16.0: https://github.com/apache/commons-codec, Apache 2.0
- commons-collections4 4.4: https://github.com/apache/commons-collections,
Apache 2.0
commons-dbcp2 2.6.0: https://commons.apache.org/proper/commons-dbcp,
Apache 2.0
commons-exec 1.3: https://github.com/apache/commons-exec, Apache 2.0
commons-io 2.11.0: https://github.com/apache/commons-io, Apache 2.0
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rule/ShardingRuleTest.java
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rule/ShardingRuleTest.java
index af2001b94a6..26cf8bd1f63 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rule/ShardingRuleTest.java
+++
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rule/ShardingRuleTest.java
@@ -444,7 +444,7 @@ class ShardingRuleTest {
@Test
void assertGetTables() {
- assertThat(new
LinkedList<>(createMaximumShardingRule().getLogicTableMapper().getTableNames()),
is(Arrays.asList("SUB_LOGIC_TABLE", "LOGIC_TABLE")));
+ assertThat(new
LinkedList<>(createMaximumShardingRule().getLogicTableMapper().getTableNames()),
is(Arrays.asList("LOGIC_TABLE", "SUB_LOGIC_TABLE")));
}
@Test
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/rule/identifier/type/TableNamesMapper.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/rule/identifier/type/TableNamesMapper.java
index 808a589b76c..8e368505b91 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/rule/identifier/type/TableNamesMapper.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/rule/identifier/type/TableNamesMapper.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.infra.rule.identifier.type;
-import org.apache.commons.collections4.map.CaseInsensitiveMap;
+import com.cedarsoftware.util.CaseInsensitiveMap;
import java.util.Collection;
import java.util.Map;
diff --git a/pom.xml b/pom.xml
index 872e0cb6c22..9fde4ceb3ec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,7 +69,6 @@
<j2objc-annotations.version>1.3</j2objc-annotations.version>
<commons-lang3.version>3.12.0</commons-lang3.version>
- <commons-collections4.version>4.4</commons-collections4.version>
<commons-codec.version>1.16.0</commons-codec.version>
<commons-math3.version>3.6.1</commons-math3.version>
<caffeine.version>2.9.3</caffeine.version>
@@ -230,11 +229,6 @@
<artifactId>commons-lang3</artifactId>
<version>${commons-lang3.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-collections4</artifactId>
- <version>${commons-collections4.version}</version>
- </dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
@@ -580,10 +574,6 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-collections4</artifactId>
- </dependency>
<dependency>
<groupId>org.projectlombok</groupId>
