From 84e92d5fd15c17dd2cdb0f755509c6ac66d389cd Mon Sep 17 00:00:00 2001 From: Stephen Mallette Date: Wed, 29 Jan 2025 21:50:09 -0500 Subject: [PATCH] Bumped slf4j and other logging related infrastructure. Prefered a JDK8 version of logback rather than latest. --- CHANGELOG.asciidoc | 2 +- docs/src/upgrade/release-4.x.x.asciidoc | 7 +++++++ gremlin-console/pom.xml | 11 ++++++---- gremlin-console/src/main/static/LICENSE | 7 +++---- gremlin-core/pom.xml | 12 ++++++----- gremlin-driver/pom.xml | 3 +-- gremlin-driver/src/main/static/LICENSE | 6 +++--- gremlin-server/src/main/static/LICENSE | 7 +++---- gremlin-tools/gremlin-socket-server/pom.xml | 4 ---- gremlin-util/pom.xml | 4 ---- hadoop-gremlin/pom.xml | 13 ++++++++++++ .../hadoop/structure/HadoopConfiguration.java | 5 +++++ pom.xml | 20 +++++++++---------- spark-gremlin/pom.xml | 9 --------- sparql-gremlin/pom.xml | 6 ++++++ 15 files changed, 66 insertions(+), 50 deletions(-) diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 9b8bcd2765d..9b865b2d4d4 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -23,7 +23,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima [[release-4-0-0]] === TinkerPop 4.0.0 (NOT OFFICIALLY RELEASED YET) - +* Bumped SLF4j to 2.0.16. [[release-4-0-0-beta-1]] === TinkerPop 4.0.0-beta.1 (January 17, 2025) diff --git a/docs/src/upgrade/release-4.x.x.asciidoc b/docs/src/upgrade/release-4.x.x.asciidoc index 33685a02fb2..9c442914522 100644 --- a/docs/src/upgrade/release-4.x.x.asciidoc +++ b/docs/src/upgrade/release-4.x.x.asciidoc @@ -30,6 +30,13 @@ complete list of all the modifications that are part of this release. === Upgrading for Users +==== SLF4j 2.x + +TinkerPop has generally upgraded to SLF4j 2.x which brings with it some important changes to log initialization which +may affect user applications that are upgrading from TinkerPop 3.x. Please see the +[SLF4j documentation](https://www.slf4j.org/faq.html#changesInVersion200) that explains the differences and how they +might apply. + === Upgrading for Providers ==== Graph System Providers diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml index 3e879eb4781..76eed682692 100644 --- a/gremlin-console/pom.xml +++ b/gremlin-console/pom.xml @@ -39,10 +39,6 @@ limitations under the License. tinkergraph-gremlin ${project.version} - - org.apache.httpcomponents - httpclient - commons-codec @@ -235,6 +231,13 @@ limitations under the License. io.shaded.netty + + + + ch.qos.logback:logback-core + versions/21/** + + diff --git a/gremlin-console/src/main/static/LICENSE b/gremlin-console/src/main/static/LICENSE index dbc79572436..064c86008a7 100644 --- a/gremlin-console/src/main/static/LICENSE +++ b/gremlin-console/src/main/static/LICENSE @@ -223,8 +223,7 @@ MIT Licenses The Apache TinkerPop project bundles the following components under the MIT License: - JCL 1.1.1 implemented over SLF4J (org.slf4j:jcl-over-slf4j:1.7.25 - http://www.slf4j.org) - for details, see licenses/slf4j - SLF4J API Module (org.slf4j:slf4j-api:1.7.25 - http://www.slf4j.org) - for details, see licenses/slf4j + SLF4J API Module (org.slf4j:slf4j-api:2.0.16 - http://www.slf4j.org) - for details, see licenses/slf4j Foundation stylesheet for CodeRay (http://foundation.zurb.com) - for details, see licenses/foundation normalize.css 2.1.2 (http://necolas.github.io/normalize.css/) - for details, see licenses/normalize @@ -238,5 +237,5 @@ The Apache TinkerPop project bundles the following components under the ISC Lice The Apache TinkerPop project bundles the following components under the Eclipse Public License 1.0: - logback-core (ch.qos.logback:logback-core:1.2.3 - https://logback.qos.ch) - for details, see licenses/logback - logback-classic (ch.qos.logback:logback-classic:1.2.3 - https://logback.qos.ch) - for details, see licenses/logback + logback-core (ch.qos.logback:logback-core:1.3.15 - https://logback.qos.ch) - for details, see licenses/logback + logback-classic (ch.qos.logback:logback-classic:1.3.15 - https://logback.qos.ch) - for details, see licenses/logback diff --git a/gremlin-core/pom.xml b/gremlin-core/pom.xml index b0d53e0b1c7..a8b73d1c1e1 100644 --- a/gremlin-core/pom.xml +++ b/gremlin-core/pom.xml @@ -39,19 +39,21 @@ limitations under the License. org.slf4j slf4j-api - - org.slf4j - jcl-over-slf4j - org.apache.commons commons-configuration2 + + + commons-logging + commons-logging + + commons-beanutils commons-beanutils - 1.9.4 + 1.10.0 org.apache.commons diff --git a/gremlin-driver/pom.xml b/gremlin-driver/pom.xml index 451c449e588..53e04d071ce 100644 --- a/gremlin-driver/pom.xml +++ b/gremlin-driver/pom.xml @@ -178,9 +178,8 @@ limitations under the License. - ch.qos.logback:logback-classic + ch.qos.logback:* org.slf4j:slf4j-api - org.slf4j:jcl-over-slf4j diff --git a/gremlin-driver/src/main/static/LICENSE b/gremlin-driver/src/main/static/LICENSE index 2a6fc08ed07..a5e016eca2e 100644 --- a/gremlin-driver/src/main/static/LICENSE +++ b/gremlin-driver/src/main/static/LICENSE @@ -221,7 +221,7 @@ MIT Licenses The Apache TinkerPop project bundles the following components under the MIT License: - SLF4J API Module (org.slf4j:slf4j-api:1.7.25 - http://www.slf4j.org) + SLF4J API Module (org.slf4j:slf4j-api:2.0.16 - http://www.slf4j.org) - shaded to org.shaded.slf4j - for details, see licenses/slf4j @@ -231,5 +231,5 @@ Other Licenses The Apache TinkerPop project bundles the following components under the Eclipse Public License 1.0: - logback-core (ch.qos.logback:logback-core:1.2.3 - https://logback.qos.ch) - for details, see licenses/logback - logback-classic (ch.qos.logback:logback-classic:1.2.3 - https://logback.qos.ch) - for details, see licenses/logback \ No newline at end of file + logback-core (ch.qos.logback:logback-core:1.3.15 - https://logback.qos.ch) - for details, see licenses/logback + logback-classic (ch.qos.logback:logback-classic:1.3.15 - https://logback.qos.ch) - for details, see licenses/logback \ No newline at end of file diff --git a/gremlin-server/src/main/static/LICENSE b/gremlin-server/src/main/static/LICENSE index e4c2b49546a..bc3a28a2f87 100644 --- a/gremlin-server/src/main/static/LICENSE +++ b/gremlin-server/src/main/static/LICENSE @@ -223,8 +223,7 @@ MIT Licenses The Apache TinkerPop project bundles the following components under the MIT License: - JCL 1.1.1 implemented over SLF4J (org.slf4j:jcl-over-slf4j:1.7.25 - http://www.slf4j.org) - for details, see licenses/slf4j - SLF4J API Module (org.slf4j:slf4j-api:1.7.25 - http://www.slf4j.org) - for details, see licenses/slf4j + SLF4J API Module (org.slf4j:slf4j-api:2.0.16 - http://www.slf4j.org) - for details, see licenses/slf4j Foundation stylesheet for CodeRay (http://foundation.zurb.com) - for details, see licenses/foundation normalize.css 2.1.2 (http://necolas.github.io/normalize.css/) - for details, see licenses/normalize @@ -238,5 +237,5 @@ The Apache TinkerPop project bundles the following components under the ISC Lice The Apache TinkerPop project bundles the following components under the Eclipse Public License 1.0: - logback-core (ch.qos.logback:logback-core:1.2.3 - https://logback.qos.ch) - for details, see licenses/logback - logback-classic (ch.qos.logback:logback-classic:1.2.3 - https://logback.qos.ch) - for details, see licenses/logback \ No newline at end of file + logback-core (ch.qos.logback:logback-core:1.3.15 - https://logback.qos.ch) - for details, see licenses/logback + logback-classic (ch.qos.logback:logback-classic:1.3.15 - https://logback.qos.ch) - for details, see licenses/logback \ No newline at end of file diff --git a/gremlin-tools/gremlin-socket-server/pom.xml b/gremlin-tools/gremlin-socket-server/pom.xml index 6f36efa4691..5d25aae750d 100644 --- a/gremlin-tools/gremlin-socket-server/pom.xml +++ b/gremlin-tools/gremlin-socket-server/pom.xml @@ -32,10 +32,6 @@ org.slf4j slf4j-api - - org.slf4j - jcl-over-slf4j - org.apache.groovy groovy diff --git a/gremlin-util/pom.xml b/gremlin-util/pom.xml index fe6dda9494f..12141fb216c 100644 --- a/gremlin-util/pom.xml +++ b/gremlin-util/pom.xml @@ -28,10 +28,6 @@ org.slf4j slf4j-api - - org.slf4j - jcl-over-slf4j - org.apache.tinkerpop diff --git a/hadoop-gremlin/pom.xml b/hadoop-gremlin/pom.xml index 640192f8ee3..e03d5c4594b 100644 --- a/hadoop-gremlin/pom.xml +++ b/hadoop-gremlin/pom.xml @@ -63,6 +63,14 @@ limitations under the License. com.google.guava guava + + commons-beanutils + commons-beanutils + + + commons-logging + commons-logging + com.nimbusds nimbus-jose-jwt @@ -140,6 +148,11 @@ limitations under the License. guava 27.0-jre + + commons-logging + commons-logging + 1.3.4 + com.fasterxml.jackson.core 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 610f07377d5..c252a1afc1a 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 @@ -45,6 +45,11 @@ public HadoopConfiguration(final Configuration configuration) { this.copy(configuration); } + @Override + protected boolean containsValueInternal(final Object o) { + return properties.containsValue(o); + } + @Override protected Iterator getKeysInternal() { return properties.keySet().iterator(); diff --git a/pom.xml b/pom.xml index d757f5beb77..f3421cf1eb5 100644 --- a/pom.xml +++ b/pom.xml @@ -153,10 +153,10 @@ limitations under the License. 4.9.1 2.3.1 4.4 - 2.9.0 + 2.11.0 2.6 2.8.0 - 3.12.0 + 3.17.0 1.10.0 6.11.0 0.4.8 @@ -170,11 +170,11 @@ limitations under the License. 0.4 4.13.1 2.0.3 - 1.2.13 + 1.3.15 3.0.2 3.10.0 4.1.101.Final - 1.7.25 + 2.0.16 2.0 3.5.4 2.29.3 @@ -622,6 +622,7 @@ limitations under the License. -Dlogback.configuration=${logback-test.properties} -Dlog4j.configuration=${log4j-test.properties} + -Dslf4j.provider=ch.qos.logback.classic.spi.LogbackServiceProvider -Dbuild.dir=${project.build.directory} -Dis.testing=true -Djava.net.preferIPv4Stack=true ${suresafeArgs} ${jdk17JvmArgs} @@ -650,6 +651,7 @@ limitations under the License. -Dlogback.configuration=${logback-test.properties} -Dlog4j.configuration=${log4j-test.properties} + -Dslf4j.provider=ch.qos.logback.classic.spi.LogbackServiceProvider -Dhost=localhost -Dport=8182 -Dbuild.dir=${project.build.directory} -Dis.testing=true -Djava.net.preferIPv4Stack=true ${suresafeArgs} @@ -707,7 +709,7 @@ limitations under the License. org.apache.maven.plugins maven-shade-plugin - 3.4.1 + 3.6.0 false @@ -889,11 +891,6 @@ limitations under the License. slf4j-api ${slf4j.version} - - org.slf4j - jcl-over-slf4j - ${slf4j.version} - org.jacoco jacoco-maven-plugin @@ -1973,6 +1970,7 @@ limitations under the License. -Dlogback.configuration=${logback-silent.properties} -Dlog4j.configuration=${log4j-silent.properties} + -Dslf4j.provider=ch.qos.logback.classic.spi.LogbackServiceProvider -Dbuild.dir=${project.build.directory} -Dis.testing=true -Djava.net.preferIPv4Stack=true ${suresafeArgs} ${jdk17JvmArgs} @@ -2081,6 +2079,7 @@ limitations under the License. @{surefireArgLine} -Dlogback.configuration=${logback-test.properties} -Dlog4j.configuration=${log4j-test.properties} + -Dslf4j.provider=ch.qos.logback.classic.spi.LogbackServiceProvider -Dbuild.dir=${project.build.directory} -Dis.testing=true ${suresafeArgs} -Djava.net.preferIPv4Stack=true @@ -2092,6 +2091,7 @@ limitations under the License. @{failsafeArgLine} -Dlogback.configuration=${logback-test.properties} -Dlog4j.configuration=${log4j-test.properties} -Dhost=localhost -Dport=8182 + -Dslf4j.provider=ch.qos.logback.classic.spi.LogbackServiceProvider -Dbuild.dir=${project.build.directory} -Dis.testing=true ${suresafeArgs} -Djava.net.preferIPv4Stack=true diff --git a/spark-gremlin/pom.xml b/spark-gremlin/pom.xml index 348116dc9cc..aceb066c4fb 100644 --- a/spark-gremlin/pom.xml +++ b/spark-gremlin/pom.xml @@ -151,10 +151,6 @@ limitations under the License. com.fasterxml.jackson.core jackson-databind - - org.slf4j - slf4j-log4j12 - org.scala-lang scala-library @@ -191,11 +187,6 @@ limitations under the License. org.xerial.snappy snappy-java - - - org.apache.logging.log4j - log4j-slf4j-impl - io.netty diff --git a/sparql-gremlin/pom.xml b/sparql-gremlin/pom.xml index df98d7bff99..02e6e6ff12d 100644 --- a/sparql-gremlin/pom.xml +++ b/sparql-gremlin/pom.xml @@ -32,6 +32,12 @@ limitations under the License. apache-jena-libs pom 3.12.0 + + + org.slf4j + jcl-over-slf4j + + org.apache.tinkerpop