From 51ca8c92ae9f42dee00505abb67fb2e9fba5bdb1 Mon Sep 17 00:00:00 2001
From: Hannes Wellmann <wellmann.hannes1@gmx.net>
Date: Mon, 18 Dec 2023 22:20:51 +0100
Subject: [PATCH] Migrate commons.logging and log4j-1 loggers to SLF4J

Part of https://github.com/eclipse/xtext/issues/3127
---
 NOTICE.md                                     |  12 +-
 .../feature.xml                               |   1 -
 maven/org.eclipse.emf.mwe2.parent/pom.xml     |  12 +-
 .../category.xml                              |   2 -
 ...org.eclipse.emf.mwe2.target.nightly.target |   3 +-
 .../org.eclipse.emf.mwe2.target.target        |   3 +-
 .../META-INF/MANIFEST.MF                      |   2 +-
 plugins/org.eclipse.emf.mwe.core/pom.xml      |   5 -
 .../eclipse/emf/mwe/core/WorkflowEngine.java  |  10 +-
 .../core/container/CompositeComponent.java    |   6 +-
 .../customizer/WorkflowCustomization.java     |   6 +-
 .../core/lib/AbstractWorkflowComponent.java   |   6 +-
 .../eclipse/emf/mwe/core/lib/Mwe2Bridge.java  |   8 +-
 .../core/ast/DeclaredPropertyFileAST.java     |   6 +-
 .../core/ast/parser/WorkflowParser.java       |   6 +-
 .../internal/core/ast/util/VisitorBase.java   |   6 +-
 .../debug/communication/PackageReceiver.java  |   6 +-
 .../debug/communication/PackageSender.java    |   6 +-
 .../processing/RuntimeHandlerManager.java     |   6 +-
 .../org.eclipse.emf.mwe.doc/build-docbook.xml |   1 -
 .../META-INF/MANIFEST.MF                      |   2 +-
 .../emf/mwe/utils/DirectoryCleaner.java       |   6 +-
 .../eclipse/emf/mwe/utils/GenModelHelper.java |   6 +-
 .../emf/mwe/utils/StandaloneSetup.java        |   6 +-
 .../META-INF/MANIFEST.MF                      |   2 +-
 .../ui/internal/LanguageActivator.java        |   5 +-
 .../ui/quickfix/Mwe2QuickfixProvider.java     |   7 +-
 .../language/ui/wizard/NewMwe2FileWizard.java |   5 +-
 .../META-INF/MANIFEST.MF                      |   1 -
 .../META-INF/MANIFEST.MF                      |   2 +-
 plugins/org.eclipse.emf.mwe2.launch/pom.xml   |   5 -
 .../emf/mwe2/launch/runtime/Mwe2Launcher.java |   5 +-
 .../launch/shortcut/Mwe2LaunchDelegate.java   |   7 +-
 .../META-INF/MANIFEST.MF                      |   2 +-
 .../emf/mwe2/ecore/EcoreGenerator.java        |  11 +-
 .../META-INF/MANIFEST.MF                      |   2 +-
 .../emf/mwe2/runtime/workflow/Workflow.java   |   7 +-
 .../META-INF/MANIFEST.MF                      |   8 +-
 .../emf/mwe/tests/util/Bug414169Test.java     |   7 +-
 .../eclipse/emf/mwe/tests/util/LogTester.java | 104 ++++++------------
 ...org.eclipse.emf.mwe2.language.tests.launch |   2 +-
 41 files changed, 130 insertions(+), 185 deletions(-)

diff --git a/NOTICE.md b/NOTICE.md
index 9d735bf37..b8c1ce8a6 100644
--- a/NOTICE.md
+++ b/NOTICE.md
@@ -61,10 +61,6 @@ Apache Commons Line Interface (1.0)
 
 * License: Apache Software License 1.1
 
-Apache Commons Logging Jar (1.1.1)
-
-* License: Apache License, 2.0
-
 asm (6.2)
 
 * License: BSD-3-Clause
@@ -113,17 +109,13 @@ Guice (2.0)
 
 * License: Apache License, 2.0
 
-log4j (1.2.15)
-
-* License: Apache License, 2.0
-
 org.apache.ant (1.6.5)
 
 * License: Apache License, 2.0
 
-Apache Commons Logging (1.3.3)
+Simple Logging Facade for Java (SLF4J) (2.0.15)
 
-* License: Apache License, 2.0
+* License: MIT License
 
 ## Cryptography
 
diff --git a/features/org.eclipse.emf.mwe2.launcher-feature/feature.xml b/features/org.eclipse.emf.mwe2.launcher-feature/feature.xml
index b31689b13..9148c51f0 100644
--- a/features/org.eclipse.emf.mwe2.launcher-feature/feature.xml
+++ b/features/org.eclipse.emf.mwe2.launcher-feature/feature.xml
@@ -40,7 +40,6 @@ SPDX-License-Identifier: EPL-2.0
       <import plugin="org.eclipse.core.runtime"/>
       <import plugin="org.eclipse.osgi"/>
       <import plugin="org.apache.commons.cli" version="1.8.0" match="compatible"/>
-      <import plugin="org.apache.log4j"/>
    </requires>
 
    <plugin
diff --git a/maven/org.eclipse.emf.mwe2.parent/pom.xml b/maven/org.eclipse.emf.mwe2.parent/pom.xml
index 8923d9206..2e7501cf3 100644
--- a/maven/org.eclipse.emf.mwe2.parent/pom.xml
+++ b/maven/org.eclipse.emf.mwe2.parent/pom.xml
@@ -22,7 +22,7 @@
 
 	<properties>
 		<tycho-qualifier>yyyyMMdd-HHmm</tycho-qualifier>
-		
+
 		<tycho-version>2.7.5</tycho-version>
 		<maven.compiler.source>11</maven.compiler.source>
 		<maven.compiler.target>11</maven.compiler.target>
@@ -32,8 +32,6 @@
 		<commons-cli.version>1.8.0</commons-cli.version>
 		<guava.version>33.2.1-jre</guava.version>
 		<google-inject.version>7.0.0</google-inject.version>
-		<log4j.version>1.2.25</log4j.version>
-		<commons-logging.version>1.3.3</commons-logging.version>
 		<cbi-plugins.version>1.3.5</cbi-plugins.version>
 
 		<project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding>
@@ -63,7 +61,7 @@
 			<url>http://www.eclipse.org/legal/epl-2.0</url>
 		</license>
 	</licenses>
-	
+
 	<pluginRepositories>
 		<!-- for eclipse-jarsigner-plugin -->
 		<pluginRepository>
@@ -77,7 +75,7 @@
 			</snapshots>
 		</pluginRepository>
 	</pluginRepositories>
-	
+
 	<build>
 		<sourceDirectory>src</sourceDirectory>
 		<plugins>
@@ -211,7 +209,7 @@
 								<name>model</name>
 								<placement>X</placement>
 							</tag>
-						</tags>	
+						</tags>
 					</configuration>
 				</plugin>
 				<plugin>
@@ -304,7 +302,7 @@
 				<module>../org.eclipse.emf.mwe2.target/org.eclipse.emf.mwe2.target.nightly</module>
 			</modules>
 		</profile>
-		<!-- 
+		<!--
 			Profile 'release' is activated when property BUILD_TYPE is NOT 'N' (nightly).
 			For release builds strict version checking is disabled, since Maven version will be a
 			release version, while OSGi artifacts (MANIFEST.MF, feature.xml) still contain a qualified version.
diff --git a/maven/org.eclipse.emf.mwe2.repository/category.xml b/maven/org.eclipse.emf.mwe2.repository/category.xml
index 5534a1d32..6b3b11d7a 100644
--- a/maven/org.eclipse.emf.mwe2.repository/category.xml
+++ b/maven/org.eclipse.emf.mwe2.repository/category.xml
@@ -12,8 +12,6 @@
    <bundle id="com.google.guava.failureaccess.source" version="1.0.2.qualifier"/>
    <bundle id="org.apache.commons.cli" version="1.8.0"/>
    <bundle id="org.apache.commons.cli.source" version="1.8.0"/>
-   <bundle id="org.apache.commons.commons-logging" version="0.0.0"/>
-   <bundle id="org.apache.commons.commons-logging.source" version="0.0.0"/>
    <category-def name="mwe2lang" label="MWE">
       <description>
          The configuration language used to configure Xtext&apos;s code generator.
diff --git a/maven/org.eclipse.emf.mwe2.target/org.eclipse.emf.mwe2.target.nightly/org.eclipse.emf.mwe2.target.nightly.target b/maven/org.eclipse.emf.mwe2.target/org.eclipse.emf.mwe2.target.nightly/org.eclipse.emf.mwe2.target.nightly.target
index 03f5f0276..34f21c16d 100644
--- a/maven/org.eclipse.emf.mwe2.target/org.eclipse.emf.mwe2.target.nightly/org.eclipse.emf.mwe2.target.nightly.target
+++ b/maven/org.eclipse.emf.mwe2.target/org.eclipse.emf.mwe2.target.nightly/org.eclipse.emf.mwe2.target.nightly.target
@@ -24,12 +24,11 @@
 <repository location="https://download.eclipse.org/cbi/updates/license/"/>
 </location>
 <location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.apache.log4j" version="1.2.25"/>
 <unit id="org.junit" version="0.0.0"/>
 <unit id="org.apache.commons.cli" version="1.8.0"/>
