Merge pull request #103 from vitruv-tools/remove-slf4j

Remove slf4j and logback classic
vitruv-tools · Jul 2, 2024 · 6f38451 · 6f38451
2 parents 30de001 + 8d3422a
commit 6f38451
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 48 deletions.
diff --git a/...ederivation/src/tools/vitruv/change/changederivation/persistence/DeltaBasedResource.xtend b/...ederivation/src/tools/vitruv/change/changederivation/persistence/DeltaBasedResource.xtend
@@ -1,4 +1,4 @@
-package tools.vitruv.change.changederivation
+package tools.vitruv.change.changederivation.persistence
 
 import java.io.IOException
 import java.io.InputStream
@@ -41,7 +41,7 @@ class DeltaBasedResource extends ResourceImpl {
 	}
 
 	override doSave(OutputStream outputStream, Map<?, ?> options) throws IOException {
-		val deltaChanges = new DefaultStateBasedChangeResolutionStrategy().getChangeSequenceForCreated(this).EChanges;
+		val deltaChanges = new tools.vitruv.change.changederivation.DefaultStateBasedChangeResolutionStrategy().getChangeSequenceForCreated(this).EChanges;
 		val resourceSet = withGlobalFactories(new ResourceSetImpl());
 		val resource = resourceSet.createResource(this.URI);
 		resource.getContents().addAll(deltaChanges)

diff --git a/...tion/src/tools/vitruv/change/changederivation/persistence/DeltaBasedResourceFactory.xtend b/...tion/src/tools/vitruv/change/changederivation/persistence/DeltaBasedResourceFactory.xtend
@@ -1,4 +1,4 @@
-package tools.vitruv.change.changederivation
+package tools.vitruv.change.changederivation.persistence
 
 import org.eclipse.emf.common.util.URI
 import org.eclipse.emf.ecore.resource.Resource

diff --git a/bundles/tools.vitruv.testutils/META-INF/MANIFEST.MF b/bundles/tools.vitruv.testutils/META-INF/MANIFEST.MF
@@ -9,9 +9,6 @@ Import-Package: org.junit.jupiter.api.extension,
  org.junit.jupiter.params.converter,
  org.junit.platform.commons.support
 Require-Bundle: org.apache.log4j,
- org.slf4j.api,
- ch.qos.logback.classic,
- ch.qos.logback.core,
  org.hamcrest.core,
  org.eclipse.core.resources,
  org.eclipse.core.runtime,

diff --git a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/TestLogging.xtend b/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/TestLogging.xtend
@@ -1,17 +1,13 @@
 package tools.vitruv.testutils
 
-import ch.qos.logback.classic.Level
-import ch.qos.logback.classic.encoder.PatternLayoutEncoder
 import edu.kit.ipd.sdq.activextendannotations.Lazy
 import org.apache.log4j.ConsoleAppender
 import org.apache.log4j.PatternLayout
 import org.junit.jupiter.api.^extension.BeforeAllCallback
 import org.junit.jupiter.api.^extension.ExtensionContext
-import org.slf4j.LoggerFactory
 
 import static org.apache.log4j.Level.*
 import static org.apache.log4j.Logger.getRootLogger
-import static org.slf4j.Logger.ROOT_LOGGER_NAME
 
 import static extension org.apache.log4j.Logger.getLogger
 import java.util.List
@@ -31,7 +27,6 @@ class TestLogging implements BeforeAllCallback {
 
 	override beforeAll(ExtensionContext context) throws Exception {
 		configureLog4J()
-		configureSlf4J()
 	}
 
 	def private static configureLog4J() {
@@ -41,28 +36,4 @@ class TestLogging implements BeforeAllCallback {
 		VITRUV_LOG_ROOTS.forEach [logger.level = toLevel(desiredLogLevel, WARN)]
 		TestProjectManager.logger.level = INFO
 	}
-
-	def private static configureSlf4J() {
-		val root = LoggerFactory.ILoggerFactory.getLogger(ROOT_LOGGER_NAME)
-			if (root instanceof ch.qos.logback.classic.Logger) {
-				val consoleAppender = new ch.qos.logback.core.ConsoleAppender => [
-					name = "console"
-					context = root.loggerContext
-					encoder = new PatternLayoutEncoder => [
-						context = root.loggerContext
-						pattern = LOG_PATTERN
-						start()
-					]
-					start()
-				]
-				root.detachAndStopAllAppenders()
-				root.level = Level.toLevel(desiredLogLevel, Level.ERROR)
-				root.addAppender(consoleAppender)
-				// there are currently (2021-02-12) no Vitruv loggers, but let's set this up anyway to be prepared
-				VITRUV_LOG_ROOTS.forEach [
-					(LoggerFactory.ILoggerFactory.getLogger(it) as ch.qos.logback.classic.Logger)
-						.level = Level.toLevel(desiredLogLevel, Level.WARN)
-				]
-			}
-	}
 }
diff --git a/features/tools.vitruv.testutils.feature/feature.xml b/features/tools.vitruv.testutils.feature/feature.xml
@@ -21,9 +21,6 @@
 
    <requires>
       <import plugin="org.apache.log4j"/>
-      <import plugin="slf4j.api"/>
-      <import plugin="ch.qos.logback.classic"/>
-      <import plugin="ch.qos.logback.core"/>
       <import plugin="org.junit.jupiter.api"/>
       <import plugin="org.junit.jupiter.params"/>
       <import plugin="org.junit.platform.commons"/>

diff --git a/pom.xml b/pom.xml
@@ -12,15 +12,6 @@
 	<artifactId>tools.vitruv</artifactId>
 	<packaging>pom</packaging>
 
-	<dependencies>
-		<!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-api -->
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
-			<version>2.0.13</version>
-		</dependency>
-	</dependencies>
-
 	<modules>
 		<module>releng/tools.vitruv.change.workflow</module>
 		<module>bundles</module>

diff --git a/tests/tools.vitruv.change.atomic.tests/META-INF/MANIFEST.MF b/tests/tools.vitruv.change.atomic.tests/META-INF/MANIFEST.MF
@@ -16,4 +16,6 @@ Import-Package: org.junit.jupiter.api,
 Require-Bundle: org.eclipse.xtend.lib,
  org.hamcrest.core,
  tools.vitruv.testutils,
- tools.vitruv.testutils.metamodels
+ tools.vitruv.testutils.metamodels,
+ edu.kit.ipd.sdq.commons.util.java,
+ edu.kit.ipd.sdq.commons.util.emf