From 46775af0044676f7b0453a5f58b445a56b5a9510 Mon Sep 17 00:00:00 2001 From: absurdfarce Date: Mon, 11 May 2026 18:34:28 -0500 Subject: [PATCH] Revert #2051 and replace it with something closer to the intent of the original PR (#1901). The change that was actually merged attempted to bump us up to the most recent Java8-compatible logback impl. This moved us from 1.2.x to 1.3.x which in turn brought some dependency changes that were excessive, especially for a patch release. patch by Bret McGuire; reviewed by Andy Tolbert and Abe Ratnofsky reference: https://github.com/apache/cassandra-java-driver/pull/2088 --- .../driver/internal/osgi/support/BundleOptions.java | 10 ---------- pom.xml | 4 ++-- 2 files changed, 2 insertions(+), 12 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 cb7e86b2a73..6f82a3e250b 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,16 +102,6 @@ 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 126279912da..329412a6ba8 100644 --- a/pom.xml +++ b/pom.xml @@ -65,7 +65,7 @@ --> 3.5.6 - 2.0.16 + 1.7.26 1.0.3 2.20.1 @@ -77,7 +77,7 @@ 3.19.0 1.3 4.13.2 - 1.3.15 + 1.2.13 6.0.0 7.0.1 4.13.4