-<unit id="org.apache.commons.commons-logging" version="0.0.0"/>
 <unit id="com.google.guava" version="33.2.1.jre"/>
 <unit id="com.google.guava.failureaccess" version="1.0.2"/>
+<unit id="slf4j.api" version="2.0.13"/>
 <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-09"/>
 </location>
 </locations>
diff --git a/maven/org.eclipse.emf.mwe2.target/org.eclipse.emf.mwe2.target/org.eclipse.emf.mwe2.target.target b/maven/org.eclipse.emf.mwe2.target/org.eclipse.emf.mwe2.target/org.eclipse.emf.mwe2.target.target
index a8195464f..a9b430538 100644
--- a/maven/org.eclipse.emf.mwe2.target/org.eclipse.emf.mwe2.target/org.eclipse.emf.mwe2.target.target
+++ b/maven/org.eclipse.emf.mwe2.target/org.eclipse.emf.mwe2.target/org.eclipse.emf.mwe2.target.target
@@ -25,12 +25,11 @@
 <repository location="https://download.eclipse.org/cbi/updates/license/"/>
 </location>
 <location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.apache.log4j" version="1.2.25"/>
 <unit id="org.junit" version="0.0.0"/>
 <unit id="org.apache.commons.cli" version="1.8.0"/>
-<unit id="org.apache.commons.commons-logging" version="0.0.0"/>
 <unit id="com.google.guava" version="33.2.1.jre"/>
 <unit id="com.google.guava.failureaccess" version="1.0.2"/>
+<unit id="slf4j.api" version="2.0.13"/>
 <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-09"/>
 </location>
 </locations>
diff --git a/plugins/org.eclipse.emf.mwe.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.mwe.core/META-INF/MANIFEST.MF
index 733f86b5c..fa7c6f652 100644
--- a/plugins/org.eclipse.emf.mwe.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.mwe.core/META-INF/MANIFEST.MF
@@ -39,5 +39,5 @@ Export-Package: org.eclipse.emf.mwe.core,
  org.eclipse.emf.mwe.internal.core.util;x-friends:="org.eclipse.emf.mwe.tests"
 Bundle-Activator: org.eclipse.emf.mwe.internal.core.MWEPlugin$Implementation
 Bundle-ActivationPolicy: lazy
-Import-Package: org.apache.commons.logging;version="1.0.4"
+Import-Package: org.slf4j;version="[1.7.0,3.0.0)"
 Automatic-Module-Name: org.eclipse.emf.mwe.core
