This is an automated email from the ASF dual-hosted git repository. spmallette pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit b2deb67fb993e143a70052ee6b8ca20c38896238 Author: Stephen Mallette <[email protected]> AuthorDate: Tue Jun 30 19:21:02 2026 -0400 Bump commons-configuration2 to 2.15.1 Also bumps commons-lang3, commons-text and commons-io, which 2.15.1 requires transitively, and excludes commons-logging in favor of jcl-over-slf4j. HadoopConfiguration implements the new containsValueInternal method. Assisted-by: Claude Code:claude-opus-4-8 --- gremlin-core/pom.xml | 6 ++++++ .../gremlin/hadoop/structure/HadoopConfiguration.java | 5 +++++ pom.xml | 15 ++++++++------- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/gremlin-core/pom.xml b/gremlin-core/pom.xml index d9c5cc1ba5..d8f95274a0 100644 --- a/gremlin-core/pom.xml +++ b/gremlin-core/pom.xml @@ -46,6 +46,12 @@ limitations under the License. <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-configuration2</artifactId> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>commons-beanutils</groupId> diff --git a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/HadoopConfiguration.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/HadoopConfiguration.java index f39a503183..a09ad8ce34 100644 --- a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/HadoopConfiguration.java +++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/HadoopConfiguration.java @@ -65,6 +65,11 @@ public final class HadoopConfiguration extends AbstractConfiguration implements return properties.containsKey(s); } + @Override + protected boolean containsValueInternal(final Object value) { + return properties.containsValue(value); + } + @Override protected void addPropertyDirect(final String key, final Object value) { this.properties.put(key, value); diff --git a/pom.xml b/pom.xml index 64fb4c4f14..5358e05ead 100644 --- a/pom.xml +++ b/pom.xml @@ -154,11 +154,11 @@ limitations under the License. <antlr4.version>4.9.1</antlr4.version> <caffeine.version>2.3.1</caffeine.version> <commons.collections.version>3.2.2</commons.collections.version> - <commons.configuration.version>2.9.0</commons.configuration.version> + <commons.configuration.version>2.15.1</commons.configuration.version> <commons.lang.version>2.6</commons.lang.version> - <commons.io.version>2.8.0</commons.io.version> - <commons.lang3.version>3.12.0</commons.lang3.version> - <commons.text.version>1.10.0</commons.text.version> + <commons.io.version>2.22.0</commons.io.version> + <commons.lang3.version>3.20.0</commons.lang3.version> + <commons.text.version>1.15.0</commons.text.version> <cucumber.version>6.11.0</cucumber.version> <exp4j.version>0.4.8</exp4j.version> <groovy.version>4.0.25</groovy.version> @@ -762,10 +762,10 @@ limitations under the License. <artifactId>commons-configuration2</artifactId> <version>${commons.configuration.version}</version> <exclusions> - <!-- still on 1.8 and we need 1.9 --> + <!-- exclude commons-logging in favor of slf4j via jcl-over-slf4j --> <exclusion> - <groupId>org.apache.commons</groupId> - <artifactId>commons-text</artifactId> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> </exclusion> </exclusions> </dependency> @@ -780,6 +780,7 @@ limitations under the License. <artifactId>commons-beanutils</artifactId> <version>1.11.0</version> <exclusions> + <!-- exclude commons-logging in favor of slf4j via jcl-over-slf4j --> <exclusion> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId>
