diff --git a/bundles/tools.vitruv.change.changederivation/src/tools/vitruv/change/changederivation/persistence/DeltaBasedResource.xtend b/bundles/tools.vitruv.change.changederivation/src/tools/vitruv/change/changederivation/persistence/DeltaBasedResource.xtend index 09a6313ab..443802f8c 100644 --- a/bundles/tools.vitruv.change.changederivation/src/tools/vitruv/change/changederivation/persistence/DeltaBasedResource.xtend +++ b/bundles/tools.vitruv.change.changederivation/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/bundles/tools.vitruv.change.changederivation/src/tools/vitruv/change/changederivation/persistence/DeltaBasedResourceFactory.xtend b/bundles/tools.vitruv.change.changederivation/src/tools/vitruv/change/changederivation/persistence/DeltaBasedResourceFactory.xtend index 222cf7617..c11c7c93d 100644 --- a/bundles/tools.vitruv.change.changederivation/src/tools/vitruv/change/changederivation/persistence/DeltaBasedResourceFactory.xtend +++ b/bundles/tools.vitruv.change.changederivation/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 index ca72cdd06..cfb13684a 100644 --- 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 index bbeabcc55..4a827fbcc 100644 --- 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 index 129b5f9c9..779c1daed 100644 --- a/features/tools.vitruv.testutils.feature/feature.xml +++ b/features/tools.vitruv.testutils.feature/feature.xml @@ -21,9 +21,6 @@ - - - diff --git a/pom.xml b/pom.xml index f3d6cc714..3faf9ee7e 100644 --- a/pom.xml +++ b/pom.xml @@ -12,15 +12,6 @@ tools.vitruv pom - - - - org.slf4j - slf4j-api - 2.0.13 - - - releng/tools.vitruv.change.workflow bundles diff --git a/tests/tools.vitruv.change.atomic.tests/META-INF/MANIFEST.MF b/tests/tools.vitruv.change.atomic.tests/META-INF/MANIFEST.MF index d82184077..a13a2721a 100644 --- 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