From e15471ac76cca4db79cbfa5ed032e9e2aa7e2169 Mon Sep 17 00:00:00 2001
From: absurdfarce <absurdfarce@apache.org>
Date: Thu, 14 Aug 2025 16:42:53 -0500
Subject: [PATCH] Bump logback to most recent Java8-compatible version

patch by Bret McGuire; reviewed by Bret McGuire and Lukasz Antoniak
reference: https://github.com/apache/cassandra-java-driver/pull/2051
---
 .../driver/internal/osgi/support/BundleOptions.java    | 10 ++++++++++
 pom.xml                                                |  4 ++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/osgi-tests/src/test/java/com/datastax/oss/driver/internal/osgi/support/BundleOptions.java b/osgi-tests/src/test/java/com/datastax/oss/driver/internal/osgi/support/BundleOptions.java
index 3e6171ca530..abe6e182a78 100644
--- a/osgi-tests/src/test/java/com/datastax/oss/driver/internal/osgi/support/BundleOptions.java
+++ b/osgi-tests/src/test/java/com/datastax/oss/driver/internal/osgi/support/BundleOptions.java
@@ -102,6 +102,16 @@ public static CompositeOption logbackBundles() {
         options(
             mavenBundle("ch.qos.logback", "logback-classic").versionAsInProject(),
             mavenBundle("ch.qos.logback", "logback-core").versionAsInProject(),
+
+            // slf4j 2.x requires spifly in order to operate in an OSGi context
+            mavenBundle("org.apache.aries.spifly", "org.apache.aries.spifly.dynamic.bundle")
+                .version("1.3.7"),
+            mavenBundle("org.apache.aries", "org.apache.aries.util").version("1.1.1"),
+            mavenBundle("org.ow2.asm", "asm").version("9.6"),
+            mavenBundle("org.ow2.asm", "asm-commons").version("9.6"),
+            mavenBundle("org.ow2.asm", "asm-util").version("9.6"),
+            mavenBundle("org.ow2.asm", "asm-tree").version("9.6"),
+            mavenBundle("org.ow2.asm", "asm-analysis").version("9.6"),
             systemProperty("logback.configurationFile")
                 .value("file:src/test/resources/logback-test.xml"));
   }
diff --git a/pom.xml b/pom.xml
index 2cfeb65e757..3656d2c5fa1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,7 +65,7 @@
     -->
     <tinkerpop.version>3.5.6</tinkerpop.version>
     <!-- when changing version also update version in LICENSE_binary  -->
-    <slf4j.version>1.7.26</slf4j.version>
+    <slf4j.version>2.0.16</slf4j.version>
     <!-- when changing version also update version in LICENSE_binary  -->
     <reactive-streams.version>1.0.3</reactive-streams.version>
     <json.version>20230227</json.version>
@@ -78,7 +78,7 @@
     <assertj.version>3.19.0</assertj.version>
     <commons-exec.version>1.3</commons-exec.version>
     <junit.version>4.13.2</junit.version>
-    <logback.version>1.2.3</logback.version>
+    <logback.version>1.3.15</logback.version>
     <osgi.version>6.0.0</osgi.version>
     <felix.version>7.0.1</felix.version>
     <pax-exam.version>4.13.4</pax-exam.version>