diff --git a/plugins/org.eclipse.emf.mwe.core/pom.xml b/plugins/org.eclipse.emf.mwe.core/pom.xml
index 32841f693..8e21fc353 100644
--- a/plugins/org.eclipse.emf.mwe.core/pom.xml
+++ b/plugins/org.eclipse.emf.mwe.core/pom.xml
@@ -26,10 +26,5 @@
 			<artifactId>commons-cli</artifactId>
 			<version>${commons-cli.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>commons-logging</groupId>
-			<artifactId>commons-logging</artifactId>
-			<version>${commons-logging.version}</version>
-		</dependency>
 	</dependencies>
 </project>
diff --git a/plugins/org.eclipse.emf.mwe.core/src/org/eclipse/emf/mwe/core/WorkflowEngine.java b/plugins/org.eclipse.emf.mwe.core/src/org/eclipse/emf/mwe/core/WorkflowEngine.java
index 2ed5b109e..8a9b5e185 100644
--- a/plugins/org.eclipse.emf.mwe.core/src/org/eclipse/emf/mwe/core/WorkflowEngine.java
+++ b/plugins/org.eclipse.emf.mwe.core/src/org/eclipse/emf/mwe/core/WorkflowEngine.java
@@ -15,8 +15,6 @@
 import java.util.Map;
 import java.util.jar.Manifest;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.eclipse.emf.common.util.Diagnostic;
 import org.eclipse.emf.mwe.core.issues.Issues;
 import org.eclipse.emf.mwe.core.issues.IssuesImpl;
@@ -26,6 +24,8 @@
 import org.eclipse.emf.mwe.internal.core.Workflow;
 import org.eclipse.emf.mwe.internal.core.ast.util.WorkflowFactory;
 import org.eclipse.emf.mwe.internal.core.ast.util.converter.Converter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 public class WorkflowEngine {
@@ -34,7 +34,7 @@ public class WorkflowEngine {
 
 	private ProgressMonitor monitor;
 
-	private static final Log logger = LogFactory.getLog(WorkflowEngine.class);
+	private static final Logger logger = LoggerFactory.getLogger(WorkflowEngine.class);
 
 	private Map<String, String> params;
 
@@ -113,7 +113,7 @@ public boolean prepare(final String workFlowFile, final ProgressMonitor theMonit
 			}
 		}
 		catch (final ConfigurationException ex) {
-			logger.fatal(ex.getMessage(), ex);
+			logger.error(ex.getMessage(), ex);
 			logIssues(logger, issues);
 			return false;
 		}
@@ -205,7 +205,7 @@ private void addExternalSlotContents(final Map<?, ?> slotContents) {
 		}
 	}
 
-	private void logIssues(final Log logger, final Issues issues) {
+	private void logIssues(final Logger logger, final Issues issues) {
 		// log any configuration warning messages
 		final Diagnostic[] issueArray = issues.getIssues();
 		for (final Diagnostic issue : issueArray) {
diff --git a/plugins/org.eclipse.emf.mwe.core/src/org/eclipse/emf/mwe/core/container/CompositeComponent.java b/plugins/org.eclipse.emf.mwe.core/src/org/eclipse/emf/mwe/core/container/CompositeComponent.java
index 0d9511d33..a94dcc111 100644
--- a/plugins/org.eclipse.emf.mwe.core/src/org/eclipse/emf/mwe/core/container/CompositeComponent.java
+++ b/plugins/org.eclipse.emf.mwe.core/src/org/eclipse/emf/mwe/core/container/CompositeComponent.java
@@ -16,8 +16,6 @@
 import java.util.Collection;
 import java.util.List;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.eclipse.emf.mwe.core.ConfigurationException;
 import org.eclipse.emf.mwe.core.WorkflowComponent;
 import org.eclipse.emf.mwe.core.WorkflowComponentWithID;
@@ -32,6 +30,8 @@
 import org.eclipse.emf.mwe.internal.core.util.ComponentPrinter;
 import org.eclipse.emf.mwe2.runtime.workflow.IWorkflowComponent;
 import org.eclipse.emf.mwe2.runtime.workflow.IWorkflowContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A composite <tt>WorkflowComponent</tt>.
@@ -41,7 +41,7 @@ public class CompositeComponent implements WorkflowComponentWithID, IWorkflowCom
 
 	private static final String COMPONENT_NAME = "Composite component";
 
-	protected static final Log log = LogFactory.getLog(CompositeComponent.class);
+	protected static final Logger log = LoggerFactory.getLogger(CompositeComponent.class);
 
 	private final String name;
 
diff --git a/plugins/org.eclipse.emf.mwe.core/src/org/eclipse/emf/mwe/core/customizer/WorkflowCustomization.java b/plugins/org.eclipse.emf.mwe.core/src/org/eclipse/emf/mwe/core/customizer/WorkflowCustomization.java
index 4c27d8490..95445ce4e 100644
--- a/plugins/org.eclipse.emf.mwe.core/src/org/eclipse/emf/mwe/core/customizer/WorkflowCustomization.java
+++ b/plugins/org.eclipse.emf.mwe.core/src/org/eclipse/emf/mwe/core/customizer/WorkflowCustomization.java
@@ -14,14 +14,14 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class WorkflowCustomization {
 
 	private static Map<String,Class<?>> keywordmapping = new HashMap<String,Class<?>>();
 
-	private static final Log logger = LogFactory.getLog(WorkflowCustomization.class);
+	private static final Logger logger = LoggerFactory.getLogger(WorkflowCustomization.class);
 
 	public static void registerKeywordMapping( String keyword, Class<?> componentClass ) {
 		keywordmapping .put( keyword, componentClass );
diff --git a/plugins/org.eclipse.emf.mwe.core/src/org/eclipse/emf/mwe/core/lib/AbstractWorkflowComponent.java b/plugins/org.eclipse.emf.mwe.core/src/org/eclipse/emf/mwe/core/lib/AbstractWorkflowComponent.java
index d0ae8a093..f5e800e8b 100644
--- a/plugins/org.eclipse.emf.mwe.core/src/org/eclipse/emf/mwe/core/lib/AbstractWorkflowComponent.java
+++ b/plugins/org.eclipse.emf.mwe.core/src/org/eclipse/emf/mwe/core/lib/AbstractWorkflowComponent.java
@@ -11,8 +11,6 @@
  *******************************************************************************/
 package org.eclipse.emf.mwe.core.lib;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.eclipse.emf.mwe.core.WorkflowComponentWithID;
 import org.eclipse.emf.mwe.core.WorkflowContext;
 import org.eclipse.emf.mwe.core.container.CompositeComponent;
@@ -21,6 +19,8 @@
 import org.eclipse.emf.mwe.internal.core.ast.parser.Location;
 import org.eclipse.emf.mwe2.runtime.workflow.IWorkflowComponent;
 import org.eclipse.emf.mwe2.runtime.workflow.IWorkflowContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Base class useful for implementing custom WorkflowComponents.
@@ -28,7 +28,7 @@
  */
 public abstract class AbstractWorkflowComponent implements WorkflowComponentWithID, IWorkflowComponent {
 
-	private static final Log log = LogFactory.getLog(AbstractWorkflowComponent.class);
+	private static final Logger log = LoggerFactory.getLogger(AbstractWorkflowComponent.class);
 
 	/** The component's id */
 	private String componentID;
diff --git a/plugins/org.eclipse.emf.mwe.core/src/org/eclipse/emf/mwe/core/lib/Mwe2Bridge.java b/plugins/org.eclipse.emf.mwe.core/src/org/eclipse/emf/mwe/core/lib/Mwe2Bridge.java
index 25dcd14c7..668e5866e 100644
--- a/plugins/org.eclipse.emf.mwe.core/src/org/eclipse/emf/mwe/core/lib/Mwe2Bridge.java
+++ b/plugins/org.eclipse.emf.mwe.core/src/org/eclipse/emf/mwe/core/lib/Mwe2Bridge.java
@@ -8,22 +8,22 @@
  *******************************************************************************/
 package org.eclipse.emf.mwe.core.lib;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.eclipse.emf.mwe.core.WorkflowComponentWithID;
 import org.eclipse.emf.mwe.core.WorkflowContext;
 import org.eclipse.emf.mwe.core.issues.IssuesImpl;
 import org.eclipse.emf.mwe.core.issues.MWEDiagnostic;
 import org.eclipse.emf.mwe.core.monitor.NullProgressMonitor;
 import org.eclipse.emf.mwe2.runtime.workflow.IWorkflowContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @author Sebastian Zarnekow - Initial contribution and API
  */
 public class Mwe2Bridge {
 
-	private static final Log log = LogFactory.getLog(Mwe2Bridge.class); 
-	
+	private static final Logger log = LoggerFactory.getLogger(Mwe2Bridge.class);
+
 	private final WorkflowComponentWithID delegate;
 
 	public Mwe2Bridge(WorkflowComponentWithID delegate) {
diff --git a/plugins/org.eclipse.emf.mwe.core/src/org/eclipse/emf/mwe/internal/core/ast/DeclaredPropertyFileAST.java b/plugins/org.eclipse.emf.mwe.core/src/org/eclipse/emf/mwe/internal/core/ast/DeclaredPropertyFileAST.java
index 80f52b528..8e4fd7de4 100644
--- a/plugins/org.eclipse.emf.mwe.core/src/org/eclipse/emf/mwe/internal/core/ast/DeclaredPropertyFileAST.java
+++ b/plugins/org.eclipse.emf.mwe.core/src/org/eclipse/emf/mwe/internal/core/ast/DeclaredPropertyFileAST.java
@@ -19,14 +19,14 @@
 import java.util.List;
 import java.util.Properties;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.eclipse.emf.mwe.core.resources.ResourceLoader;
 import org.eclipse.emf.mwe.internal.core.ast.parser.Location;
 import org.eclipse.emf.mwe.internal.core.ast.parser.WorkflowParser;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class DeclaredPropertyFileAST extends AbstractASTBase {
-	private final Log log = LogFactory.getLog(getClass());
+	private static final Logger log = LoggerFactory.getLogger(DeclaredPropertyFileAST.class);
 
 	private String file;
 
diff --git a/plugins/org.eclipse.emf.mwe.core/src/org/eclipse/emf/mwe/internal/core/ast/parser/WorkflowParser.java b/plugins/org.eclipse.emf.mwe.core/src/org/eclipse/emf/mwe/internal/core/ast/parser/WorkflowParser.java
index d3fb994de..a658be1b8 100644
--- a/plugins/org.eclipse.emf.mwe.core/src/org/eclipse/emf/mwe/internal/core/ast/parser/WorkflowParser.java
+++ b/plugins/org.eclipse.emf.mwe.core/src/org/eclipse/emf/mwe/internal/core/ast/parser/WorkflowParser.java
@@ -20,8 +20,6 @@
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.eclipse.emf.mwe.core.issues.Issues;
 import org.eclipse.emf.mwe.internal.core.ast.AbstractASTBase;
 import org.eclipse.emf.mwe.internal.core.ast.ComponentAST;
@@ -30,12 +28,14 @@
 import org.eclipse.emf.mwe.internal.core.ast.InclusionAST;
 import org.eclipse.emf.mwe.internal.core.ast.ReferenceAST;
 import org.eclipse.emf.mwe.internal.core.ast.SimpleParamAST;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.xml.sax.Attributes;
 import org.xml.sax.Locator;
 import org.xml.sax.helpers.DefaultHandler;
 
 public class WorkflowParser extends DefaultHandler {
-	private static final Log log = LogFactory.getLog(WorkflowParser.class);
+	private static final Logger log = LoggerFactory.getLogger(WorkflowParser.class);
 
 	// reserved element names
 	public final static String PROPERTY = "property";
diff --git a/plugins/org.eclipse.emf.mwe.core/src/org/eclipse/emf/mwe/internal/core/ast/util/VisitorBase.java b/plugins/org.eclipse.emf.mwe.core/src/org/eclipse/emf/mwe/internal/core/ast/util/VisitorBase.java
index 4a9e5f70e..94b786e45 100644
--- a/plugins/org.eclipse.emf.mwe.core/src/org/eclipse/emf/mwe/internal/core/ast/util/VisitorBase.java
+++ b/plugins/org.eclipse.emf.mwe.core/src/org/eclipse/emf/mwe/internal/core/ast/util/VisitorBase.java
@@ -11,8 +11,6 @@
  *******************************************************************************/
 package org.eclipse.emf.mwe.internal.core.ast.util;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.eclipse.emf.mwe.core.resources.ResourceLoader;
 import org.eclipse.emf.mwe.core.resources.ResourceLoaderFactory;
 import org.eclipse.emf.mwe.internal.core.ast.AbstractASTBase;
@@ -22,10 +20,12 @@
 import org.eclipse.emf.mwe.internal.core.ast.InclusionAST;
 import org.eclipse.emf.mwe.internal.core.ast.ReferenceAST;
 import org.eclipse.emf.mwe.internal.core.ast.SimpleParamAST;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public abstract class VisitorBase {
 
-	protected Log log = LogFactory.getLog(getClass());
+	protected Logger log = LoggerFactory.getLogger(getClass());
 
 	protected ResourceLoader loader = ResourceLoaderFactory.createResourceLoader();
 
diff --git a/plugins/org.eclipse.emf.mwe.core/src/org/eclipse/emf/mwe/internal/core/debug/communication/PackageReceiver.java b/plugins/org.eclipse.emf.mwe.core/src/org/eclipse/emf/mwe/internal/core/debug/communication/PackageReceiver.java
index 500255038..46dc8c164 100644
--- a/plugins/org.eclipse.emf.mwe.core/src/org/eclipse/emf/mwe/internal/core/debug/communication/PackageReceiver.java
+++ b/plugins/org.eclipse.emf.mwe.core/src/org/eclipse/emf/mwe/internal/core/debug/communication/PackageReceiver.java
@@ -15,9 +15,9 @@
 import java.io.InterruptedIOException;
 import java.util.ArrayList;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.eclipse.emf.mwe.internal.core.debug.communication.packages.AbstractPackage;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This Runnable listens for incoming packages asynchroniously and keeps them, until they are required by
@@ -26,7 +26,7 @@
 public class PackageReceiver implements Runnable {
 	private final ArrayList<AbstractPackage> receivedPackages;
 	
-	private static final Log logger = LogFactory.getLog(PackageReceiver.class);
+	private static final Logger logger = LoggerFactory.getLogger(PackageReceiver.class);
 
 	private final Connection connection;
 
diff --git a/plugins/org.eclipse.emf.mwe.core/src/org/eclipse/emf/mwe/internal/core/debug/communication/PackageSender.java b/plugins/org.eclipse.emf.mwe.core/src/org/eclipse/emf/mwe/internal/core/debug/communication/PackageSender.java
index 853920cca..9719e40f1 100644
--- a/plugins/org.eclipse.emf.mwe.core/src/org/eclipse/emf/mwe/internal/core/debug/communication/PackageSender.java
+++ b/plugins/org.eclipse.emf.mwe.core/src/org/eclipse/emf/mwe/internal/core/debug/communication/PackageSender.java
@@ -15,9 +15,9 @@
 import java.io.InterruptedIOException;
 import java.util.ArrayList;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.eclipse.emf.mwe.internal.core.debug.communication.packages.AbstractPackage;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This Runnable sends packages out asynchroniously as they arrive from customers.
@@ -26,7 +26,7 @@ public class PackageSender implements Runnable {
 
 	private final ArrayList<AbstractPackage> outgoingPackages;
 	
-	private static final Log logger = LogFactory.getLog(PackageSender.class);
+	private static final Logger logger = LoggerFactory.getLogger(PackageSender.class);
 
 	private final Connection connection;
 
diff --git a/plugins/org.eclipse.emf.mwe.core/src/org/eclipse/emf/mwe/internal/core/debug/processing/RuntimeHandlerManager.java b/plugins/org.eclipse.emf.mwe.core/src/org/eclipse/emf/mwe/internal/core/debug/processing/RuntimeHandlerManager.java
index 9f5dd0c8a..3c29b076c 100644
--- a/plugins/org.eclipse.emf.mwe.core/src/org/eclipse/emf/mwe/internal/core/debug/processing/RuntimeHandlerManager.java
+++ b/plugins/org.eclipse.emf.mwe.core/src/org/eclipse/emf/mwe/internal/core/debug/processing/RuntimeHandlerManager.java
@@ -14,12 +14,12 @@
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.eclipse.emf.mwe.core.debug.processing.ElementAdapter;
 import org.eclipse.emf.mwe.core.resources.ResourceLoaderFactory;
 import org.eclipse.emf.mwe.internal.core.debug.communication.Connection;
 import org.eclipse.emf.mwe.internal.core.debug.communication.packages.RegisterPackage;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This manager class listens for requests from the debug server to instantiate
@@ -33,7 +33,7 @@ public class RuntimeHandlerManager implements Runnable {
 
 	private final DebugMonitor monitor;
 
-	private static final Log logger = LogFactory.getLog(RuntimeHandlerManager.class);
+	private static final Logger logger = LoggerFactory.getLogger(RuntimeHandlerManager.class);
 
 	// -------------------------------------------------------------------------
 
diff --git a/plugins/org.eclipse.emf.mwe.doc/build-docbook.xml b/plugins/org.eclipse.emf.mwe.doc/build-docbook.xml
index f069cb856..55c1c88fa 100644
--- a/plugins/org.eclipse.emf.mwe.doc/build-docbook.xml
+++ b/plugins/org.eclipse.emf.mwe.doc/build-docbook.xml
@@ -53,7 +53,6 @@
 				<classpath>
 					<pathelement location="${fop.dir}${file.separator}build${file.separator}fop.jar" />
 					<pathelement location="${fop.dir}${file.separator}lib${file.separator}avalon-framework-4.2.0.jar" />
-					<pathelement location="${fop.dir}${file.separator}lib${file.separator}commons-logging-1.3.3.jar" />
 					<pathelement location="${fop.dir}${file.separator}lib${file.separator}commons-io-1.3.1.jar" />
 					<pathelement location="${fop.dir}${file.separator}lib${file.separator}batik-all-1.7.jar" />
 					<pathelement location="${fop.dir}${file.separator}lib${file.separator}xmlgraphics-commons-1.3.1.jar" />
diff --git a/plugins/org.eclipse.emf.mwe.utils/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.mwe.utils/META-INF/MANIFEST.MF
index a5071549b..85f4601a0 100644
--- a/plugins/org.eclipse.emf.mwe.utils/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.mwe.utils/META-INF/MANIFEST.MF
@@ -10,5 +10,5 @@ Require-Bundle: org.eclipse.emf.mwe.core,
 Export-Package: org.eclipse.emf.mwe.utils
 Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: JavaSE-11
-Import-Package: org.apache.commons.logging;version="1.0.4"
+Import-Package: org.slf4j;version="[1.7.0,3.0.0)"
 Automatic-Module-Name: org.eclipse.emf.mwe.utils
diff --git a/plugins/org.eclipse.emf.mwe.utils/src/org/eclipse/emf/mwe/utils/DirectoryCleaner.java b/plugins/org.eclipse.emf.mwe.utils/src/org/eclipse/emf/mwe/utils/DirectoryCleaner.java
index 7e78cd9a4..9d2a4c19b 100644
--- a/plugins/org.eclipse.emf.mwe.utils/src/org/eclipse/emf/mwe/utils/DirectoryCleaner.java
+++ b/plugins/org.eclipse.emf.mwe.utils/src/org/eclipse/emf/mwe/utils/DirectoryCleaner.java
@@ -16,18 +16,18 @@
 import java.util.HashSet;
 import java.util.StringTokenizer;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.eclipse.emf.mwe.core.WorkflowContext;
 import org.eclipse.emf.mwe.core.issues.Issues;
 import org.eclipse.emf.mwe.core.lib.AbstractWorkflowComponent2;
 import org.eclipse.emf.mwe.core.monitor.ProgressMonitor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class DirectoryCleaner extends AbstractWorkflowComponent2 {
 
 	private static final String COMPONENT_NAME = "Directory Cleaner";
 
-	private static final Log LOG = LogFactory.getLog(DirectoryCleaner.class);
+	private static final Logger LOG = LoggerFactory.getLogger(DirectoryCleaner.class);
 
 	private String directory;
 
diff --git a/plugins/org.eclipse.emf.mwe.utils/src/org/eclipse/emf/mwe/utils/GenModelHelper.java b/plugins/org.eclipse.emf.mwe.utils/src/org/eclipse/emf/mwe/utils/GenModelHelper.java
index c5851d37e..1f4b99244 100644
--- a/plugins/org.eclipse.emf.mwe.utils/src/org/eclipse/emf/mwe/utils/GenModelHelper.java
+++ b/plugins/org.eclipse.emf.mwe.utils/src/org/eclipse/emf/mwe/utils/GenModelHelper.java
@@ -13,8 +13,6 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.eclipse.emf.codegen.ecore.genmodel.GenModel;
 import org.eclipse.emf.codegen.ecore.genmodel.GenModelPackage;
 import org.eclipse.emf.codegen.ecore.genmodel.GenPackage;
@@ -26,13 +24,15 @@
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.mwe.core.ConfigurationException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @author Moritz Eysholdt
  */
 public class GenModelHelper {
 
-	private Log log = LogFactory.getLog(getClass());
+	private static final Logger log = LoggerFactory.getLogger(GenModelHelper.class);
 
 	static {
 		EcorePackage.eINSTANCE.getEFactoryInstance();
diff --git a/plugins/org.eclipse.emf.mwe.utils/src/org/eclipse/emf/mwe/utils/StandaloneSetup.java b/plugins/org.eclipse.emf.mwe.utils/src/org/eclipse/emf/mwe/utils/StandaloneSetup.java
index 06e148298..e671049ca 100644
--- a/plugins/org.eclipse.emf.mwe.utils/src/org/eclipse/emf/mwe/utils/StandaloneSetup.java
+++ b/plugins/org.eclipse.emf.mwe.utils/src/org/eclipse/emf/mwe/utils/StandaloneSetup.java
@@ -35,8 +35,6 @@
 
 import javax.xml.parsers.DocumentBuilderFactory;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.eclipse.emf.common.util.TreeIterator;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EObject;
@@ -51,6 +49,8 @@
 import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
 import org.eclipse.emf.mwe.core.ConfigurationException;
 import org.eclipse.emf.mwe.core.resources.ResourceLoaderFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 
 /**
@@ -104,7 +104,7 @@ public static String getPlatformRootPath() {
 		return platformRootPath;
 	}
 
-	private Log log = LogFactory.getLog(getClass());
+	private static final Logger log = LoggerFactory.getLogger(StandaloneSetup.class);
 	static {
 		Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put(Resource.Factory.Registry.DEFAULT_EXTENSION,
 				new XMIResourceFactoryImpl());
diff --git a/plugins/org.eclipse.emf.mwe2.language.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.mwe2.language.ui/META-INF/MANIFEST.MF
index 2897936db..205c7ad13 100644
--- a/plugins/org.eclipse.emf.mwe2.language.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.mwe2.language.ui/META-INF/MANIFEST.MF
@@ -23,7 +23,7 @@ Require-Bundle: org.eclipse.emf.mwe2.language;visibility:=reexport,
  com.google.guava;bundle-version="[33.2.1,34.0.0)",
  org.eclipse.emf.mwe2.runtime,
  org.eclipse.emf.mwe2.language.ide
-Import-Package: org.apache.log4j;version="1.2.24"
+Import-Package: org.slf4j;version="[1.7.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-Activator: org.eclipse.emf.mwe2.language.ui.internal.Mwe2Activator
 Export-Package: org.eclipse.emf.mwe2.language.ui,
diff --git a/plugins/org.eclipse.emf.mwe2.language.ui/src-gen/org/eclipse/emf/mwe2/language/ui/internal/LanguageActivator.java b/plugins/org.eclipse.emf.mwe2.language.ui/src-gen/org/eclipse/emf/mwe2/language/ui/internal/LanguageActivator.java
index 8cfe3dbc4..a5aa8fc83 100644
--- a/plugins/org.eclipse.emf.mwe2.language.ui/src-gen/org/eclipse/emf/mwe2/language/ui/internal/LanguageActivator.java
+++ b/plugins/org.eclipse.emf.mwe2.language.ui/src-gen/org/eclipse/emf/mwe2/language/ui/internal/LanguageActivator.java
@@ -13,13 +13,14 @@
 import com.google.inject.Injector;
 import java.util.Collections;
 import java.util.Map;
-import org.apache.log4j.Logger;
 import org.eclipse.emf.mwe2.language.Mwe2RuntimeModule;
 import org.eclipse.emf.mwe2.language.ui.Mwe2UiModule;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.eclipse.xtext.ui.shared.SharedStateModule;
 import org.eclipse.xtext.util.Modules2;
 import org.osgi.framework.BundleContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This class was generated. Customizations should only happen in a newly
@@ -30,7 +31,7 @@ public class LanguageActivator extends AbstractUIPlugin {
 	public static final String PLUGIN_ID = "org.eclipse.emf.mwe2.language.ui";
 	public static final String ORG_ECLIPSE_EMF_MWE2_LANGUAGE_MWE2 = "org.eclipse.emf.mwe2.language.Mwe2";
 	
-	private static final Logger logger = Logger.getLogger(LanguageActivator.class);
+	private static final Logger logger = LoggerFactory.getLogger(LanguageActivator.class);
 	
 	private static LanguageActivator INSTANCE;
 	
diff --git a/plugins/org.eclipse.emf.mwe2.language.ui/src/org/eclipse/emf/mwe2/language/ui/quickfix/Mwe2QuickfixProvider.java b/plugins/org.eclipse.emf.mwe2.language.ui/src/org/eclipse/emf/mwe2/language/ui/quickfix/Mwe2QuickfixProvider.java
index c0879f0ce..73a2f395a 100644
--- a/plugins/org.eclipse.emf.mwe2.language.ui/src/org/eclipse/emf/mwe2/language/ui/quickfix/Mwe2QuickfixProvider.java
+++ b/plugins/org.eclipse.emf.mwe2.language.ui/src/org/eclipse/emf/mwe2/language/ui/quickfix/Mwe2QuickfixProvider.java
@@ -10,7 +10,6 @@
 
 import java.util.List;
 
-import org.apache.log4j.Logger;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IWorkspace;
@@ -58,13 +57,15 @@
 import org.eclipse.xtext.ui.editor.quickfix.Fix;
 import org.eclipse.xtext.ui.editor.quickfix.IssueResolutionAcceptor;
 import org.eclipse.xtext.validation.Issue;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.google.inject.Inject;
 
 public class Mwe2QuickfixProvider extends DefaultQuickfixProvider {
 
-	private static final Logger logger = Logger.getLogger(Mwe2QuickfixProvider.class);
-	
+	private static final Logger logger = LoggerFactory.getLogger(Mwe2QuickfixProvider.class);
+
 	@Inject(optional=true)
 	private IWorkbench workbench;
 	
diff --git a/plugins/org.eclipse.emf.mwe2.language.ui/src/org/eclipse/emf/mwe2/language/ui/wizard/NewMwe2FileWizard.java b/plugins/org.eclipse.emf.mwe2.language.ui/src/org/eclipse/emf/mwe2/language/ui/wizard/NewMwe2FileWizard.java
index 1d9b9c5a3..e9cd0b5ea 100644
--- a/plugins/org.eclipse.emf.mwe2.language.ui/src/org/eclipse/emf/mwe2/language/ui/wizard/NewMwe2FileWizard.java
+++ b/plugins/org.eclipse.emf.mwe2.language.ui/src/org/eclipse/emf/mwe2/language/ui/wizard/NewMwe2FileWizard.java
@@ -10,7 +10,6 @@
 
 import java.io.InputStream;
 
-import org.apache.log4j.Logger;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IWorkspace;
@@ -30,6 +29,8 @@
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.eclipse.ui.wizards.newresource.BasicNewResourceWizard;
 import org.eclipse.xtext.util.StringInputStream;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.google.inject.Inject;
 import com.google.inject.name.Named;
@@ -43,7 +44,7 @@ public class NewMwe2FileWizard extends BasicNewResourceWizard {
 
 	private WizardNewFileCreationPage mainPage;
 
-	private static final Logger logger = Logger.getLogger(NewMwe2FileWizard.class);
+	private static final Logger logger = LoggerFactory.getLogger(NewMwe2FileWizard.class);
 
 	@Inject
 	@Named("file.extensions")
diff --git a/plugins/org.eclipse.emf.mwe2.language/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.mwe2.language/META-INF/MANIFEST.MF
index 668cc190a..c0847ec2e 100644
--- a/plugins/org.eclipse.emf.mwe2.language/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.mwe2.language/META-INF/MANIFEST.MF
@@ -16,7 +16,6 @@ Require-Bundle: org.eclipse.emf.ecore,
  org.eclipse.xtext.util,
  org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
  org.eclipse.xtext.xbase.lib;bundle-version="2.34.0"
-Import-Package: org.apache.log4j;version="1.2.24"
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: org.eclipse.emf.mwe2.language,
  org.eclipse.emf.mwe2.language.factory,
diff --git a/plugins/org.eclipse.emf.mwe2.launch/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.mwe2.launch/META-INF/MANIFEST.MF
index 2910f2208..1a7b0a094 100644
--- a/plugins/org.eclipse.emf.mwe2.launch/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.mwe2.launch/META-INF/MANIFEST.MF
@@ -17,5 +17,5 @@ Require-Bundle: org.eclipse.emf.mwe2.language;visibility:=reexport,
  org.eclipse.core.runtime;bundle-version="3.24.100";resolution:=optional;x-installation:=greedy,
  org.eclipse.jdt.core;bundle-version="3.29.0";resolution:=optional;x-installation:=greedy
 Export-Package: org.eclipse.emf.mwe2.launch.runtime
-Import-Package: org.apache.log4j;version="1.2.24"
+Import-Package: org.slf4j;version="[1.7.0,3.0.0)"
 Automatic-Module-Name: org.eclipse.emf.mwe2.launch
diff --git a/plugins/org.eclipse.emf.mwe2.launch/pom.xml b/plugins/org.eclipse.emf.mwe2.launch/pom.xml
index ef60fb3c9..983b06726 100644
--- a/plugins/org.eclipse.emf.mwe2.launch/pom.xml
+++ b/plugins/org.eclipse.emf.mwe2.launch/pom.xml
@@ -35,10 +35,5 @@
 			<artifactId>commons-cli</artifactId>
 			<version>${commons-cli.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>ch.qos.reload4j</groupId>
-			<artifactId>reload4j</artifactId>
-			<version>${log4j.version}</version>
-		</dependency>
 	</dependencies>
 </project>
diff --git a/plugins/org.eclipse.emf.mwe2.launch/src/org/eclipse/emf/mwe2/launch/runtime/Mwe2Launcher.java b/plugins/org.eclipse.emf.mwe2.launch/src/org/eclipse/emf/mwe2/launch/runtime/Mwe2Launcher.java
index f16c83d2e..3744bfcd8 100644
--- a/plugins/org.eclipse.emf.mwe2.launch/src/org/eclipse/emf/mwe2/launch/runtime/Mwe2Launcher.java
+++ b/plugins/org.eclipse.emf.mwe2.launch/src/org/eclipse/emf/mwe2/launch/runtime/Mwe2Launcher.java
@@ -19,17 +19,18 @@
 import org.apache.commons.cli.Option;
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
-import org.apache.log4j.Logger;
 import org.eclipse.core.runtime.OperationCanceledException;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.mwe2.language.Mwe2StandaloneSetup;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.google.inject.Injector;
 
 public class Mwe2Launcher {
 	private static final String PARAM = "p";
 	
-	private static final Logger logger = Logger.getLogger(Mwe2Launcher.class);
+	private static final Logger logger = LoggerFactory.getLogger(Mwe2Launcher.class);
 
 	public static void main(String[] args) {
 		try {
diff --git a/plugins/org.eclipse.emf.mwe2.launch/src/org/eclipse/emf/mwe2/launch/shortcut/Mwe2LaunchDelegate.java b/plugins/org.eclipse.emf.mwe2.launch/src/org/eclipse/emf/mwe2/launch/shortcut/Mwe2LaunchDelegate.java
index c9967268f..713d5eea0 100644
--- a/plugins/org.eclipse.emf.mwe2.launch/src/org/eclipse/emf/mwe2/launch/shortcut/Mwe2LaunchDelegate.java
+++ b/plugins/org.eclipse.emf.mwe2.launch/src/org/eclipse/emf/mwe2/launch/shortcut/Mwe2LaunchDelegate.java
@@ -8,7 +8,6 @@
  *******************************************************************************/
 package org.eclipse.emf.mwe2.launch.shortcut;
 
-import org.apache.log4j.Logger;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
@@ -22,11 +21,13 @@
 import org.eclipse.debug.core.RefreshUtil;
 import org.eclipse.debug.core.model.IProcess;
 import org.eclipse.jdt.launching.JavaLaunchDelegate;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class Mwe2LaunchDelegate extends JavaLaunchDelegate {
 
-	private static final Logger logger = Logger.getLogger(Mwe2LaunchDelegate.class);
-	private static final String ATTR_REFRESH_SCOPE =  DebugPlugin.getUniqueIdentifier() + ".ATTR_REFRESH_SCOPE"; //$NON-NLS-1$
+	private static final Logger logger = LoggerFactory.getLogger(Mwe2LaunchDelegate.class);
+	private static final String ATTR_REFRESH_SCOPE = DebugPlugin.getUniqueIdentifier() + ".ATTR_REFRESH_SCOPE"; //$NON-NLS-1$
 
 	@Override
 	public void launch(final ILaunchConfiguration configuration, String mode,
diff --git a/plugins/org.eclipse.emf.mwe2.lib/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.mwe2.lib/META-INF/MANIFEST.MF
index c28315625..90bbda264 100644
--- a/plugins/org.eclipse.emf.mwe2.lib/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.mwe2.lib/META-INF/MANIFEST.MF
@@ -11,5 +11,5 @@ Require-Bundle: org.eclipse.emf.mwe2.runtime,
 Export-Package: org.eclipse.emf.mwe2.ecore,
  org.eclipse.emf.mwe2.util
 Import-Package: com.google.common.base;version="[33.2.1,34.0.0)",
- org.apache.log4j;version="1.2.24"
+ org.slf4j;version="[1.7.0,3.0.0)"
 Automatic-Module-Name: org.eclipse.emf.mwe2.lib
diff --git a/plugins/org.eclipse.emf.mwe2.lib/src/org/eclipse/emf/mwe2/ecore/EcoreGenerator.java b/plugins/org.eclipse.emf.mwe2.lib/src/org/eclipse/emf/mwe2/ecore/EcoreGenerator.java
index 5abce9f29..f582fc769 100644
--- a/plugins/org.eclipse.emf.mwe2.lib/src/org/eclipse/emf/mwe2/ecore/EcoreGenerator.java
+++ b/plugins/org.eclipse.emf.mwe2.lib/src/org/eclipse/emf/mwe2/ecore/EcoreGenerator.java
@@ -13,7 +13,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.log4j.Logger;
 import org.eclipse.emf.codegen.ecore.generator.Generator;
 import org.eclipse.emf.codegen.ecore.generator.GeneratorAdapterFactory;
 import org.eclipse.emf.codegen.ecore.genmodel.GenBase;
@@ -37,12 +36,14 @@
 import org.eclipse.emf.mwe2.runtime.Mandatory;
 import org.eclipse.emf.mwe2.runtime.workflow.IWorkflowComponent;
 import org.eclipse.emf.mwe2.runtime.workflow.IWorkflowContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.google.common.base.Function;
 
 public class EcoreGenerator implements IWorkflowComponent {
 
-	private static Logger log = Logger.getLogger(EcoreGenerator.class);
+	private static Logger log = LoggerFactory.getLogger(EcoreGenerator.class);
 	static {
 		EcorePackage.eINSTANCE.getEFactoryInstance();
 		GenModelPackage.eINSTANCE.getEFactoryInstance();
@@ -147,21 +148,21 @@ public boolean canMerge() {
 					new BasicMonitor());
 
 			if (diagnostic.getSeverity() != Diagnostic.OK)
-				log.info(diagnostic);
+				log.info("{}", diagnostic);
 		}
 
 		if (generateEdit) {
 			Diagnostic editDiag = generator.generate(genModel, GenBaseGeneratorAdapter.EDIT_PROJECT_TYPE,
 					new BasicMonitor());
 			if (editDiag.getSeverity() != Diagnostic.OK)
-				log.info(editDiag);
+				log.info("{}", editDiag);
 		}
 
 		if (generateEditor) {
 			Diagnostic editorDiag = generator.generate(genModel, GenBaseGeneratorAdapter.EDITOR_PROJECT_TYPE,
 					new BasicMonitor());
 			if (editorDiag.getSeverity() != Diagnostic.OK)
-				log.info(editorDiag);
+				log.info("{}", editorDiag);
 		}
 	}
 
diff --git a/plugins/org.eclipse.emf.mwe2.runtime/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.mwe2.runtime/META-INF/MANIFEST.MF
index 8af91a5f2..96ce744a1 100644
--- a/plugins/org.eclipse.emf.mwe2.runtime/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.mwe2.runtime/META-INF/MANIFEST.MF
@@ -7,6 +7,6 @@ Bundle-Vendor: Eclipse Xtext
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: org.eclipse.emf.mwe2.runtime,
  org.eclipse.emf.mwe2.runtime.workflow
-Import-Package: org.apache.log4j;version="1.2.24"
+Import-Package: org.slf4j;version="[1.7.0,3.0.0)"
 Require-Bundle: com.google.inject;bundle-version="7.0.0"
 Automatic-Module-Name: org.eclipse.emf.mwe2.runtime
diff --git a/plugins/org.eclipse.emf.mwe2.runtime/src/org/eclipse/emf/mwe2/runtime/workflow/Workflow.java b/plugins/org.eclipse.emf.mwe2.runtime/src/org/eclipse/emf/mwe2/runtime/workflow/Workflow.java
index e6d45ae71..a0e05d807 100644
--- a/plugins/org.eclipse.emf.mwe2.runtime/src/org/eclipse/emf/mwe2/runtime/workflow/Workflow.java
+++ b/plugins/org.eclipse.emf.mwe2.runtime/src/org/eclipse/emf/mwe2/runtime/workflow/Workflow.java
@@ -9,12 +9,13 @@
  *******************************************************************************/
 package org.eclipse.emf.mwe2.runtime.workflow;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class Workflow extends AbstractCompositeWorkflowComponent implements IWorkflow {
 
-	private static final Logger logger = Logger.getLogger(Workflow.class); 
-	
+	private static final Logger logger = LoggerFactory.getLogger(Workflow.class);
+
 	@Override
 	public void run(IWorkflowContext context) {
 		this.preInvoke();
diff --git a/tests/org.eclipse.emf.mwe.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.mwe.tests/META-INF/MANIFEST.MF
index b094f1007..4401e12ca 100644
--- a/tests/org.eclipse.emf.mwe.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.mwe.tests/META-INF/MANIFEST.MF
@@ -13,12 +13,14 @@ Require-Bundle: org.apache.ant,
  org.eclipse.ant.core,
  org.eclipse.core.runtime
 Bundle-RequiredExecutionEnvironment: JavaSE-11
-Import-Package: org.apache.commons.logging,
- org.hamcrest.core,
+Import-Package: org.hamcrest.core,
  org.junit;version="4.12.0",
  org.junit.runner;version="4.12.0",
  org.junit.runner.manipulation;version="4.12.0",
  org.junit.runner.notification;version="4.12.0",
  org.junit.runners;version="4.12.0",
- org.junit.runners.model;version="4.12.0"
+ org.junit.runners.model;version="4.12.0",
+ org.slf4j;version="1.7.0",
+ org.slf4j.event;version="[2.0.0,3.0.0)",
+ org.slf4j.helpers;version="[2.0.0,3.0.0)"
 Automatic-Module-Name: org.eclipse.emf.mwe.tests
diff --git a/tests/org.eclipse.emf.mwe.tests/src/org/eclipse/emf/mwe/tests/util/Bug414169Test.java b/tests/org.eclipse.emf.mwe.tests/src/org/eclipse/emf/mwe/tests/util/Bug414169Test.java
index c085e72f7..1c45dfe5b 100644
--- a/tests/org.eclipse.emf.mwe.tests/src/org/eclipse/emf/mwe/tests/util/Bug414169Test.java
+++ b/tests/org.eclipse.emf.mwe.tests/src/org/eclipse/emf/mwe/tests/util/Bug414169Test.java
@@ -10,6 +10,7 @@
 
 import java.io.File;
 import java.util.ArrayList;
+import java.util.List;
 
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
@@ -32,13 +33,13 @@ public class Bug414169Test extends Assert {
 		File file = new File("./testfiles/bug414169");
 		standaloneSetup.setPlatformUri(file.getCanonicalPath());
 		System.out.println("Infos:");
-		System.out.println(dump(logTester.infos));
+		System.out.println(dump(logTester.getInfos()));
 		System.out.println("Warnings:");
-		System.out.println(dump(logTester.warnings));
+		System.out.println(dump(logTester.getWarnings()));
 		assertEquals(1, logTester.getWarnings().size());
 	}
 
-	private String dump(ArrayList<String> strings) {
+	private String dump(List<String> strings) {
 		StringBuilder sb = new StringBuilder();
 		for (String string : strings) {
 			sb.append(string);
diff --git a/tests/org.eclipse.emf.mwe.tests/src/org/eclipse/emf/mwe/tests/util/LogTester.java b/tests/org.eclipse.emf.mwe.tests/src/org/eclipse/emf/mwe/tests/util/LogTester.java
index a82e4b1e3..c2781d6ff 100644
--- a/tests/org.eclipse.emf.mwe.tests/src/org/eclipse/emf/mwe/tests/util/LogTester.java
+++ b/tests/org.eclipse.emf.mwe.tests/src/org/eclipse/emf/mwe/tests/util/LogTester.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2015, 2024 itemis AG (http://www.itemis.eu) and others.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
@@ -10,18 +10,22 @@
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
+import java.util.List;
 
-import org.apache.commons.logging.Log;
+import org.slf4j.Logger;
+import org.slf4j.Marker;
+import org.slf4j.event.Level;
+import org.slf4j.helpers.LegacyAbstractLogger;
+
+class LogTester extends LegacyAbstractLogger {
+	private static final long serialVersionUID = 1L;
 
-class LogTester implements Log {
-	
 	public LogTester(Class<?> clazz, Object object){
-		super();
 		setLog(clazz, object);
 	}
 	private void setLog(Class<?> clazz, Object object) {
 		for (Field f : clazz.getDeclaredFields()) {
-			if (f.getType().isAssignableFrom(Log.class))
+			if (f.getType().isAssignableFrom(Logger.class))
 				try {
 					f.setAccessible(true);
 					f.set(object, this);
@@ -30,16 +34,19 @@ private void setLog(Class<?> clazz, Object object) {
 					throw new RuntimeException(e);
 				}
 		}
-		throw new IllegalArgumentException("The class " + clazz.getName() + " does not declare field of type org.apache.commons.logging.Log.");
+		throw new IllegalArgumentException("The class " + clazz.getName() + " does not declare field of type org.slf4j.Logger.");
 	}
-	
-	
-	public ArrayList<String> getWarnings() {
+
+	public List<String> getWarnings() {
 		return warnings;
 	}
 
-	ArrayList<String> warnings = new ArrayList<String>();
-	ArrayList<String> infos = new ArrayList<String>();
+	public List<String> getInfos() {
+		return infos;
+	}
+
+	private final List<String> warnings = new ArrayList<>();
+	private final List<String> infos = new ArrayList<>();
 
 	@Override
 	public boolean isDebugEnabled() {
@@ -51,11 +58,6 @@ public boolean isErrorEnabled() {
 		return true;
 	}
 
-	@Override
-	public boolean isFatalEnabled() {
-		return true;
-	}
-
 	@Override
 	public boolean isInfoEnabled() {
 		return false;
@@ -72,63 +74,23 @@ public boolean isWarnEnabled() {
 	}
 
 	@Override
-	public void trace(Object message) {
-
-	}
-
-	@Override
-	public void trace(Object message, Throwable t) {
-
+	protected String getFullyQualifiedCallerName() {
+		return null;
 	}
 
 	@Override
-	public void debug(Object message) {
-
-	}
-
-	@Override
-	public void debug(Object message, Throwable t) {
-
-	}
-
-	@Override
-	public void info(Object message) {
-		infos.add((String) message);
-	}
-
-	@Override
-	public void info(Object message, Throwable t) {
-
-	}
-
-	@Override
-	public void warn(Object message) {
-		warnings.add((String) message);
-	}
-
-	@Override
-	public void warn(Object message, Throwable t) {
-
-	}
-
-	@Override
-	public void error(Object message) {
-
-	}
-
-	@Override
-	public void error(Object message, Throwable t) {
-
-	}
-
-	@Override
-	public void fatal(Object message) {
-
-	}
-
-	@Override
-	public void fatal(Object message, Throwable t) {
-
+	protected void handleNormalizedLoggingCall(Level level, Marker marker, String messagePattern, Object[] arguments,
+			Throwable throwable) {
+		switch (level) {
+			case INFO:
+				infos.add(messagePattern);
+				break;
+			case WARN:
+				warnings.add(messagePattern);
+				break;
+			default:
+				break;
+		}
 	}
 
 }
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.mwe2.language.tests/org.eclipse.emf.mwe2.language.tests.launch b/tests/org.eclipse.emf.mwe2.language.tests/org.eclipse.emf.mwe2.language.tests.launch
index 5c0bef14a..1409f676c 100644
--- a/tests/org.eclipse.emf.mwe2.language.tests/org.eclipse.emf.mwe2.language.tests.launch
+++ b/tests/org.eclipse.emf.mwe2.language.tests/org.eclipse.emf.mwe2.language.tests.launch
@@ -36,7 +36,7 @@
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.eclipse.platform.ide"/>
 <booleanAttribute key="run_in_ui_thread" value="true"/>
-<stringAttribute key="selected_target_plugins" value="com.google.guava@default:default,com.google.inject@default:default,com.ibm.icu@default:default,com.jcraft.jsch@default:default,com.sun.el@default:default,javax.annotation@default:default,javax.el@default:default,javax.inject@default:default,javax.servlet.jsp@default:default,javax.servlet@default:default,org.antlr.runtime@default:default,org.apache.ant@default:default,org.apache.batik.css@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.commons.cli@default:default,org.apache.commons.codec@default:default,org.apache.commons.jxpath@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.felix.scr@1:true,org.apache.httpcomponents.httpclient@default:default,org.apache.httpcomponents.httpcore@default:default,org.apache.jasper.glassfish@default:default,org.apache.log4j@default:default,org.apache.lucene.analyzers-common@default:default,org.apache.lucene.analyzers-smartcn@default:default,org.apache.lucene.core@default:default,org.apache.lucene.misc@default:default,org.apiguardian@default:default,org.eclipse.ant.core@default:default,org.eclipse.ant.launching@default:default,org.eclipse.ant.ui@default:default,org.eclipse.compare.core@default:default,org.eclipse.compare@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.externaltools@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem.macosx@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.debug.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.annotations@default:default,org.eclipse.e4.core.di.extensions.supplier@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.emf.xpath@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.dialogs@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt.cocoa@default:false,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.httpclient4.ssl@default:false,org.eclipse.ecf.provider.filetransfer.httpclient4@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.emf.ant@default:default,org.eclipse.emf.cheatsheets@default:default,org.eclipse.emf.codegen.ecore.ui@default:default,org.eclipse.emf.codegen.ecore@default:default,org.eclipse.emf.codegen.ui@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.converter@default:default,org.eclipse.emf.databinding.edit@default:default,org.eclipse.emf.databinding@default:default,org.eclipse.emf.doc@default:default,org.eclipse.emf.ecore.change.edit@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.emf.ecore.editor@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.emf.example.installer@default:default,org.eclipse.emf.exporter@default:default,org.eclipse.emf.importer.ecore@default:default,org.eclipse.emf.importer.java@default:default,org.eclipse.emf.importer.rose@default:default,org.eclipse.emf.importer@default:default,org.eclipse.emf.mapping.ecore.editor@default:default,org.eclipse.emf.mapping.ecore2ecore.editor@default:default,org.eclipse.emf.mapping.ecore2ecore@default:default,org.eclipse.emf.mapping.ecore2xml.ui@default:default,org.eclipse.emf.mapping.ecore2xml@default:default,org.eclipse.emf.mapping.ecore@default:default,org.eclipse.emf.mapping.ui@default:default,org.eclipse.emf.mapping@default:default,org.eclipse.emf@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.bidi@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.equinox.launcher.cocoa.macosx.x86_64@default:false,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.directorywatcher@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.extensionlocation@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.equinox.p2.publisher.eclipse@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.reconciler.dropins@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.p2.transport.ecf@default:default,org.eclipse.equinox.p2.ui.importexport@default:default,org.eclipse.equinox.p2.ui.sdk.scheduler@default:default,org.eclipse.equinox.p2.ui.sdk@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.equinox.p2.updatechecker@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.macosx@default:false,org.eclipse.equinox.security.ui@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.help.base@default:default,org.eclipse.help.ui@default:default,org.eclipse.help.webapp@default:default,org.eclipse.help@default:default,org.eclipse.jdt.annotation*1.1.150.v20180322-1206@default:default,org.eclipse.jdt.annotation*2.1.150.v20180322-1206@default:default,org.eclipse.jdt.apt.core@default:default,org.eclipse.jdt.apt.pluggable.core@default:default,org.eclipse.jdt.apt.ui@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.jdt.doc.user@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.jdt.junit4.runtime@default:default,org.eclipse.jdt.junit5.runtime@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.jdt.launching.macosx@default:default,org.eclipse.jdt.launching.ui.macosx@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jdt@default:default,org.eclipse.jetty.continuation@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.jsch.core@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.pde.api.tools.annotations@default:default,org.eclipse.pde.api.tools.ui@default:default,org.eclipse.pde.api.tools@default:default,org.eclipse.pde.build@default:default,org.eclipse.pde.core@default:default,org.eclipse.pde.doc.user@default:default,org.eclipse.pde.ds.annotations@default:default,org.eclipse.pde.ds.core@default:default,org.eclipse.pde.ds.lib@default:default,org.eclipse.pde.ds.ui@default:default,org.eclipse.pde.ds1_2.lib@default:default,org.eclipse.pde.genericeditor.extension@default:default,org.eclipse.pde.junit.runtime@default:default,org.eclipse.pde.launching@default:default,org.eclipse.pde.runtime@default:default,org.eclipse.pde.ua.core@default:default,org.eclipse.pde.ua.ui@default:default,org.eclipse.pde.ui.templates@default:default,org.eclipse.pde.ui@default:default,org.eclipse.pde@default:default,org.eclipse.platform.doc.user@default:default,org.eclipse.platform@default:default,org.eclipse.rcp@default:default,org.eclipse.search@default:default,org.eclipse.swt.cocoa.macosx.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.team.genericeditor.diff.extension@default:default,org.eclipse.team.ui@default:default,org.eclipse.text@default:default,org.eclipse.tools.layout.spy@default:default,org.eclipse.ui.browser@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.cocoa@default:false,org.eclipse.ui.console@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.genericeditor@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.intro.quicklinks@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.monitoring@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.net@default:default,org.eclipse.ui.themes@default:default,org.eclipse.ui.trace@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.update.configurator@default:default,org.eclipse.xpand@default:default,org.eclipse.xtend.lib.macro@default:default,org.eclipse.xtend.lib@default:default,org.eclipse.xtend.typesystem.emf@default:default,org.eclipse.xtend@default:default,org.eclipse.xtext.builder.standalone@default:default,org.eclipse.xtext.builder@default:default,org.eclipse.xtext.common.types.edit@default:default,org.eclipse.xtext.common.types.shared.jdt38@default:false,org.eclipse.xtext.common.types.shared@default:default,org.eclipse.xtext.common.types.ui@default:default,org.eclipse.xtext.common.types@default:default,org.eclipse.xtext.ecore@default:default,org.eclipse.xtext.generator@default:default,org.eclipse.xtext.ide@default:default,org.eclipse.xtext.java@default:default,org.eclipse.xtext.logging@default:false,org.eclipse.xtext.smap@default:default,org.eclipse.xtext.testing@default:default,org.eclipse.xtext.ui.codemining@default:default,org.eclipse.xtext.ui.codetemplates.ide@default:default,org.eclipse.xtext.ui.codetemplates.ui@default:default,org.eclipse.xtext.ui.codetemplates@default:default,org.eclipse.xtext.ui.ecore@default:default,org.eclipse.xtext.ui.shared@default:default,org.eclipse.xtext.ui.testing@default:default,org.eclipse.xtext.ui@default:default,org.eclipse.xtext.util@default:default,org.eclipse.xtext.xbase.ide@default:default,org.eclipse.xtext.xbase.lib@default:default,org.eclipse.xtext.xbase.ui@default:default,org.eclipse.xtext.xbase@default:default,org.eclipse.xtext.xtext.generator@default:default,org.eclipse.xtext.xtext.ide@default:default,org.eclipse.xtext.xtext.wizard@default:default,org.eclipse.xtext@default:default,org.hamcrest.core@default:default,org.junit.jupiter.api@default:default,org.junit.jupiter.engine@default:default,org.junit.jupiter.migrationsupport@default:default,org.junit.jupiter.params@default:default,org.junit.platform.commons@default:default,org.junit.platform.engine@default:default,org.junit.platform.launcher@default:default,org.junit.platform.runner@default:default,org.junit.platform.suite.api@default:default,org.junit.vintage.engine@default:default,org.junit@default:default,org.objectweb.asm*6.0.0.v20180116-1719@default:default,org.objectweb.asm*7.0.0.v20181030-2244@default:default,org.objectweb.asm.tree@default:default,org.opentest4j@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.tukaani.xz@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
+<stringAttribute key="selected_target_plugins" value="com.google.guava@default:default,com.google.inject@default:default,com.ibm.icu@default:default,com.jcraft.jsch@default:default,com.sun.el@default:default,javax.annotation@default:default,javax.el@default:default,javax.inject@default:default,javax.servlet.jsp@default:default,javax.servlet@default:default,org.antlr.runtime@default:default,org.apache.ant@default:default,org.apache.batik.css@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.commons.cli@default:default,org.apache.commons.codec@default:default,org.apache.commons.jxpath@default:default,org.apache.commons.lang@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.felix.scr@1:true,org.apache.httpcomponents.httpclient@default:default,org.apache.httpcomponents.httpcore@default:default,org.apache.jasper.glassfish@default:default,org.apache.lucene.analyzers-common@default:default,org.apache.lucene.analyzers-smartcn@default:default,org.apache.lucene.core@default:default,org.apache.lucene.misc@default:default,org.apiguardian@default:default,org.eclipse.ant.core@default:default,org.eclipse.ant.launching@default:default,org.eclipse.ant.ui@default:default,org.eclipse.compare.core@default:default,org.eclipse.compare@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.externaltools@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem.macosx@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.debug.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.annotations@default:default,org.eclipse.e4.core.di.extensions.supplier@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.emf.xpath@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.dialogs@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt.cocoa@default:false,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.httpclient4.ssl@default:false,org.eclipse.ecf.provider.filetransfer.httpclient4@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.emf.ant@default:default,org.eclipse.emf.cheatsheets@default:default,org.eclipse.emf.codegen.ecore.ui@default:default,org.eclipse.emf.codegen.ecore@default:default,org.eclipse.emf.codegen.ui@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.converter@default:default,org.eclipse.emf.databinding.edit@default:default,org.eclipse.emf.databinding@default:default,org.eclipse.emf.doc@default:default,org.eclipse.emf.ecore.change.edit@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.emf.ecore.editor@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.emf.example.installer@default:default,org.eclipse.emf.exporter@default:default,org.eclipse.emf.importer.ecore@default:default,org.eclipse.emf.importer.java@default:default,org.eclipse.emf.importer.rose@default:default,org.eclipse.emf.importer@default:default,org.eclipse.emf.mapping.ecore.editor@default:default,org.eclipse.emf.mapping.ecore2ecore.editor@default:default,org.eclipse.emf.mapping.ecore2ecore@default:default,org.eclipse.emf.mapping.ecore2xml.ui@default:default,org.eclipse.emf.mapping.ecore2xml@default:default,org.eclipse.emf.mapping.ecore@default:default,org.eclipse.emf.mapping.ui@default:default,org.eclipse.emf.mapping@default:default,org.eclipse.emf@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.bidi@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.equinox.launcher.cocoa.macosx.x86_64@default:false,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.directorywatcher@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.extensionlocation@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.equinox.p2.publisher.eclipse@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.reconciler.dropins@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.p2.transport.ecf@default:default,org.eclipse.equinox.p2.ui.importexport@default:default,org.eclipse.equinox.p2.ui.sdk.scheduler@default:default,org.eclipse.equinox.p2.ui.sdk@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.equinox.p2.updatechecker@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.macosx@default:false,org.eclipse.equinox.security.ui@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.help.base@default:default,org.eclipse.help.ui@default:default,org.eclipse.help.webapp@default:default,org.eclipse.help@default:default,org.eclipse.jdt.annotation*1.1.150.v20180322-1206@default:default,org.eclipse.jdt.annotation*2.1.150.v20180322-1206@default:default,org.eclipse.jdt.apt.core@default:default,org.eclipse.jdt.apt.pluggable.core@default:default,org.eclipse.jdt.apt.ui@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.jdt.doc.user@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.jdt.junit4.runtime@default:default,org.eclipse.jdt.junit5.runtime@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.jdt.launching.macosx@default:default,org.eclipse.jdt.launching.ui.macosx@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jdt@default:default,org.eclipse.jetty.continuation@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.jsch.core@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.pde.api.tools.annotations@default:default,org.eclipse.pde.api.tools.ui@default:default,org.eclipse.pde.api.tools@default:default,org.eclipse.pde.build@default:default,org.eclipse.pde.core@default:default,org.eclipse.pde.doc.user@default:default,org.eclipse.pde.ds.annotations@default:default,org.eclipse.pde.ds.core@default:default,org.eclipse.pde.ds.lib@default:default,org.eclipse.pde.ds.ui@default:default,org.eclipse.pde.ds1_2.lib@default:default,org.eclipse.pde.genericeditor.extension@default:default,org.eclipse.pde.junit.runtime@default:default,org.eclipse.pde.launching@default:default,org.eclipse.pde.runtime@default:default,org.eclipse.pde.ua.core@default:default,org.eclipse.pde.ua.ui@default:default,org.eclipse.pde.ui.templates@default:default,org.eclipse.pde.ui@default:default,org.eclipse.pde@default:default,org.eclipse.platform.doc.user@default:default,org.eclipse.platform@default:default,org.eclipse.rcp@default:default,org.eclipse.search@default:default,org.eclipse.swt.cocoa.macosx.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.team.genericeditor.diff.extension@default:default,org.eclipse.team.ui@default:default,org.eclipse.text@default:default,org.eclipse.tools.layout.spy@default:default,org.eclipse.ui.browser@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.cocoa@default:false,org.eclipse.ui.console@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.genericeditor@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.intro.quicklinks@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.monitoring@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.net@default:default,org.eclipse.ui.themes@default:default,org.eclipse.ui.trace@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.update.configurator@default:default,org.eclipse.xpand@default:default,org.eclipse.xtend.lib.macro@default:default,org.eclipse.xtend.lib@default:default,org.eclipse.xtend.typesystem.emf@default:default,org.eclipse.xtend@default:default,org.eclipse.xtext.builder.standalone@default:default,org.eclipse.xtext.builder@default:default,org.eclipse.xtext.common.types.edit@default:default,org.eclipse.xtext.common.types.shared.jdt38@default:false,org.eclipse.xtext.common.types.shared@default:default,org.eclipse.xtext.common.types.ui@default:default,org.eclipse.xtext.common.types@default:default,org.eclipse.xtext.ecore@default:default,org.eclipse.xtext.generator@default:default,org.eclipse.xtext.ide@default:default,org.eclipse.xtext.java@default:default,org.eclipse.xtext.logging@default:false,org.eclipse.xtext.smap@default:default,org.eclipse.xtext.testing@default:default,org.eclipse.xtext.ui.codemining@default:default,org.eclipse.xtext.ui.codetemplates.ide@default:default,org.eclipse.xtext.ui.codetemplates.ui@default:default,org.eclipse.xtext.ui.codetemplates@default:default,org.eclipse.xtext.ui.ecore@default:default,org.eclipse.xtext.ui.shared@default:default,org.eclipse.xtext.ui.testing@default:default,org.eclipse.xtext.ui@default:default,org.eclipse.xtext.util@default:default,org.eclipse.xtext.xbase.ide@default:default,org.eclipse.xtext.xbase.lib@default:default,org.eclipse.xtext.xbase.ui@default:default,org.eclipse.xtext.xbase@default:default,org.eclipse.xtext.xtext.generator@default:default,org.eclipse.xtext.xtext.ide@default:default,org.eclipse.xtext.xtext.wizard@default:default,org.eclipse.xtext@default:default,org.hamcrest.core@default:default,org.junit.jupiter.api@default:default,org.junit.jupiter.engine@default:default,org.junit.jupiter.migrationsupport@default:default,org.junit.jupiter.params@default:default,org.junit.platform.commons@default:default,org.junit.platform.engine@default:default,org.junit.platform.launcher@default:default,org.junit.platform.runner@default:default,org.junit.platform.suite.api@default:default,org.junit.vintage.engine@default:default,org.junit@default:default,org.objectweb.asm*6.0.0.v20180116-1719@default:default,org.objectweb.asm*7.0.0.v20181030-2244@default:default,org.objectweb.asm.tree@default:default,org.opentest4j@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.tukaani.xz@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
 <stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.mwe.activities@default:default,org.eclipse.emf.mwe.core@default:default,org.eclipse.emf.mwe.doc@default:default,org.eclipse.emf.mwe.tests@default:default,org.eclipse.emf.mwe.ui.simpleEditor@default:default,org.eclipse.emf.mwe.ui@default:default,org.eclipse.emf.mwe.utils@default:default,org.eclipse.emf.mwe2.language.tests@default:default,org.eclipse.emf.mwe2.language.ui@default:default,org.eclipse.emf.mwe2.language@default:default,org.eclipse.emf.mwe2.launch.ui@default:default,org.eclipse.emf.mwe2.launch@default:default,org.eclipse.emf.mwe2.lib@default:default,org.eclipse.emf.mwe2.runtime@default:default"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <booleanAttribute key="tracing" value="false"/>