Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This code was discovered and implemented independently by @lukasz-antoniak . Huge hat tip to him for his contribution here!

systemProperty("logback.configurationFile")
.value("file:src/test/resources/logback-test.xml"));
}
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Have to bump slf4j version as well here in order to address compile errors re: unable to find org.slf4j.spi.LoggingEvent once we moved to logback 1.3.x. Per the discussion here it looks like slf4j 2.x is required for logback 1.3.x.

<!-- when changing version also update version in LICENSE_binary -->
<reactive-streams.version>1.0.3</reactive-streams.version>
<json.version>20230227</json.version>
Expand All @@ -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>
Expand Down