This is an automated email from the ASF dual-hosted git repository.
zabetak pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/calcite.git
The following commit(s) were added to refs/heads/main by this push:
new e3105a8fe0 [CALCITE-5819] Upgrade commons-collections from 3.x to 4.4
e3105a8fe0 is described below
commit e3105a8fe03a08d02500001314dc4e9696285e83
Author: Ran Tao <[email protected]>
AuthorDate: Thu Jul 6 15:23:04 2023 +0800
[CALCITE-5819] Upgrade commons-collections from 3.x to 4.4
Close apache/calcite#3297
---
bom/build.gradle.kts | 1 +
gradle.properties | 1 +
innodb/build.gradle.kts | 2 +-
.../src/main/java/org/apache/calcite/adapter/innodb/IndexCondition.java | 2 +-
.../java/org/apache/calcite/adapter/innodb/InnodbFilterTranslator.java | 2 +-
.../src/main/java/org/apache/calcite/adapter/innodb/InnodbSchema.java | 2 +-
.../main/java/org/apache/calcite/adapter/innodb/InnodbTableScan.java | 2 +-
.../org/apache/calcite/adapter/innodb/InnodbToEnumerableConverter.java | 2 +-
.../test/java/org/apache/calcite/adapter/innodb/InnodbAdapterTest.java | 2 +-
9 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/bom/build.gradle.kts b/bom/build.gradle.kts
index 670afb5ce1..10ac5b06ec 100644
--- a/bom/build.gradle.kts
+++ b/bom/build.gradle.kts
@@ -100,6 +100,7 @@ dependencies {
apiv("org.apache.commons:commons-lang3")
apiv("org.apache.commons:commons-math3")
apiv("org.apache.commons:commons-pool2")
+ apiv("org.apache.commons:commons-collections4")
apiv("org.apache.geode:geode-core")
apiv("org.apache.hadoop:hadoop-client", "hadoop")
apiv("org.apache.hadoop:hadoop-common", "hadoop")
diff --git a/gradle.properties b/gradle.properties
index a1a7801255..64573f8d55 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -96,6 +96,7 @@ commons-io.version=2.11.0
commons-lang3.version=3.8
commons-math3.version=3.6.1
commons-pool2.version=2.6.2
+commons-collections4.version=4.4
dropwizard-metrics.version=4.0.5
# do not upgrade this, new versions are Category X license.
diff --git a/innodb/build.gradle.kts b/innodb/build.gradle.kts
index 8bc544d2b4..9490d73174 100644
--- a/innodb/build.gradle.kts
+++ b/innodb/build.gradle.kts
@@ -30,7 +30,7 @@ dependencies {
}
api("com.google.guava:guava")
- implementation("commons-collections:commons-collections")
+ implementation("org.apache.commons:commons-collections4")
implementation("org.apache.calcite.avatica:avatica-core")
implementation("org.apache.commons:commons-lang3")
implementation("org.slf4j:slf4j-api")
diff --git
a/innodb/src/main/java/org/apache/calcite/adapter/innodb/IndexCondition.java
b/innodb/src/main/java/org/apache/calcite/adapter/innodb/IndexCondition.java
index 3e912e91b7..6d2593af06 100644
--- a/innodb/src/main/java/org/apache/calcite/adapter/innodb/IndexCondition.java
+++ b/innodb/src/main/java/org/apache/calcite/adapter/innodb/IndexCondition.java
@@ -22,7 +22,7 @@ import org.apache.calcite.rel.RelFieldCollation;
import org.apache.calcite.rex.RexNode;
import org.apache.calcite.util.Pair;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import com.alibaba.innodb.java.reader.comparator.ComparisonOperator;
import com.google.common.collect.ImmutableList;
diff --git
a/innodb/src/main/java/org/apache/calcite/adapter/innodb/InnodbFilterTranslator.java
b/innodb/src/main/java/org/apache/calcite/adapter/innodb/InnodbFilterTranslator.java
index b26f1e9c9e..45be9e9104 100644
---
a/innodb/src/main/java/org/apache/calcite/adapter/innodb/InnodbFilterTranslator.java
+++
b/innodb/src/main/java/org/apache/calcite/adapter/innodb/InnodbFilterTranslator.java
@@ -30,7 +30,7 @@ import org.apache.calcite.util.DateString;
import org.apache.calcite.util.TimeString;
import org.apache.calcite.util.TimestampString;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import com.alibaba.innodb.java.reader.comparator.ComparisonOperator;
import com.alibaba.innodb.java.reader.schema.KeyMeta;
diff --git
a/innodb/src/main/java/org/apache/calcite/adapter/innodb/InnodbSchema.java
b/innodb/src/main/java/org/apache/calcite/adapter/innodb/InnodbSchema.java
index 00749497ac..d4d161cc3e 100644
--- a/innodb/src/main/java/org/apache/calcite/adapter/innodb/InnodbSchema.java
+++ b/innodb/src/main/java/org/apache/calcite/adapter/innodb/InnodbSchema.java
@@ -25,7 +25,7 @@ import org.apache.calcite.schema.impl.AbstractSchema;
import org.apache.calcite.sql.type.SqlTypeFactoryImpl;
import org.apache.calcite.sql.type.SqlTypeName;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import com.alibaba.innodb.java.reader.TableReaderFactory;
diff --git
a/innodb/src/main/java/org/apache/calcite/adapter/innodb/InnodbTableScan.java
b/innodb/src/main/java/org/apache/calcite/adapter/innodb/InnodbTableScan.java
index c144704a5a..632440251c 100644
---
a/innodb/src/main/java/org/apache/calcite/adapter/innodb/InnodbTableScan.java
+++
b/innodb/src/main/java/org/apache/calcite/adapter/innodb/InnodbTableScan.java
@@ -30,7 +30,7 @@ import org.apache.calcite.rel.hint.HintStrategyTable;
import org.apache.calcite.rel.hint.RelHint;
import org.apache.calcite.rel.type.RelDataType;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import com.alibaba.innodb.java.reader.Constants;
import com.alibaba.innodb.java.reader.schema.KeyMeta;
diff --git
a/innodb/src/main/java/org/apache/calcite/adapter/innodb/InnodbToEnumerableConverter.java
b/innodb/src/main/java/org/apache/calcite/adapter/innodb/InnodbToEnumerableConverter.java
index 5a32d81584..d774fffcba 100644
---
a/innodb/src/main/java/org/apache/calcite/adapter/innodb/InnodbToEnumerableConverter.java
+++
b/innodb/src/main/java/org/apache/calcite/adapter/innodb/InnodbToEnumerableConverter.java
@@ -40,7 +40,7 @@ import org.apache.calcite.util.BuiltInMethod;
import org.apache.calcite.util.Pair;
import org.apache.calcite.util.Util;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import com.alibaba.innodb.java.reader.comparator.ComparisonOperator;
diff --git
a/innodb/src/test/java/org/apache/calcite/adapter/innodb/InnodbAdapterTest.java
b/innodb/src/test/java/org/apache/calcite/adapter/innodb/InnodbAdapterTest.java
index d18e37f589..90770d2b68 100644
---
a/innodb/src/test/java/org/apache/calcite/adapter/innodb/InnodbAdapterTest.java
+++
b/innodb/src/test/java/org/apache/calcite/adapter/innodb/InnodbAdapterTest.java
@@ -26,7 +26,7 @@ import org.apache.calcite.util.Holder;
import org.apache.calcite.util.Pair;
import org.apache.calcite.util.Sources;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import com.alibaba.innodb.java.reader.util.Utils;
import com.google.common.collect.ImmutableMap;
