Skip to content

Commit

Permalink
STORM-4144 - Bump slf4j.version from 1.7.36 to 2.0.16 (#3680)
Browse files Browse the repository at this point in the history
* Bump slf4j.version from 1.7.36 to 2.0.16

Bumps `slf4j.version` from 1.7.36 to 2.0.16.

Updates `org.slf4j:slf4j-api` from 1.7.36 to 2.0.16

Updates `org.slf4j:slf4j-log4j12` from 1.7.36 to 2.0.16

Updates `org.slf4j:log4j-over-slf4j` from 1.7.36 to 2.0.16

Updates `org.slf4j:jcl-over-slf4j` from 1.7.36 to 2.0.16

Updates `org.slf4j:jul-to-slf4j` from 1.7.36 to 2.0.16

---
updated-dependencies:
- dependency-name: org.slf4j:slf4j-api
  dependency-type: direct:production
  update-type: version-update:semver-major
- dependency-name: org.slf4j:slf4j-log4j12
  dependency-type: direct:production
  update-type: version-update:semver-major
- dependency-name: org.slf4j:log4j-over-slf4j
  dependency-type: direct:development
  update-type: version-update:semver-major
- dependency-name: org.slf4j:jcl-over-slf4j
  dependency-type: direct:production
  update-type: version-update:semver-major
- dependency-name: org.slf4j:jul-to-slf4j
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>

* slf4j2 fixes

* license

* slf4j2 fixes

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Richard Zowalla <[email protected]>
  • Loading branch information
dependabot[bot] and rzo1 authored Jan 9, 2025
1 parent 1ccd04d commit 6fb3af9
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 15 deletions.
10 changes: 5 additions & 5 deletions DEPENDENCY-LICENSES
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ List of third-party dependencies grouped by their license type.
Apache License

* carbonite (org.clojars.bipinprasad:carbonite:1.6.0 - https://github.com/bipinprasad/carbonite)
* Log4j Implemented Over SLF4J (org.slf4j:log4j-over-slf4j:1.7.36 - http://www.slf4j.org)
* Log4j Implemented Over SLF4J (org.slf4j:log4j-over-slf4j:2.0.16 - http://www.slf4j.org)

Apache License, Version 2.0

Expand Down Expand Up @@ -148,7 +148,7 @@ List of third-party dependencies grouped by their license type.
* javax.inject (javax.inject:javax.inject:1 - http://code.google.com/p/atinject/)
* JBoss Logging 3 (org.jboss.logging:jboss-logging:3.6.0.Final - http://www.jboss.org)
* JCIP Annotations under Apache License (com.github.stephenc.jcip:jcip-annotations:1.0-1 - http://stephenc.github.com/jcip-annotations)
* JCL 1.2 implemented over SLF4J (org.slf4j:jcl-over-slf4j:1.7.36 - http://www.slf4j.org)
* JCL 1.2 implemented over SLF4J (org.slf4j:jcl-over-slf4j:2.0.16 - http://www.slf4j.org)
* jdependency (org.vafer:jdependency:2.10 - http://github.com/tcurdt/jdependency)
* Jettison (org.codehaus.jettison:jettison:1.5.4 - https://github.com/jettison-json/jettison)
* JSON Small and Fast Parser (net.minidev:json-smart:2.5.1 - https://urielch.github.io/)
Expand Down Expand Up @@ -257,7 +257,7 @@ List of third-party dependencies grouped by their license type.
* Prometheus Metrics Tracer OpenTelemetry (io.prometheus:prometheus-metrics-tracer-otel:1.3.5 - http://github.com/prometheus/client_java/prometheus-metrics-tracer/prometheus-metrics-tracer-otel)
* Prometheus Metrics Tracer OpenTelemetry Agent (io.prometheus:prometheus-metrics-tracer-otel-agent:1.3.5 - http://github.com/prometheus/client_java/prometheus-metrics-tracer/prometheus-metrics-tracer-otel-agent)
* sigar (org.fusesource:sigar:1.6.4 - http://fusesource.com/sigar/)
* SLF4J 1 Binding for Log4j API (org.apache.logging.log4j:log4j-slf4j-impl:2.24.3 - https://logging.apache.org/log4j/2.x/log4j/log4j-slf4j-impl/)
* SLF4J 2 Provider for Log4j API (org.apache.logging.log4j:log4j-slf4j2-impl:2.24.3 - https://logging.apache.org/log4j/2.x/log4j/log4j-slf4j2-impl/)
* SnakeYAML (org.yaml:snakeyaml:2.2 - https://bitbucket.org/snakeyaml/snakeyaml)
* snappy-java (org.xerial.snappy:snappy-java:1.1.10.7 - https://github.com/xerial/snappy-java)
* Spring AOP (org.springframework:spring-aop:5.3.27 - https://github.com/spring-projects/spring-framework)
Expand Down Expand Up @@ -422,8 +422,8 @@ List of third-party dependencies grouped by their license type.
* JCodings (org.jruby.jcodings:jcodings:1.0.58 - http://nexus.sonatype.org/oss-repository-hosting.html/jcodings)
* Jedis (redis.clients:jedis:5.2.0 - https://github.com/redis/jedis)
* Joni (org.jruby.joni:joni:2.2.1 - http://nexus.sonatype.org/oss-repository-hosting.html/joni)
* JUL to SLF4J bridge (org.slf4j:jul-to-slf4j:1.7.36 - http://www.slf4j.org)
* SLF4J API Module (org.slf4j:slf4j-api:1.7.36 - http://www.slf4j.org)
* JUL to SLF4J bridge (org.slf4j:jul-to-slf4j:2.0.16 - http://www.slf4j.org)
* SLF4J API Module (org.slf4j:slf4j-api:2.0.16 - http://www.slf4j.org)
* System Out and Err redirected to SLF4J (uk.org.lidalia:sysout-over-slf4j:1.0.2 - http://projects.lidalia.org.uk/sysout-over-slf4j/)

Public Domain
Expand Down
10 changes: 5 additions & 5 deletions LICENSE-binary
Original file line number Diff line number Diff line change
Expand Up @@ -665,7 +665,7 @@ The license texts of these dependencies can be found in the licenses directory.
Apache License

* carbonite (org.clojars.bipinprasad:carbonite:1.6.0 - https://github.com/bipinprasad/carbonite)
* Log4j Implemented Over SLF4J (org.slf4j:log4j-over-slf4j:1.7.36 - http://www.slf4j.org)
* Log4j Implemented Over SLF4J (org.slf4j:log4j-over-slf4j:2.0.16 - http://www.slf4j.org)

Apache License, Version 2.0

Expand Down Expand Up @@ -709,7 +709,7 @@ The license texts of these dependencies can be found in the licenses directory.
* Apache Kafka (org.apache.kafka:kafka-clients:3.9.0 - https://kafka.apache.org)
* Apache Log4j API (org.apache.logging.log4j:log4j-api:2.24.3 - https://logging.apache.org/log4j/2.x/log4j-api/)
* Apache Log4j Core (org.apache.logging.log4j:log4j-core:2.24.3 - https://logging.apache.org/log4j/2.x/log4j-core/)
* Apache Log4j SLF4J Binding (org.apache.logging.log4j:log4j-slf4j-impl:2.24.3 - https://logging.apache.org/log4j/2.x/log4j-slf4j-impl/)
* Apache Log4j SLF4J Binding (org.apache.logging.log4j:log4j-slf4j2-impl:2.24.3 - https://logging.apache.org/log4j/2.x/log4j-slf4j2-impl/)
* Apache Thrift (org.apache.thrift:libthrift:0.19.0 - http://thrift.apache.org)
* Apache Yetus - Audience Annotations (org.apache.yetus:audience-annotations:0.12.0 - https://yetus.apache.org/audience-annotations)
* Apache Yetus - Audience Annotations (org.apache.yetus:audience-annotations:0.13.0 - https://yetus.apache.org/audience-annotations)
Expand Down Expand Up @@ -775,7 +775,7 @@ The license texts of these dependencies can be found in the licenses directory.
* javax.inject (javax.inject:javax.inject:1 - http://code.google.com/p/atinject/)
* JBoss Logging 3 (org.jboss.logging:jboss-logging:3.6.0.Final - http://www.jboss.org)
* JCIP Annotations under Apache License (com.github.stephenc.jcip:jcip-annotations:1.0-1 - http://stephenc.github.com/jcip-annotations)
* JCL 1.2 implemented over SLF4J (org.slf4j:jcl-over-slf4j:1.7.36 - http://www.slf4j.org)
* JCL 1.2 implemented over SLF4J (org.slf4j:jcl-over-slf4j:2.0.16 - http://www.slf4j.org)
* Jettison (org.codehaus.jettison:jettison:1.5.4 - no url defined)
* JSON Small and Fast Parser (net.minidev:json-smart:2.5.1 - https://urielch.github.io/)
* JVM Integration for Metrics (io.dropwizard.metrics:metrics-jvm:4.2.29 - https://metrics.dropwizard.io/metrics-jvm)
Expand Down Expand Up @@ -998,8 +998,8 @@ The license texts of these dependencies can be found in the licenses directory.
* Checker Qual (org.checkerframework:checker-qual:3.48.3 - https://checkerframework.org/)
* JCodings (org.jruby.jcodings:jcodings:1.0.58 - http://nexus.sonatype.org/oss-repository-hosting.html/jcodings)
* Joni (org.jruby.joni:joni:2.2.1 - http://nexus.sonatype.org/oss-repository-hosting.html/joni)
* JUL to SLF4J bridge (org.slf4j:jul-to-slf4j:1.7.36 - http://www.slf4j.org)
* SLF4J API Module (org.slf4j:slf4j-api:1.7.36 - http://www.slf4j.org)
* JUL to SLF4J bridge (org.slf4j:jul-to-slf4j:2.0.16 - http://www.slf4j.org)
* SLF4J API Module (org.slf4j:slf4j-api:2.0.16 - http://www.slf4j.org)
* System Out and Err redirected to SLF4J (uk.org.lidalia:sysout-over-slf4j:1.0.2 - http://projects.lidalia.org.uk/sysout-over-slf4j/)

The Go license
Expand Down
2 changes: 1 addition & 1 deletion external/storm-kafka-migration/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@

<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<artifactId>log4j-slf4j2-impl</artifactId>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@
<netty.version>4.1.115.Final</netty.version>
<sysout-over-slf4j.version>1.0.2</sysout-over-slf4j.version>
<log4j.version>2.24.3</log4j.version>
<slf4j.version>1.7.36</slf4j.version>
<slf4j.version>2.0.16</slf4j.version>
<metrics.version>4.2.29</metrics.version>
<mockito.version>5.14.2</mockito.version>
<zookeeper.version>3.9.3</zookeeper.version>
Expand Down
2 changes: 1 addition & 1 deletion storm-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<artifactId>log4j-slf4j2-impl</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Expand Down
2 changes: 1 addition & 1 deletion storm-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<artifactId>log4j-slf4j2-impl</artifactId>
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion storm-webapp/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<artifactId>log4j-slf4j2-impl</artifactId>
<!-- This is present in the Storm /lib directory, and should not also be present in /lib-webapp since both are on the classpath -->
<scope>provided</scope>
</dependency>
Expand Down

0 comments on commit 6fb3af9

Please sign in to comment.