fix: remove SLF4j-Monitor bridge (#3463)

* refactor: make SLF4j-Monitor bridge opt-in Signed-off-by: Masatake Iwasaki <[email protected]> * remove SLF4J-Monitor bridge. * regenerated DEPENDENCIES Signed-off-by: Masatake Iwasaki <[email protected]> * reverted making MockMonitorExtensin testFixtures. * additional DEPENDENCIES chages detected. * removed obsolete dependency version definition. Signed-off-by: Masatake Iwasaki <[email protected]> --------- Signed-off-by: Masatake Iwasaki <[email protected]>
eclipse-edc · Sep 22, 2023 · f981237 · f981237
1 parent 258a311
commit f981237
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 166 deletions.
diff --git a/DEPENDENCIES b/DEPENDENCIES
@@ -163,8 +163,8 @@ maven/mavencentral/jakarta.inject/jakarta.inject-api/2.0.1, Apache-2.0, approved
 maven/mavencentral/jakarta.json/jakarta.json-api/2.1.1, EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0, approved, #7907
 maven/mavencentral/jakarta.transaction/jakarta.transaction-api/2.0.0, EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0, approved, #7697
 maven/mavencentral/jakarta.transaction/jakarta.transaction-api/2.0.1, EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0, approved, #7697
-maven/mavencentral/jakarta.validation/jakarta.validation-api/2.0.2, Apache-2.0, approved, clearlydefined
-maven/mavencentral/jakarta.validation/jakarta.validation-api/3.0.2, Apache-2.0, approved, clearlydefined
+maven/mavencentral/jakarta.validation/jakarta.validation-api/2.0.2, Apache-2.0, approved, ee4j.validation
+maven/mavencentral/jakarta.validation/jakarta.validation-api/3.0.2, Apache-2.0, approved, ee4j.validation
 maven/mavencentral/jakarta.ws.rs/jakarta.ws.rs-api/3.1.0, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.rest
 maven/mavencentral/jakarta.xml.bind/jakarta.xml.bind-api/2.3.2, BSD-3-Clause, approved, ee4j.jaxb
 maven/mavencentral/jakarta.xml.bind/jakarta.xml.bind-api/3.0.0, BSD-3-Clause, approved, ee4j.jaxb
@@ -313,7 +313,6 @@ maven/mavencentral/org.slf4j/slf4j-api/1.7.35, MIT, approved, CQ13368
 maven/mavencentral/org.slf4j/slf4j-api/1.7.36, MIT, approved, CQ13368
 maven/mavencentral/org.slf4j/slf4j-api/2.0.5, MIT, approved, #5915
 maven/mavencentral/org.slf4j/slf4j-api/2.0.6, MIT, approved, #5915
-maven/mavencentral/org.slf4j/slf4j-api/2.0.9, MIT, approved, #5915
 maven/mavencentral/org.testcontainers/database-commons/1.19.0, Apache-2.0, approved, #10345
 maven/mavencentral/org.testcontainers/jdbc/1.19.0, Apache-2.0, approved, #10348
 maven/mavencentral/org.testcontainers/junit-jupiter/1.19.0, MIT, approved, #10344

diff --git a/core/common/boot/build.gradle.kts b/core/common/boot/build.gradle.kts
@@ -19,7 +19,6 @@ plugins {
 
 dependencies {
     api(project(":spi:common:core-spi"))
-    api(libs.slf4j.api)
 
     implementation(libs.opentelemetry.api)
     testImplementation(libs.junit.jupiter.api)

diff --git a/core/common/boot/src/main/java/org/eclipse/edc/boot/monitor/MonitorProvider.java b/core/common/boot/src/main/java/org/eclipse/edc/boot/monitor/MonitorProvider.java
diff --git a/core/common/boot/src/main/java/org/eclipse/edc/boot/system/runtime/BaseRuntime.java b/core/common/boot/src/main/java/org/eclipse/edc/boot/system/runtime/BaseRuntime.java
@@ -16,7 +16,6 @@
 package org.eclipse.edc.boot.system.runtime;
 
 
-import org.eclipse.edc.boot.monitor.MonitorProvider;
 import org.eclipse.edc.boot.system.DefaultServiceExtensionContext;
 import org.eclipse.edc.boot.system.ExtensionLoader;
 import org.eclipse.edc.boot.system.ServiceLocator;
@@ -94,7 +93,6 @@ protected void bootWithoutShutdownHook() {
     @NotNull
     protected ServiceExtensionContext createServiceExtensionContext() {
         monitor = createMonitor();
-        MonitorProvider.setInstance(monitor);
 
         var context = createContext(monitor);
         initializeContext(context);

diff --git a/core/common/boot/src/main/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider b/core/common/boot/src/main/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -31,7 +31,6 @@ opentelemetry-proto = "1.0.0-alpha"
 postgres = "42.6.0"
 restAssured = "5.3.2"
 rsApi = "3.1.0"
-slf4j = "2.0.9"
 swagger-annotations-jakarta = "2.2.15"
 titanium = "1.3.2"
 kafkaClients = "3.5.1"
@@ -84,7 +83,6 @@ opentelemetry-api = { module = "io.opentelemetry:opentelemetry-api", version.ref
 opentelemetry-instrumentation-annotations = { module = "io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations", version.ref = "opentelemetry" }
 opentelemetry-proto = { module = "io.opentelemetry.proto:opentelemetry-proto", version.ref = "opentelemetry-proto" }
 restAssured = { module = "io.rest-assured:rest-assured", version.ref = "restAssured" }
-slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
 swagger-annotations-jakarta = { module = "io.swagger.core.v3:swagger-annotations-jakarta", version.ref = "swagger-annotations-jakarta" }
 titaniumJsonLd = { module = "com.apicatalog:titanium-json-ld", version.ref = "titanium" }
 testcontainers-vault = { module = "org.testcontainers:vault", version.ref = "testcontainers" }