This is an automated email from the ASF dual-hosted git repository.
mbudiu 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 b25fcd8016 [CALCITE-7097] Update commons-lang to 3.18.0
b25fcd8016 is described below
commit b25fcd8016dbb25291cd79d0c0e2d71abb132ab6
Author: Niels Pardon <[email protected]>
AuthorDate: Wed Jul 16 11:41:31 2025 +0200
[CALCITE-7097] Update commons-lang to 3.18.0
Signed-off-by: Niels Pardon <[email protected]>
---
core/build.gradle.kts | 1 -
core/src/main/java/org/apache/calcite/runtime/SqlFunctions.java | 4 ++--
.../test/java/org/apache/calcite/plan/volcano/VolcanoPlannerTest.java | 2 +-
.../main/java/org/apache/calcite/adapter/geode/util/GeodeUtils.java | 4 ++--
gradle.properties | 2 +-
5 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index 06c1aaa450..842a34fba6 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -89,7 +89,6 @@
testPostgresql("org.postgresql:postgresql")
testImplementation(project(":testkit"))
- testImplementation("commons-lang:commons-lang")
testImplementation("net.bytebuddy:byte-buddy")
testImplementation("net.hydromatic:foodmart-queries")
testImplementation("net.hydromatic:quidem")
diff --git a/core/src/main/java/org/apache/calcite/runtime/SqlFunctions.java
b/core/src/main/java/org/apache/calcite/runtime/SqlFunctions.java
index 7140b091d8..8b11fe8634 100644
--- a/core/src/main/java/org/apache/calcite/runtime/SqlFunctions.java
+++ b/core/src/main/java/org/apache/calcite/runtime/SqlFunctions.java
@@ -60,8 +60,8 @@
import org.apache.commons.codec.binary.Hex;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.commons.codec.language.Soundex;
-import org.apache.commons.lang.StringEscapeUtils;
import org.apache.commons.math3.util.CombinatoricsUtils;
+import org.apache.commons.text.StringEscapeUtils;
import org.apache.commons.text.similarity.LevenshteinDistance;
import com.google.common.base.Splitter;
@@ -6027,7 +6027,7 @@ public static String replace(String s, String search,
String replacement,
return s.replace(search, replacement);
}
// for MSSQL's REPLACE function, search pattern is case-insensitive during
matching
- return org.apache.commons.lang3.StringUtils.replaceIgnoreCase(s, search,
replacement);
+ return org.apache.commons.lang3.Strings.CI.replace(s, search, replacement);
}
/** Helper for "array element reference". Caller has already ensured that
diff --git
a/core/src/test/java/org/apache/calcite/plan/volcano/VolcanoPlannerTest.java
b/core/src/test/java/org/apache/calcite/plan/volcano/VolcanoPlannerTest.java
index b30464608a..909312dd4e 100644
--- a/core/src/test/java/org/apache/calcite/plan/volcano/VolcanoPlannerTest.java
+++ b/core/src/test/java/org/apache/calcite/plan/volcano/VolcanoPlannerTest.java
@@ -42,7 +42,7 @@
import org.apache.calcite.tools.RelBuilder;
import org.apache.calcite.util.Pair;
-import org.apache.commons.lang.exception.ExceptionUtils;
+import org.apache.commons.lang3.exception.ExceptionUtils;
import org.immutables.value.Value;
import org.junit.jupiter.api.Disabled;
diff --git
a/geode/src/main/java/org/apache/calcite/adapter/geode/util/GeodeUtils.java
b/geode/src/main/java/org/apache/calcite/adapter/geode/util/GeodeUtils.java
index 175c5ebdec..06b74f20b1 100644
--- a/geode/src/main/java/org/apache/calcite/adapter/geode/util/GeodeUtils.java
+++ b/geode/src/main/java/org/apache/calcite/adapter/geode/util/GeodeUtils.java
@@ -22,7 +22,7 @@
import org.apache.calcite.rel.type.RelDataTypeField;
import org.apache.calcite.util.Util;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
import org.apache.geode.cache.CacheClosedException;
import org.apache.geode.cache.GemFireCache;
import org.apache.geode.cache.Region;
@@ -84,7 +84,7 @@ public static synchronized ClientCache
createClientCache(String locatorHost,
int locatorPort, String autoSerializerPackagePath,
boolean readSerialized) {
if (locatorPort != currentLocatorPort
- || !StringUtils.equalsIgnoreCase(currentLocatorHost, locatorHost)) {
+ || !Strings.CI.equals(currentLocatorHost, locatorHost)) {
LOGGER.info("Close existing ClientCache ["
+ currentLocatorHost + ":" + currentLocatorPort + "] for new Locator
connection at: ["
+ locatorHost + ":" + locatorPort + "]");
diff --git a/gradle.properties b/gradle.properties
index f86f11caae..3590f80064 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -92,7 +92,7 @@ chinook-data-hsqldb.version=0.2
commons-codec.version=1.16.0
commons-dbcp2.version=2.11.0
commons-io.version=2.15.0
-commons-lang3.version=3.13.0
+commons-lang3.version=3.18.0
commons-math3.version=3.6.1
commons-pool2.version=2.12.0
commons-collections4.version=4.4
