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

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 2cfeb65e757..9dd490f68a0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>

From 59ecc72e9d4885717ececb2f8415c4cfb90f9b75 Mon Sep 17 00:00:00 2001
From: absurdfarce <absurdfarce@apache.org>
Date: Thu, 14 Aug 2025 21:41:19 -0500
Subject: [PATCH 2/3] Have to update slf4j-api as well to address errors for
 missing class org.slf4j.spi.LoggingEventAware.

https://logback.qos.ch/setup.html has some more docs on this (at least as of this writing)
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 9dd490f68a0..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>

From cf6e2d814ac02cc756a7d706e96f4a4079cd360c Mon Sep 17 00:00:00 2001
From: absurdfarce <absurdfarce@apache.org>
Date: Wed, 20 Aug 2025 18:25:14 -0500
Subject: [PATCH 3/3] Add spifly to OSGi tests in order to make slf4j 2.x
 happy.

This technique was discovered and implemented by Lukasz Antoniak.
---
 .../driver/internal/osgi/support/BundleOptions.java    | 10 ++++++++++
 1 file changed, 10 insertions(+)

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"));
   }