Skip to content

Commit ad7a103

Browse files
committed
Bump logback to most recent Java8-compatible version
patch by Bret McGuire; reviewed by Bret McGuire and Lukasz Antoniak reference: #2051
1 parent 595cb29 commit ad7a103

2 files changed

Lines changed: 12 additions & 2 deletions

File tree

osgi-tests/src/test/java/com/datastax/oss/driver/internal/osgi/support/BundleOptions.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,16 @@ public static CompositeOption logbackBundles() {
102102
options(
103103
mavenBundle("ch.qos.logback", "logback-classic").versionAsInProject(),
104104
mavenBundle("ch.qos.logback", "logback-core").versionAsInProject(),
105+
106+
// slf4j 2.x requires spifly in order to operate in an OSGi context
107+
mavenBundle("org.apache.aries.spifly", "org.apache.aries.spifly.dynamic.bundle")
108+
.version("1.3.7"),
109+
mavenBundle("org.apache.aries", "org.apache.aries.util").version("1.1.1"),
110+
mavenBundle("org.ow2.asm", "asm").version("9.6"),
111+
mavenBundle("org.ow2.asm", "asm-commons").version("9.6"),
112+
mavenBundle("org.ow2.asm", "asm-util").version("9.6"),
113+
mavenBundle("org.ow2.asm", "asm-tree").version("9.6"),
114+
mavenBundle("org.ow2.asm", "asm-analysis").version("9.6"),
105115
systemProperty("logback.configurationFile")
106116
.value("file:src/test/resources/logback-test.xml"));
107117
}

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
-->
6666
<tinkerpop.version>3.5.6</tinkerpop.version>
6767
<!-- when changing version also update version in LICENSE_binary -->
68-
<slf4j.version>1.7.26</slf4j.version>
68+
<slf4j.version>2.0.16</slf4j.version>
6969
<!-- when changing version also update version in LICENSE_binary -->
7070
<reactive-streams.version>1.0.3</reactive-streams.version>
7171
<json.version>20230227</json.version>
@@ -78,7 +78,7 @@
7878
<assertj.version>3.19.0</assertj.version>
7979
<commons-exec.version>1.3</commons-exec.version>
8080
<junit.version>4.13.2</junit.version>
81-
<logback.version>1.2.3</logback.version>
81+
<logback.version>1.3.15</logback.version>
8282
<osgi.version>6.0.0</osgi.version>
8383
<felix.version>7.0.1</felix.version>
8484
<pax-exam.version>4.13.4</pax-exam.version>

0 commit comments

Comments
 (0)