Switched project settings and manifests to Java 11

To complete the transition to Java 11 as a minimum requirement,
this commit updates all project settings and all MANIFEST.MF
files to refer to the Java 11 JRE System Library and use Java 11
as the compiler setting.

Change-Id: I3dda97ea5f1caa0be1690164a78b7d56c143e516
diff --git a/bundles/org.eclipse.capra.core/.classpath b/bundles/org.eclipse.capra.core/.classpath
index eca7bdb..4a00bec 100644
--- a/bundles/org.eclipse.capra.core/.classpath
+++ b/bundles/org.eclipse.capra.core/.classpath
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/bundles/org.eclipse.capra.core/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.capra.core/.settings/org.eclipse.jdt.core.prefs
index 0c68a61..cd8d089 100644
--- a/bundles/org.eclipse.capra.core/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.capra.core/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,15 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/bundles/org.eclipse.capra.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.capra.core/META-INF/MANIFEST.MF
index 79e1cb1..bf4ead3 100644
--- a/bundles/org.eclipse.capra.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.capra.core/META-INF/MANIFEST.MF
@@ -8,8 +8,9 @@
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
  org.eclipse.core.resources
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.capra.core.adapters,
  org.eclipse.capra.core.handlers,
  org.eclipse.capra.core.helpers
+Automatic-Module-Name: org.eclipse.capra.core
diff --git a/bundles/org.eclipse.capra.documentation/.classpath b/bundles/org.eclipse.capra.documentation/.classpath
index 5fe8405..90b31e3 100644
--- a/bundles/org.eclipse.capra.documentation/.classpath
+++ b/bundles/org.eclipse.capra.documentation/.classpath
@@ -2,7 +2,11 @@
 <classpath>
 	<classpathentry kind="src" path="docu"/>
 	<classpathentry kind="src" path="images"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/bundles/org.eclipse.capra.documentation/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.capra.documentation/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..7adc0fb
--- /dev/null
+++ b/bundles/org.eclipse.capra.documentation/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,10 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/bundles/org.eclipse.capra.documentation/META-INF/MANIFEST.MF b/bundles/org.eclipse.capra.documentation/META-INF/MANIFEST.MF
index d7f14b5..c7ed5b3 100644
--- a/bundles/org.eclipse.capra.documentation/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.capra.documentation/META-INF/MANIFEST.MF
@@ -6,4 +6,5 @@
 Bundle-SymbolicName: org.eclipse.capra.documentation;singleton:=true
 Bundle-Version: 0.8.2.qualifier
 Require-Bundle: org.eclipse.help
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
+Automatic-Module-Name: org.eclipse.capra.documentation
diff --git a/bundles/org.eclipse.capra.generic.artifactmodel/.classpath b/bundles/org.eclipse.capra.generic.artifactmodel/.classpath
index 8dd013a..71ac142 100644
--- a/bundles/org.eclipse.capra.generic.artifactmodel/.classpath
+++ b/bundles/org.eclipse.capra.generic.artifactmodel/.classpath
@@ -2,7 +2,11 @@
 <classpath>
 	<classpathentry kind="src" path="src-gen"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/bundles/org.eclipse.capra.generic.artifactmodel/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.capra.generic.artifactmodel/.settings/org.eclipse.jdt.core.prefs
index 3a21537..f2525a8 100644
--- a/bundles/org.eclipse.capra.generic.artifactmodel/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.capra.generic.artifactmodel/.settings/org.eclipse.jdt.core.prefs
@@ -1,11 +1,14 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/bundles/org.eclipse.capra.generic.artifactmodel/META-INF/MANIFEST.MF b/bundles/org.eclipse.capra.generic.artifactmodel/META-INF/MANIFEST.MF
index 4811ffe..5c630d7 100644
--- a/bundles/org.eclipse.capra.generic.artifactmodel/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.capra.generic.artifactmodel/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@
 Bundle-ClassPath: .
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: org.eclipse.capra.generic.artifactmodel,
  org.eclipse.capra.generic.artifactmodel.impl,
  org.eclipse.capra.generic.artifactmodel.util
@@ -16,3 +16,4 @@
  org.eclipse.emf.ecore.xcore.lib,
  org.eclipse.capra.core
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.capra.generic.artifactmodel
diff --git a/bundles/org.eclipse.capra.generic.artifactmodel/plugin.properties b/bundles/org.eclipse.capra.generic.artifactmodel/plugin.properties
index 2ee9a16..70ee5b2 100644
--- a/bundles/org.eclipse.capra.generic.artifactmodel/plugin.properties
+++ b/bundles/org.eclipse.capra.generic.artifactmodel/plugin.properties
@@ -15,3 +15,5 @@
 

 Bundle-Name = Eclipse Capra Generic Artifact Model

 Bundle-Vendor = Eclipse Capra

+pluginName = Eclipse Capra Generic Artifact Model

+providerName = Eclipse Capra

diff --git a/bundles/org.eclipse.capra.generic.artifactmodel/src-gen/org/eclipse/capra/generic/artifactmodel/ArtifactWrapper.java b/bundles/org.eclipse.capra.generic.artifactmodel/src-gen/org/eclipse/capra/generic/artifactmodel/ArtifactWrapper.java
index 308ab6f..8bc4d74 100644
--- a/bundles/org.eclipse.capra.generic.artifactmodel/src-gen/org/eclipse/capra/generic/artifactmodel/ArtifactWrapper.java
+++ b/bundles/org.eclipse.capra.generic.artifactmodel/src-gen/org/eclipse/capra/generic/artifactmodel/ArtifactWrapper.java
@@ -28,10 +28,6 @@
 	/**
 	 * Returns the value of the '<em><b>Path</b></em>' attribute.
 	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Path</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Path</em>' attribute.
 	 * @see #setPath(String)
@@ -54,10 +50,6 @@
 	/**
 	 * Returns the value of the '<em><b>Uri</b></em>' attribute.
 	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Uri</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Uri</em>' attribute.
 	 * @see #setUri(String)
@@ -80,10 +72,6 @@
 	/**
 	 * Returns the value of the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Name</em>' attribute.
 	 * @see #setName(String)
@@ -106,10 +94,6 @@
 	/**
 	 * Returns the value of the '<em><b>Identifier</b></em>' attribute.
 	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Identifier</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Identifier</em>' attribute.
 	 * @see #setIdentifier(String)
@@ -132,10 +116,6 @@
 	/**
 	 * Returns the value of the '<em><b>Artifact Handler</b></em>' attribute.
 	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Artifact Handler</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Artifact Handler</em>' attribute.
 	 * @see #setArtifactHandler(String)
diff --git a/bundles/org.eclipse.capra.generic.artifactmodel/src-gen/org/eclipse/capra/generic/artifactmodel/ArtifactWrapperContainer.java b/bundles/org.eclipse.capra.generic.artifactmodel/src-gen/org/eclipse/capra/generic/artifactmodel/ArtifactWrapperContainer.java
index 085506d..f47003b 100644
--- a/bundles/org.eclipse.capra.generic.artifactmodel/src-gen/org/eclipse/capra/generic/artifactmodel/ArtifactWrapperContainer.java
+++ b/bundles/org.eclipse.capra.generic.artifactmodel/src-gen/org/eclipse/capra/generic/artifactmodel/ArtifactWrapperContainer.java
@@ -27,10 +27,6 @@
 	 * Returns the value of the '<em><b>Artifacts</b></em>' containment reference list.
 	 * The list contents are of type {@link org.eclipse.capra.generic.artifactmodel.ArtifactWrapper}.
 	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Artifacts</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Artifacts</em>' containment reference list.
 	 * @see org.eclipse.capra.generic.artifactmodel.ArtifactmodelPackage#getArtifactWrapperContainer_Artifacts()
diff --git a/bundles/org.eclipse.capra.generic.artifactmodel/src-gen/org/eclipse/capra/generic/artifactmodel/ArtifactmodelPackage.java b/bundles/org.eclipse.capra.generic.artifactmodel/src-gen/org/eclipse/capra/generic/artifactmodel/ArtifactmodelPackage.java
index 884ec8c..8b01818 100644
--- a/bundles/org.eclipse.capra.generic.artifactmodel/src-gen/org/eclipse/capra/generic/artifactmodel/ArtifactmodelPackage.java
+++ b/bundles/org.eclipse.capra.generic.artifactmodel/src-gen/org/eclipse/capra/generic/artifactmodel/ArtifactmodelPackage.java
@@ -21,7 +21,6 @@
  * <!-- end-user-doc -->
  * @see org.eclipse.capra.generic.artifactmodel.ArtifactmodelFactory
  * @model kind="package"
- *        annotation="http://www.eclipse.org/emf/2002/GenModel basePackage='org.eclipse.capra.generic'"
  * @generated
  */
 public interface ArtifactmodelPackage extends EPackage {
diff --git a/bundles/org.eclipse.capra.generic.artifactmodel/src-gen/org/eclipse/capra/generic/artifactmodel/impl/ArtifactWrapperImpl.java b/bundles/org.eclipse.capra.generic.artifactmodel/src-gen/org/eclipse/capra/generic/artifactmodel/impl/ArtifactWrapperImpl.java
index efb018a..aaf917a 100644
--- a/bundles/org.eclipse.capra.generic.artifactmodel/src-gen/org/eclipse/capra/generic/artifactmodel/impl/ArtifactWrapperImpl.java
+++ b/bundles/org.eclipse.capra.generic.artifactmodel/src-gen/org/eclipse/capra/generic/artifactmodel/impl/ArtifactWrapperImpl.java
@@ -361,7 +361,7 @@
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (path: ");
 		result.append(path);
 		result.append(", uri: ");
diff --git a/bundles/org.eclipse.capra.generic.artifactmodel/src-gen/org/eclipse/capra/generic/artifactmodel/impl/ArtifactmodelPackageImpl.java b/bundles/org.eclipse.capra.generic.artifactmodel/src-gen/org/eclipse/capra/generic/artifactmodel/impl/ArtifactmodelPackageImpl.java
index 4a49a36..d113c11 100644
--- a/bundles/org.eclipse.capra.generic.artifactmodel/src-gen/org/eclipse/capra/generic/artifactmodel/impl/ArtifactmodelPackageImpl.java
+++ b/bundles/org.eclipse.capra.generic.artifactmodel/src-gen/org/eclipse/capra/generic/artifactmodel/impl/ArtifactmodelPackageImpl.java
@@ -64,7 +64,7 @@
 
 	/**
 	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-	 * 
+	 *
 	 * <p>This method is used to initialize {@link ArtifactmodelPackage#eINSTANCE} when that field is accessed.
 	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
 	 * <!-- begin-user-doc -->
@@ -78,7 +78,8 @@
 		if (isInited) return (ArtifactmodelPackage)EPackage.Registry.INSTANCE.getEPackage(ArtifactmodelPackage.eNS_URI);
 
 		// Obtain or create and register package
-		ArtifactmodelPackageImpl theArtifactmodelPackage = (ArtifactmodelPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ArtifactmodelPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ArtifactmodelPackageImpl());
+		Object registeredArtifactmodelPackage = EPackage.Registry.INSTANCE.get(eNS_URI);
+		ArtifactmodelPackageImpl theArtifactmodelPackage = registeredArtifactmodelPackage instanceof ArtifactmodelPackageImpl ? (ArtifactmodelPackageImpl)registeredArtifactmodelPackage : new ArtifactmodelPackageImpl();
 
 		isInited = true;
 
@@ -94,7 +95,6 @@
 		// Mark meta-data to indicate it can't be changed
 		theArtifactmodelPackage.freeze();
 
-  
 		// Update the registry and return the package
 		EPackage.Registry.INSTANCE.put(ArtifactmodelPackage.eNS_URI, theArtifactmodelPackage);
 		return theArtifactmodelPackage;
diff --git a/bundles/org.eclipse.capra.generic.persistence/.classpath b/bundles/org.eclipse.capra.generic.persistence/.classpath
index 22f3064..f0d0c73 100644
--- a/bundles/org.eclipse.capra.generic.persistence/.classpath
+++ b/bundles/org.eclipse.capra.generic.persistence/.classpath
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/bundles/org.eclipse.capra.generic.persistence/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.capra.generic.persistence/.settings/org.eclipse.jdt.core.prefs
index 3a21537..a58ebdc 100644
--- a/bundles/org.eclipse.capra.generic.persistence/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.capra.generic.persistence/.settings/org.eclipse.jdt.core.prefs
@@ -1,11 +1,15 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/bundles/org.eclipse.capra.generic.persistence/META-INF/MANIFEST.MF b/bundles/org.eclipse.capra.generic.persistence/META-INF/MANIFEST.MF
index acdf851..2051273 100644
--- a/bundles/org.eclipse.capra.generic.persistence/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.capra.generic.persistence/META-INF/MANIFEST.MF
@@ -9,5 +9,6 @@
  org.eclipse.core.resources,
  org.eclipse.core.runtime,
  org.eclipse.capra.core
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: org.eclipse.capra.generic.persistance
+Automatic-Module-Name: org.eclipse.capra.generic.persistence
diff --git a/bundles/org.eclipse.capra.generic.priority/.classpath b/bundles/org.eclipse.capra.generic.priority/.classpath
index 2349b05..8146854 100644
--- a/bundles/org.eclipse.capra.generic.priority/.classpath
+++ b/bundles/org.eclipse.capra.generic.priority/.classpath
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
 		<accessrules>
 			<accessrule kind="accessible" pattern="org/eclipse/mylyn/**"/>
diff --git a/bundles/org.eclipse.capra.generic.priority/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.capra.generic.priority/.settings/org.eclipse.jdt.core.prefs
index 3a21537..cd8d089 100644
--- a/bundles/org.eclipse.capra.generic.priority/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.capra.generic.priority/.settings/org.eclipse.jdt.core.prefs
@@ -1,11 +1,15 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/bundles/org.eclipse.capra.generic.priority/META-INF/MANIFEST.MF b/bundles/org.eclipse.capra.generic.priority/META-INF/MANIFEST.MF
index 7f15913..de08cc1 100644
--- a/bundles/org.eclipse.capra.generic.priority/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.capra.generic.priority/META-INF/MANIFEST.MF
@@ -6,5 +6,6 @@
 Bundle-SymbolicName: org.eclipse.capra.generic.priority;singleton:=true
 Bundle-Version: 0.8.2.qualifier
 Require-Bundle: org.eclipse.capra.core
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: org.eclipse.capra.generic.priority
+Automatic-Module-Name: org.eclipse.capra.generic.priority
diff --git a/bundles/org.eclipse.capra.generic.tracemodel/.classpath b/bundles/org.eclipse.capra.generic.tracemodel/.classpath
index 8dd013a..71ac142 100644
--- a/bundles/org.eclipse.capra.generic.tracemodel/.classpath
+++ b/bundles/org.eclipse.capra.generic.tracemodel/.classpath
@@ -2,7 +2,11 @@
 <classpath>
 	<classpathentry kind="src" path="src-gen"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/bundles/org.eclipse.capra.generic.tracemodel/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.capra.generic.tracemodel/.settings/org.eclipse.jdt.core.prefs
index 3a21537..a58ebdc 100644
--- a/bundles/org.eclipse.capra.generic.tracemodel/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.capra.generic.tracemodel/.settings/org.eclipse.jdt.core.prefs
@@ -1,11 +1,15 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/bundles/org.eclipse.capra.generic.tracemodel/META-INF/MANIFEST.MF b/bundles/org.eclipse.capra.generic.tracemodel/META-INF/MANIFEST.MF
index 0c3fbdf..8a59632 100644
--- a/bundles/org.eclipse.capra.generic.tracemodel/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.capra.generic.tracemodel/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@
 Bundle-ClassPath: .
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: org.eclipse.capra.generic.tracemodel,
  org.eclipse.capra.generic.tracemodel.impl,
  org.eclipse.capra.generic.tracemodel.util
diff --git a/bundles/org.eclipse.capra.generic.tracemodel/plugin.properties b/bundles/org.eclipse.capra.generic.tracemodel/plugin.properties
index e1dfcf4..cbb67a2 100644
--- a/bundles/org.eclipse.capra.generic.tracemodel/plugin.properties
+++ b/bundles/org.eclipse.capra.generic.tracemodel/plugin.properties
@@ -15,3 +15,5 @@
 

 Bundle-Name = Eclipse Capra Generic Trace Metamodel

 Bundle-Vendor = Eclipse Capra

+pluginName = Eclipse Capra Generic Trace Metamodel

+providerName = Eclipse Capra

diff --git a/bundles/org.eclipse.capra.generic.tracemodel/src-gen/org/eclipse/capra/generic/tracemodel/impl/GenericTraceModelImpl.java b/bundles/org.eclipse.capra.generic.tracemodel/src-gen/org/eclipse/capra/generic/tracemodel/impl/GenericTraceModelImpl.java
index e1ba120..1a0f155 100644
--- a/bundles/org.eclipse.capra.generic.tracemodel/src-gen/org/eclipse/capra/generic/tracemodel/impl/GenericTraceModelImpl.java
+++ b/bundles/org.eclipse.capra.generic.tracemodel/src-gen/org/eclipse/capra/generic/tracemodel/impl/GenericTraceModelImpl.java
@@ -68,7 +68,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public EList<RelatedTo> getTraces() {
 		if (traces == null) {
 			traces = new EObjectContainmentEList<RelatedTo>(RelatedTo.class, this, TracemodelPackage.GENERIC_TRACE_MODEL__TRACES);
diff --git a/bundles/org.eclipse.capra.generic.tracemodel/src-gen/org/eclipse/capra/generic/tracemodel/impl/RelatedToImpl.java b/bundles/org.eclipse.capra.generic.tracemodel/src-gen/org/eclipse/capra/generic/tracemodel/impl/RelatedToImpl.java
index 4edd117..6b04bce 100644
--- a/bundles/org.eclipse.capra.generic.tracemodel/src-gen/org/eclipse/capra/generic/tracemodel/impl/RelatedToImpl.java
+++ b/bundles/org.eclipse.capra.generic.tracemodel/src-gen/org/eclipse/capra/generic/tracemodel/impl/RelatedToImpl.java
@@ -100,7 +100,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public String getID() {
 		return EcoreUtil.generateUUID();
 	}
@@ -110,7 +109,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public String getName() {
 		return name;
 	}
@@ -120,7 +118,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public void setName(String newName) {
 		String oldName = name;
 		name = newName;
@@ -133,7 +130,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public EList<EObject> getItem() {
 		if (item == null) {
 			item = new EObjectResolvingEList<EObject>(EObject.class, this, TracemodelPackage.RELATED_TO__ITEM);
diff --git a/bundles/org.eclipse.capra.generic.tracemodel/src-gen/org/eclipse/capra/generic/tracemodel/impl/TracemodelFactoryImpl.java b/bundles/org.eclipse.capra.generic.tracemodel/src-gen/org/eclipse/capra/generic/tracemodel/impl/TracemodelFactoryImpl.java
index cd4d5a0..d63f0f7 100644
--- a/bundles/org.eclipse.capra.generic.tracemodel/src-gen/org/eclipse/capra/generic/tracemodel/impl/TracemodelFactoryImpl.java
+++ b/bundles/org.eclipse.capra.generic.tracemodel/src-gen/org/eclipse/capra/generic/tracemodel/impl/TracemodelFactoryImpl.java
@@ -68,7 +68,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public GenericTraceModel createGenericTraceModel() {
 		GenericTraceModelImpl genericTraceModel = new GenericTraceModelImpl();
 		return genericTraceModel;
@@ -79,7 +78,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public RelatedTo createRelatedTo() {
 		RelatedToImpl relatedTo = new RelatedToImpl();
 		return relatedTo;
@@ -90,7 +88,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public TracemodelPackage getTracemodelPackage() {
 		return (TracemodelPackage)getEPackage();
 	}
diff --git a/bundles/org.eclipse.capra.generic.tracemodel/src-gen/org/eclipse/capra/generic/tracemodel/impl/TracemodelPackageImpl.java b/bundles/org.eclipse.capra.generic.tracemodel/src-gen/org/eclipse/capra/generic/tracemodel/impl/TracemodelPackageImpl.java
index fb8c61f..2d76e8f 100644
--- a/bundles/org.eclipse.capra.generic.tracemodel/src-gen/org/eclipse/capra/generic/tracemodel/impl/TracemodelPackageImpl.java
+++ b/bundles/org.eclipse.capra.generic.tracemodel/src-gen/org/eclipse/capra/generic/tracemodel/impl/TracemodelPackageImpl.java
@@ -105,7 +105,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public EClass getGenericTraceModel() {
 		return genericTraceModelEClass;
 	}
@@ -115,7 +114,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public EReference getGenericTraceModel_Traces() {
 		return (EReference)genericTraceModelEClass.getEStructuralFeatures().get(0);
 	}
@@ -125,7 +123,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public EClass getRelatedTo() {
 		return relatedToEClass;
 	}
@@ -135,7 +132,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public EAttribute getRelatedTo_ID() {
 		return (EAttribute)relatedToEClass.getEStructuralFeatures().get(0);
 	}
@@ -145,7 +141,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public EAttribute getRelatedTo_Name() {
 		return (EAttribute)relatedToEClass.getEStructuralFeatures().get(1);
 	}
@@ -155,7 +150,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public EReference getRelatedTo_Item() {
 		return (EReference)relatedToEClass.getEStructuralFeatures().get(2);
 	}
@@ -165,7 +159,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public TracemodelFactory getTracemodelFactory() {
 		return (TracemodelFactory)getEFactoryInstance();
 	}
diff --git a/bundles/org.eclipse.capra.handler.app4mc/.classpath b/bundles/org.eclipse.capra.handler.app4mc/.classpath
index d06b940..c4b0fff 100644
--- a/bundles/org.eclipse.capra.handler.app4mc/.classpath
+++ b/bundles/org.eclipse.capra.handler.app4mc/.classpath
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/bundles/org.eclipse.capra.handler.app4mc/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.capra.handler.app4mc/.settings/org.eclipse.jdt.core.prefs
index 3a21537..cd8d089 100644
--- a/bundles/org.eclipse.capra.handler.app4mc/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.capra.handler.app4mc/.settings/org.eclipse.jdt.core.prefs
@@ -1,11 +1,15 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/bundles/org.eclipse.capra.handler.app4mc/META-INF/MANIFEST.MF b/bundles/org.eclipse.capra.handler.app4mc/META-INF/MANIFEST.MF
index b6068a7..32cd387 100644
--- a/bundles/org.eclipse.capra.handler.app4mc/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.capra.handler.app4mc/META-INF/MANIFEST.MF
@@ -5,7 +5,8 @@
 Bundle-Vendor: %Bundle-Vendor
 Bundle-SymbolicName: org.eclipse.capra.handler.app4mc;singleton:=true
 Bundle-Version: 0.8.2.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: org.eclipse.capra.handler.app4mc
 Require-Bundle: org.eclipse.capra.core,
  org.eclipse.app4mc.amalthea.model;bundle-version="0.9.5"
+Automatic-Module-Name: org.eclipse.capra.handler.app4mc
diff --git a/bundles/org.eclipse.capra.handler.cdt/.classpath b/bundles/org.eclipse.capra.handler.cdt/.classpath
index eca7bdb..4a00bec 100644
--- a/bundles/org.eclipse.capra.handler.cdt/.classpath
+++ b/bundles/org.eclipse.capra.handler.cdt/.classpath
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/bundles/org.eclipse.capra.handler.cdt/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.capra.handler.cdt/.settings/org.eclipse.jdt.core.prefs
index 0c68a61..7adc0fb 100644
--- a/bundles/org.eclipse.capra.handler.cdt/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.capra.handler.cdt/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,10 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/bundles/org.eclipse.capra.handler.cdt/META-INF/MANIFEST.MF b/bundles/org.eclipse.capra.handler.cdt/META-INF/MANIFEST.MF
index 92f6f4c..ba2aca0 100644
--- a/bundles/org.eclipse.capra.handler.cdt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.capra.handler.cdt/META-INF/MANIFEST.MF
@@ -22,4 +22,5 @@
  org.eclipse.capra.handler.cdt.preferences
 Bundle-Activator: org.eclipse.capra.handler.cdt.Activator
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.capra.handler.cdt
 
diff --git a/bundles/org.eclipse.capra.handler.emf/.classpath b/bundles/org.eclipse.capra.handler.emf/.classpath
index 22f3064..f0d0c73 100644
--- a/bundles/org.eclipse.capra.handler.emf/.classpath
+++ b/bundles/org.eclipse.capra.handler.emf/.classpath
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/bundles/org.eclipse.capra.handler.emf/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.capra.handler.emf/.settings/org.eclipse.jdt.core.prefs
index 3a21537..cd8d089 100644
--- a/bundles/org.eclipse.capra.handler.emf/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.capra.handler.emf/.settings/org.eclipse.jdt.core.prefs
@@ -1,11 +1,15 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/bundles/org.eclipse.capra.handler.emf/META-INF/MANIFEST.MF b/bundles/org.eclipse.capra.handler.emf/META-INF/MANIFEST.MF
index 85a9544..96fb06e 100644
--- a/bundles/org.eclipse.capra.handler.emf/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.capra.handler.emf/META-INF/MANIFEST.MF
@@ -12,6 +12,7 @@
  org.eclipse.capra.ui.notification,
  org.eclipse.equinox.registry,
  org.eclipse.emf.ecore.editor
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: org.eclipse.capra.handler.emf,
  org.eclipse.capra.handler.emf.notification;x-internal:=true
+Automatic-Module-Name: org.eclipse.capra.handler.emf
diff --git a/bundles/org.eclipse.capra.handler.featureide/.classpath b/bundles/org.eclipse.capra.handler.featureide/.classpath
index 0dc3991..e4c00aa 100644
--- a/bundles/org.eclipse.capra.handler.featureide/.classpath
+++ b/bundles/org.eclipse.capra.handler.featureide/.classpath
@@ -6,8 +6,9 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
 		<attributes>
+			<attribute name="module" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
diff --git a/bundles/org.eclipse.capra.handler.featureide/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.capra.handler.featureide/.settings/org.eclipse.jdt.core.prefs
index 672496e..fbf1aac 100644
--- a/bundles/org.eclipse.capra.handler.featureide/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.capra.handler.featureide/.settings/org.eclipse.jdt.core.prefs
@@ -1,12 +1,16 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/bundles/org.eclipse.capra.handler.featureide/META-INF/MANIFEST.MF b/bundles/org.eclipse.capra.handler.featureide/META-INF/MANIFEST.MF
index b370b82..739bcca 100644
--- a/bundles/org.eclipse.capra.handler.featureide/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.capra.handler.featureide/META-INF/MANIFEST.MF
@@ -13,4 +13,5 @@
  org.eclipse.core.runtime,
  de.ovgu.featureide.fm.core;bundle-version="[3.5.4,4.0.0)"
 Import-Package: org.eclipse.papyrus.infra.emf.utils
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
+Automatic-Module-Name: org.eclipse.capra.handler.featureide
diff --git a/bundles/org.eclipse.capra.handler.file/.classpath b/bundles/org.eclipse.capra.handler.file/.classpath
index ab98c97..34a3f54 100644
--- a/bundles/org.eclipse.capra.handler.file/.classpath
+++ b/bundles/org.eclipse.capra.handler.file/.classpath
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry exported="true" kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/bundles/org.eclipse.capra.handler.file/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.capra.handler.file/.settings/org.eclipse.jdt.core.prefs
index 3a21537..a58ebdc 100644
--- a/bundles/org.eclipse.capra.handler.file/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.capra.handler.file/.settings/org.eclipse.jdt.core.prefs
@@ -1,11 +1,15 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/bundles/org.eclipse.capra.handler.file/META-INF/MANIFEST.MF b/bundles/org.eclipse.capra.handler.file/META-INF/MANIFEST.MF
index e4f1f33..ea69055 100644
--- a/bundles/org.eclipse.capra.handler.file/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.capra.handler.file/META-INF/MANIFEST.MF
@@ -11,6 +11,7 @@
  org.eclipse.capra.core,
  org.eclipse.ui.ide,
  org.eclipse.capra.ui.notification
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: org.eclipse.capra.handler.file,
  org.eclipse.capra.handler.file.notification;x-internal:=true
+Automatic-Module-Name: org.eclipse.capra.handler.file
diff --git a/bundles/org.eclipse.capra.handler.gef/.classpath b/bundles/org.eclipse.capra.handler.gef/.classpath
index 22f3064..f0d0c73 100644
--- a/bundles/org.eclipse.capra.handler.gef/.classpath
+++ b/bundles/org.eclipse.capra.handler.gef/.classpath
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/bundles/org.eclipse.capra.handler.gef/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.capra.handler.gef/.settings/org.eclipse.jdt.core.prefs
index 3a21537..cd8d089 100644
--- a/bundles/org.eclipse.capra.handler.gef/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.capra.handler.gef/.settings/org.eclipse.jdt.core.prefs
@@ -1,11 +1,15 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/bundles/org.eclipse.capra.handler.gef/META-INF/MANIFEST.MF b/bundles/org.eclipse.capra.handler.gef/META-INF/MANIFEST.MF
index 574d9f7..d7231c0 100644
--- a/bundles/org.eclipse.capra.handler.gef/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.capra.handler.gef/META-INF/MANIFEST.MF
@@ -12,3 +12,4 @@
 Import-Package: org.eclipse.capra.ui.helpers
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: org.eclipse.capra.handler.gef
+Automatic-Module-Name: org.eclipse.capra.handler.gef
diff --git a/bundles/org.eclipse.capra.handler.hudson/.classpath b/bundles/org.eclipse.capra.handler.hudson/.classpath
index 2349b05..8146854 100644
--- a/bundles/org.eclipse.capra.handler.hudson/.classpath
+++ b/bundles/org.eclipse.capra.handler.hudson/.classpath
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
 		<accessrules>
 			<accessrule kind="accessible" pattern="org/eclipse/mylyn/**"/>
diff --git a/bundles/org.eclipse.capra.handler.hudson/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.capra.handler.hudson/.settings/org.eclipse.jdt.core.prefs
index 3a21537..a58ebdc 100644
--- a/bundles/org.eclipse.capra.handler.hudson/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.capra.handler.hudson/.settings/org.eclipse.jdt.core.prefs
@@ -1,11 +1,15 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/bundles/org.eclipse.capra.handler.hudson/META-INF/MANIFEST.MF b/bundles/org.eclipse.capra.handler.hudson/META-INF/MANIFEST.MF
index 447925d..51fad3e 100644
--- a/bundles/org.eclipse.capra.handler.hudson/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.capra.handler.hudson/META-INF/MANIFEST.MF
@@ -10,4 +10,5 @@
  org.eclipse.capra.core,
  org.eclipse.core.resources
 Export-Package: org.eclipse.capra.handler.hudson
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
+Automatic-Module-Name: org.eclipse.capra.handler.hudson
diff --git a/bundles/org.eclipse.capra.handler.jdt/.classpath b/bundles/org.eclipse.capra.handler.jdt/.classpath
index 22f3064..f0d0c73 100644
--- a/bundles/org.eclipse.capra.handler.jdt/.classpath
+++ b/bundles/org.eclipse.capra.handler.jdt/.classpath
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/bundles/org.eclipse.capra.handler.jdt/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.capra.handler.jdt/.settings/org.eclipse.jdt.core.prefs
index 3a21537..cd8d089 100644
--- a/bundles/org.eclipse.capra.handler.jdt/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.capra.handler.jdt/.settings/org.eclipse.jdt.core.prefs
@@ -1,11 +1,15 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/bundles/org.eclipse.capra.handler.jdt/META-INF/MANIFEST.MF b/bundles/org.eclipse.capra.handler.jdt/META-INF/MANIFEST.MF
index e723f2f..96e0c8a 100644
--- a/bundles/org.eclipse.capra.handler.jdt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.capra.handler.jdt/META-INF/MANIFEST.MF
@@ -17,8 +17,9 @@
  org.eclipse.core.runtime,
  org.apache.httpcomponents.httpclient,
  org.apache.httpcomponents.httpcore
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: org.eclipse.capra.handler.jdt,
  org.eclipse.capra.handler.jdt.notification;x-internal:=true,
  org.eclipse.capra.handler.jdt.preferences
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.capra.handler.jdt
diff --git a/bundles/org.eclipse.capra.handler.marker/.classpath b/bundles/org.eclipse.capra.handler.marker/.classpath
index 22f3064..f0d0c73 100644
--- a/bundles/org.eclipse.capra.handler.marker/.classpath
+++ b/bundles/org.eclipse.capra.handler.marker/.classpath
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/bundles/org.eclipse.capra.handler.marker/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.capra.handler.marker/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..a58ebdc
--- /dev/null
+++ b/bundles/org.eclipse.capra.handler.marker/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,15 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/bundles/org.eclipse.capra.handler.marker/META-INF/MANIFEST.MF b/bundles/org.eclipse.capra.handler.marker/META-INF/MANIFEST.MF
index 7c0dbd4..9f5f37d 100644
--- a/bundles/org.eclipse.capra.handler.marker/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.capra.handler.marker/META-INF/MANIFEST.MF
@@ -11,5 +11,6 @@
  org.eclipse.ui.editors,
  org.eclipse.ui.ide
 Import-Package: org.eclipse.capra.ui.helpers
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: org.eclipse.capra.handler.marker
+Automatic-Module-Name: org.eclipse.capra.handler.marker
diff --git a/bundles/org.eclipse.capra.handler.mylyn/.classpath b/bundles/org.eclipse.capra.handler.mylyn/.classpath
index 22f3064..f0d0c73 100644
--- a/bundles/org.eclipse.capra.handler.mylyn/.classpath
+++ b/bundles/org.eclipse.capra.handler.mylyn/.classpath
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/bundles/org.eclipse.capra.handler.mylyn/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.capra.handler.mylyn/.settings/org.eclipse.jdt.core.prefs
index 3a21537..cd8d089 100644
--- a/bundles/org.eclipse.capra.handler.mylyn/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.capra.handler.mylyn/.settings/org.eclipse.jdt.core.prefs
@@ -1,11 +1,15 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/bundles/org.eclipse.capra.handler.mylyn/META-INF/MANIFEST.MF b/bundles/org.eclipse.capra.handler.mylyn/META-INF/MANIFEST.MF
index 0b4930e..fd44e10 100644
--- a/bundles/org.eclipse.capra.handler.mylyn/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.capra.handler.mylyn/META-INF/MANIFEST.MF
@@ -9,5 +9,6 @@
  org.eclipse.mylyn.tasks.ui,
  org.eclipse.capra.core,
  org.eclipse.core.resources
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: org.eclipse.capra.handler.mylyn
+Automatic-Module-Name: org.eclipse.capra.handler.mylyn
diff --git a/bundles/org.eclipse.capra.handler.office/.classpath b/bundles/org.eclipse.capra.handler.office/.classpath
index eca7bdb..4a00bec 100644
--- a/bundles/org.eclipse.capra.handler.office/.classpath
+++ b/bundles/org.eclipse.capra.handler.office/.classpath
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/bundles/org.eclipse.capra.handler.office/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.capra.handler.office/.settings/org.eclipse.jdt.core.prefs
index 0c68a61..a58ebdc 100644
--- a/bundles/org.eclipse.capra.handler.office/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.capra.handler.office/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,15 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/bundles/org.eclipse.capra.handler.office/META-INF/MANIFEST.MF b/bundles/org.eclipse.capra.handler.office/META-INF/MANIFEST.MF
index 681a58d..249d270 100644
--- a/bundles/org.eclipse.capra.handler.office/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.capra.handler.office/META-INF/MANIFEST.MF
@@ -5,9 +5,10 @@
 Bundle-Vendor: %Bundle-Vendor
 Bundle-SymbolicName: org.eclipse.capra.handler.office;singleton:=true
 Bundle-Version: 0.8.2.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.eclipse.capra.core,
  org.eclipse.capra.ui.office,
  org.eclipse.core.resources,
  org.eclipse.ui
 Export-Package: org.eclipse.capra.handler.office
+Automatic-Module-Name: org.eclipse.capra.handler.office
diff --git a/bundles/org.eclipse.capra.handler.papyrus/.classpath b/bundles/org.eclipse.capra.handler.papyrus/.classpath
index b862a29..4a00bec 100644
--- a/bundles/org.eclipse.capra.handler.papyrus/.classpath
+++ b/bundles/org.eclipse.capra.handler.papyrus/.classpath
@@ -1,7 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="src" path="src"/>

-	<classpathentry kind="output" path="bin"/>

-</classpath>

+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/bundles/org.eclipse.capra.handler.papyrus/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.capra.handler.papyrus/.settings/org.eclipse.jdt.core.prefs
index 295926d..1a070d3 100644
--- a/bundles/org.eclipse.capra.handler.papyrus/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.capra.handler.papyrus/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,15 @@
 eclipse.preferences.version=1

 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8

-org.eclipse.jdt.core.compiler.compliance=1.8

+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate

+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11

+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve

+org.eclipse.jdt.core.compiler.compliance=11

+org.eclipse.jdt.core.compiler.debug.lineNumber=generate

+org.eclipse.jdt.core.compiler.debug.localVariable=generate

+org.eclipse.jdt.core.compiler.debug.sourceFile=generate

 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled

 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.source=1.8

+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning

+org.eclipse.jdt.core.compiler.release=disabled

+org.eclipse.jdt.core.compiler.source=11

diff --git a/bundles/org.eclipse.capra.handler.papyrus/META-INF/MANIFEST.MF b/bundles/org.eclipse.capra.handler.papyrus/META-INF/MANIFEST.MF
index 805e144..c7263a9 100644
--- a/bundles/org.eclipse.capra.handler.papyrus/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.capra.handler.papyrus/META-INF/MANIFEST.MF
@@ -13,3 +13,4 @@
  org.eclipse.core.resources
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: org.eclipse.capra.handler.papyrus
+Automatic-Module-Name: org.eclipse.capra.handler.papyrus
diff --git a/bundles/org.eclipse.capra.handler.php/.classpath b/bundles/org.eclipse.capra.handler.php/.classpath
index 22f3064..f0d0c73 100644
--- a/bundles/org.eclipse.capra.handler.php/.classpath
+++ b/bundles/org.eclipse.capra.handler.php/.classpath
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/bundles/org.eclipse.capra.handler.php/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.capra.handler.php/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..a58ebdc
--- /dev/null
+++ b/bundles/org.eclipse.capra.handler.php/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,15 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/bundles/org.eclipse.capra.handler.php/META-INF/MANIFEST.MF b/bundles/org.eclipse.capra.handler.php/META-INF/MANIFEST.MF
index 7279cbd..8eeea3e 100644
--- a/bundles/org.eclipse.capra.handler.php/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.capra.handler.php/META-INF/MANIFEST.MF
@@ -13,6 +13,7 @@
  org.eclipse.core.runtime,
  org.eclipse.capra.ui.notification,
  org.eclipse.ui
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: org.eclipse.capra.handler.php,
  org.eclipse.capra.handler.php.notification;x-internal:=true
+Automatic-Module-Name: org.eclipse.capra.handler.php
diff --git a/bundles/org.eclipse.capra.handler.reqIf/.classpath b/bundles/org.eclipse.capra.handler.reqIf/.classpath
index 0dc3991..e4c00aa 100644
--- a/bundles/org.eclipse.capra.handler.reqIf/.classpath
+++ b/bundles/org.eclipse.capra.handler.reqIf/.classpath
@@ -6,8 +6,9 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
 		<attributes>
+			<attribute name="module" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
diff --git a/bundles/org.eclipse.capra.handler.reqIf/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.capra.handler.reqIf/.settings/org.eclipse.jdt.core.prefs
index 672496e..2bd4e77 100644
--- a/bundles/org.eclipse.capra.handler.reqIf/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.capra.handler.reqIf/.settings/org.eclipse.jdt.core.prefs
@@ -1,12 +1,16 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/bundles/org.eclipse.capra.handler.reqIf/META-INF/MANIFEST.MF b/bundles/org.eclipse.capra.handler.reqIf/META-INF/MANIFEST.MF
index 1f5f9ef..a47ec62 100644
--- a/bundles/org.eclipse.capra.handler.reqIf/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.capra.handler.reqIf/META-INF/MANIFEST.MF
@@ -11,4 +11,5 @@
  org.eclipse.rmf.reqif10.pror,
  org.eclipse.core.resources,
  org.eclipse.core.runtime
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
+Automatic-Module-Name: org.eclipse.capra.handler.reqIf
diff --git a/bundles/org.eclipse.capra.handler.uml/.classpath b/bundles/org.eclipse.capra.handler.uml/.classpath
index 22f3064..f0d0c73 100644
--- a/bundles/org.eclipse.capra.handler.uml/.classpath
+++ b/bundles/org.eclipse.capra.handler.uml/.classpath
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/bundles/org.eclipse.capra.handler.uml/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.capra.handler.uml/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..a58ebdc
--- /dev/null
+++ b/bundles/org.eclipse.capra.handler.uml/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,15 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/bundles/org.eclipse.capra.handler.uml/META-INF/MANIFEST.MF b/bundles/org.eclipse.capra.handler.uml/META-INF/MANIFEST.MF
index 6df278a..16a6414 100644
--- a/bundles/org.eclipse.capra.handler.uml/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.capra.handler.uml/META-INF/MANIFEST.MF
@@ -10,4 +10,5 @@
  org.eclipse.emf.ecore,
  org.eclipse.capra.core,
  org.eclipse.core.resources
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
+Automatic-Module-Name: org.eclipse.capra.handler.uml
diff --git a/bundles/org.eclipse.capra.ui.cdt/.classpath b/bundles/org.eclipse.capra.ui.cdt/.classpath
index eca7bdb..4a00bec 100644
--- a/bundles/org.eclipse.capra.ui.cdt/.classpath
+++ b/bundles/org.eclipse.capra.ui.cdt/.classpath
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/bundles/org.eclipse.capra.ui.cdt/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.capra.ui.cdt/.settings/org.eclipse.jdt.core.prefs
index 0c68a61..a58ebdc 100644
--- a/bundles/org.eclipse.capra.ui.cdt/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.capra.ui.cdt/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,15 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/bundles/org.eclipse.capra.ui.cdt/META-INF/MANIFEST.MF b/bundles/org.eclipse.capra.ui.cdt/META-INF/MANIFEST.MF
index a287bec..a720e41 100644
--- a/bundles/org.eclipse.capra.ui.cdt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.capra.ui.cdt/META-INF/MANIFEST.MF
@@ -15,3 +15,4 @@
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.capra.ui.cdt,
  org.eclipse.capra.ui.cdt.preferences
+Automatic-Module-Name: org.eclipse.capra.ui.cdt
diff --git a/bundles/org.eclipse.capra.ui.drive/.classpath b/bundles/org.eclipse.capra.ui.drive/.classpath
index 0f05a44..b093c4b 100644
--- a/bundles/org.eclipse.capra.ui.drive/.classpath
+++ b/bundles/org.eclipse.capra.ui.drive/.classpath
@@ -8,7 +8,11 @@
 	<classpathentry exported="true" kind="lib" path="lib/google-http-client-jackson2-1.22.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/google-oauth-client-1.22.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/google-oauth-client-java6-1.22.0.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/bundles/org.eclipse.capra.ui.drive/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.capra.ui.drive/.settings/org.eclipse.jdt.core.prefs
index 0c68a61..a58ebdc 100644
--- a/bundles/org.eclipse.capra.ui.drive/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.capra.ui.drive/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,15 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/bundles/org.eclipse.capra.ui.drive/META-INF/MANIFEST.MF b/bundles/org.eclipse.capra.ui.drive/META-INF/MANIFEST.MF
index aaa20b5..71674c1 100644
--- a/bundles/org.eclipse.capra.ui.drive/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.capra.ui.drive/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@
 Bundle-Vendor: C%Bundle-Vendor
 Bundle-SymbolicName: org.eclipse.capra.ui.drive;singleton:=true
 Bundle-Version: 0.8.2.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.eclipse.equinox.registry,
  org.eclipse.capra.ui.office,
  org.eclipse.ui,
@@ -22,3 +22,4 @@
  lib/google-oauth-client-jetty-1.22.0.jar
 Import-Package: org.slf4j
 Export-Package: org.eclipse.capra.ui.drive
+Automatic-Module-Name: org.eclipse.capra.ui.drive
diff --git a/bundles/org.eclipse.capra.ui.jdt/.classpath b/bundles/org.eclipse.capra.ui.jdt/.classpath
index eca7bdb..4a00bec 100644
--- a/bundles/org.eclipse.capra.ui.jdt/.classpath
+++ b/bundles/org.eclipse.capra.ui.jdt/.classpath
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/bundles/org.eclipse.capra.ui.jdt/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.capra.ui.jdt/.settings/org.eclipse.jdt.core.prefs
index 0c68a61..cd8d089 100644
--- a/bundles/org.eclipse.capra.ui.jdt/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.capra.ui.jdt/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,15 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/bundles/org.eclipse.capra.ui.jdt/META-INF/MANIFEST.MF b/bundles/org.eclipse.capra.ui.jdt/META-INF/MANIFEST.MF
index 3f4820e..51b475c 100644
--- a/bundles/org.eclipse.capra.ui.jdt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.capra.ui.jdt/META-INF/MANIFEST.MF
@@ -11,7 +11,8 @@
  org.eclipse.ui.workbench,
  org.eclipse.capra.ui,
  org.eclipse.capra.handler.jdt
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.capra.ui.jdt,
  org.eclipse.capra.ui.jdt.preferences
+Automatic-Module-Name: org.eclipse.capra.ui.jdt
diff --git a/bundles/org.eclipse.capra.ui.matrix/.classpath b/bundles/org.eclipse.capra.ui.matrix/.classpath
index eca7bdb..4a00bec 100644
--- a/bundles/org.eclipse.capra.ui.matrix/.classpath
+++ b/bundles/org.eclipse.capra.ui.matrix/.classpath
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/bundles/org.eclipse.capra.ui.matrix/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.capra.ui.matrix/.settings/org.eclipse.jdt.core.prefs
index 0c68a61..a58ebdc 100644
--- a/bundles/org.eclipse.capra.ui.matrix/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.capra.ui.matrix/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,15 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/bundles/org.eclipse.capra.ui.matrix/META-INF/MANIFEST.MF b/bundles/org.eclipse.capra.ui.matrix/META-INF/MANIFEST.MF
index fd32056..9cc205e 100644
--- a/bundles/org.eclipse.capra.ui.matrix/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.capra.ui.matrix/META-INF/MANIFEST.MF
@@ -13,7 +13,8 @@
  org.eclipse.capra.ui,
  org.eclipse.capra.generic.artifactmodel,
  org.eclipse.nebula.widgets.nattable.core
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: org.eclipse.capra.ui.matrix,
  org.eclipse.capra.ui.matrix.views
 Bundle-Vendor: %Bundel-Vendor
+Automatic-Module-Name: org.eclipse.capra.ui.matrix
diff --git a/bundles/org.eclipse.capra.ui.notification/.classpath b/bundles/org.eclipse.capra.ui.notification/.classpath
index eca7bdb..4a00bec 100644
--- a/bundles/org.eclipse.capra.ui.notification/.classpath
+++ b/bundles/org.eclipse.capra.ui.notification/.classpath
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/bundles/org.eclipse.capra.ui.notification/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.capra.ui.notification/.settings/org.eclipse.jdt.core.prefs
index 0c68a61..a58ebdc 100644
--- a/bundles/org.eclipse.capra.ui.notification/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.capra.ui.notification/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,15 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/bundles/org.eclipse.capra.ui.notification/META-INF/MANIFEST.MF b/bundles/org.eclipse.capra.ui.notification/META-INF/MANIFEST.MF
index ac2df45..771cdd0 100644
--- a/bundles/org.eclipse.capra.ui.notification/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.capra.ui.notification/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.capra.ui.notification;singleton:=true
 Bundle-Version: 0.8.2.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.eclipse.capra.core,
  org.eclipse.core.resources,
  org.eclipse.core.runtime,
@@ -18,3 +18,4 @@
  org.slf4j
 Bundle-Vendor: %Bundle-Vendor
 Export-Package: org.eclipse.capra.ui.notification
+Automatic-Module-Name: org.eclipse.capra.ui.notification
diff --git a/bundles/org.eclipse.capra.ui.office/.classpath b/bundles/org.eclipse.capra.ui.office/.classpath
index 52651cd..b4f68c5 100644
--- a/bundles/org.eclipse.capra.ui.office/.classpath
+++ b/bundles/org.eclipse.capra.ui.office/.classpath
@@ -6,6 +6,10 @@
 	<classpathentry kind="lib" path="lib/poi-3.10.1-20140818.jar"/>
 	<classpathentry kind="lib" path="lib/poi-ooxml-schemas-3.10.1-20140818.jar"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/bundles/org.eclipse.capra.ui.office/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.capra.ui.office/.settings/org.eclipse.jdt.core.prefs
index 6e80039..fbf1aac 100644
--- a/bundles/org.eclipse.capra.ui.office/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.capra.ui.office/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,16 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/bundles/org.eclipse.capra.ui.office/META-INF/MANIFEST.MF b/bundles/org.eclipse.capra.ui.office/META-INF/MANIFEST.MF
index 86d8bb0..5dfddf7 100644
--- a/bundles/org.eclipse.capra.ui.office/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.capra.ui.office/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@
  lib/xmlbeans-2.6.0.jar,
  lib/poi-ooxml-3.10.1-filtered.jar
 Bundle-Vendor: %Bundle-Vendor
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.eclipse.emf.edit.ui,
  org.eclipse.equinox.registry,
  org.eclipse.swt,
@@ -30,4 +30,5 @@
  org.eclipse.capra.ui.office.views
 Bundle-Activator: org.eclipse.capra.ui.office.Activator
 Import-Package: org.slf4j
+Automatic-Module-Name: org.eclipse.capra.ui.office
 
diff --git a/bundles/org.eclipse.capra.ui.plantuml/.classpath b/bundles/org.eclipse.capra.ui.plantuml/.classpath
index 213e409..cf47b7f 100644
--- a/bundles/org.eclipse.capra.ui.plantuml/.classpath
+++ b/bundles/org.eclipse.capra.ui.plantuml/.classpath
@@ -2,7 +2,11 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="xtend-gen"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/bundles/org.eclipse.capra.ui.plantuml/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.capra.ui.plantuml/.settings/org.eclipse.jdt.core.prefs
index 3a21537..a58ebdc 100644
--- a/bundles/org.eclipse.capra.ui.plantuml/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.capra.ui.plantuml/.settings/org.eclipse.jdt.core.prefs
@@ -1,11 +1,15 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/bundles/org.eclipse.capra.ui.plantuml/META-INF/MANIFEST.MF b/bundles/org.eclipse.capra.ui.plantuml/META-INF/MANIFEST.MF
index dc1fd83..ec8d0ee 100644
--- a/bundles/org.eclipse.capra.ui.plantuml/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.capra.ui.plantuml/META-INF/MANIFEST.MF
@@ -18,8 +18,9 @@
  org.eclipse.ui.navigator.resources,
  net.sourceforge.plantuml.eclipse;bundle-version="1.1.24",
  net.sourceforge.plantuml.eclipse.imagecontrol;bundle-version="1.1.24"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: org.eclipse.capra.ui.plantuml,
  org.eclipse.capra.ui.plantuml.views
 Bundle-Vendor: %Bundle-Vendor
+Automatic-Module-Name: org.eclipse.capra.ui.plantuml
 
diff --git a/bundles/org.eclipse.capra.ui.reqif/.classpath b/bundles/org.eclipse.capra.ui.reqif/.classpath
index 22f3064..f0d0c73 100644
--- a/bundles/org.eclipse.capra.ui.reqif/.classpath
+++ b/bundles/org.eclipse.capra.ui.reqif/.classpath
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/bundles/org.eclipse.capra.ui.reqif/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.capra.ui.reqif/.settings/org.eclipse.jdt.core.prefs
index 3a21537..cd8d089 100644
--- a/bundles/org.eclipse.capra.ui.reqif/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.capra.ui.reqif/.settings/org.eclipse.jdt.core.prefs
@@ -1,11 +1,15 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/bundles/org.eclipse.capra.ui.reqif/META-INF/MANIFEST.MF b/bundles/org.eclipse.capra.ui.reqif/META-INF/MANIFEST.MF
index 259523c..c944006 100644
--- a/bundles/org.eclipse.capra.ui.reqif/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.capra.ui.reqif/META-INF/MANIFEST.MF
@@ -9,4 +9,5 @@
  org.eclipse.equinox.preferences,
  org.eclipse.capra.handler.reqIf
 Export-Package: org.eclipse.capra.ui.reqif.preferences
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
+Automatic-Module-Name: org.eclipse.capra.ui.reqif
diff --git a/bundles/org.eclipse.capra.ui.sunburst/.classpath b/bundles/org.eclipse.capra.ui.sunburst/.classpath
index eca7bdb..4a00bec 100644
--- a/bundles/org.eclipse.capra.ui.sunburst/.classpath
+++ b/bundles/org.eclipse.capra.ui.sunburst/.classpath
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/bundles/org.eclipse.capra.ui.sunburst/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.capra.ui.sunburst/.settings/org.eclipse.jdt.core.prefs
index 0c68a61..a58ebdc 100644
--- a/bundles/org.eclipse.capra.ui.sunburst/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.capra.ui.sunburst/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,15 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/bundles/org.eclipse.capra.ui.sunburst/META-INF/MANIFEST.MF b/bundles/org.eclipse.capra.ui.sunburst/META-INF/MANIFEST.MF
index 32cc8fb..e552d85 100644
--- a/bundles/org.eclipse.capra.ui.sunburst/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.capra.ui.sunburst/META-INF/MANIFEST.MF
@@ -12,6 +12,7 @@
  org.eclipse.core.runtime,
  org.eclipse.capra.ui,
  org.eclipse.capra.generic.artifactmodel
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: org.eclipse.capra.ui.sunburst.view
 Bundle-Vendor: %Bundle-Vendor
+Automatic-Module-Name: org.eclipse.capra.ui.sunburst
diff --git a/bundles/org.eclipse.capra.ui.xtext/.classpath b/bundles/org.eclipse.capra.ui.xtext/.classpath
index b862a29..4a00bec 100644
--- a/bundles/org.eclipse.capra.ui.xtext/.classpath
+++ b/bundles/org.eclipse.capra.ui.xtext/.classpath
@@ -1,7 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="src" path="src"/>

-	<classpathentry kind="output" path="bin"/>

-</classpath>

+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/bundles/org.eclipse.capra.ui.xtext/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.capra.ui.xtext/.settings/org.eclipse.jdt.core.prefs
index 295926d..230c1b4 100644
--- a/bundles/org.eclipse.capra.ui.xtext/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.capra.ui.xtext/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,15 @@
 eclipse.preferences.version=1

 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8

-org.eclipse.jdt.core.compiler.compliance=1.8

+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate

+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11

+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve

+org.eclipse.jdt.core.compiler.compliance=11

+org.eclipse.jdt.core.compiler.debug.lineNumber=generate

+org.eclipse.jdt.core.compiler.debug.localVariable=generate

+org.eclipse.jdt.core.compiler.debug.sourceFile=generate

 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled

 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.source=1.8

+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning

+org.eclipse.jdt.core.compiler.release=enabled

+org.eclipse.jdt.core.compiler.source=11

diff --git a/bundles/org.eclipse.capra.ui.xtext/META-INF/MANIFEST.MF b/bundles/org.eclipse.capra.ui.xtext/META-INF/MANIFEST.MF
index 66d2eb4..1f0e0ab 100644
--- a/bundles/org.eclipse.capra.ui.xtext/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.capra.ui.xtext/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@
 Bundle-SymbolicName: org.eclipse.capra.ui.xtext;singleton:=true
 Bundle-Version: 0.8.2.qualifier
 Automatic-Module-Name: org.eclipse.capra.handler.xtext
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
 Import-Package: org.eclipse.core.runtime,
  org.eclipse.emf.common.util,
diff --git a/bundles/org.eclipse.capra.ui/.classpath b/bundles/org.eclipse.capra.ui/.classpath
index 22f3064..f0d0c73 100644
--- a/bundles/org.eclipse.capra.ui/.classpath
+++ b/bundles/org.eclipse.capra.ui/.classpath
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/bundles/org.eclipse.capra.ui/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.capra.ui/.settings/org.eclipse.jdt.core.prefs
index 3a21537..cd8d089 100644
--- a/bundles/org.eclipse.capra.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.capra.ui/.settings/org.eclipse.jdt.core.prefs
@@ -1,11 +1,15 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/bundles/org.eclipse.capra.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.capra.ui/META-INF/MANIFEST.MF
index dee7dac..a1ebfc5 100644
--- a/bundles/org.eclipse.capra.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.capra.ui/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@
 Bundle-Version: 0.8.2.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %Bundle-Vendor
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.eclipse.equinox.registry,
  com.google.guava,
  org.eclipse.xtext.xbase.lib,
@@ -33,3 +33,4 @@
  org.eclipse.capra.ui.preferences,
  org.eclipse.capra.ui.selections,
  org.eclipse.capra.ui.views
+Automatic-Module-Name: org.eclipse.capra.ui
diff --git a/tests/org.eclipse.capra.handler.cdt.tests/.classpath b/tests/org.eclipse.capra.handler.cdt.tests/.classpath
index eca7bdb..4a00bec 100644
--- a/tests/org.eclipse.capra.handler.cdt.tests/.classpath
+++ b/tests/org.eclipse.capra.handler.cdt.tests/.classpath
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/tests/org.eclipse.capra.handler.cdt.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.capra.handler.cdt.tests/.settings/org.eclipse.jdt.core.prefs
index 0c68a61..a58ebdc 100644
--- a/tests/org.eclipse.capra.handler.cdt.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.capra.handler.cdt.tests/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,15 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/tests/org.eclipse.capra.handler.cdt.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.capra.handler.cdt.tests/META-INF/MANIFEST.MF
index 18ae543..48cc4ae 100644
--- a/tests/org.eclipse.capra.handler.cdt.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.capra.handler.cdt.tests/META-INF/MANIFEST.MF
@@ -16,3 +16,4 @@
  org.eclipse.capra.generic.artifactmodel,
  org.eclipse.cdt.managedbuilder.gnu.ui
 Export-Package: org.eclipse.capra.handler.cdt;x-internal:=true
+Automatic-Module-Name: org.eclipse.capra.handler.cdt.tests
diff --git a/tests/org.eclipse.capra.handler.featureide.tests/.classpath b/tests/org.eclipse.capra.handler.featureide.tests/.classpath
index 22f3064..f0d0c73 100644
--- a/tests/org.eclipse.capra.handler.featureide.tests/.classpath
+++ b/tests/org.eclipse.capra.handler.featureide.tests/.classpath
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/tests/org.eclipse.capra.handler.featureide.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.capra.handler.featureide.tests/.settings/org.eclipse.jdt.core.prefs
index 0fee6a9..cd8d089 100644
--- a/tests/org.eclipse.capra.handler.featureide.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.capra.handler.featureide.tests/.settings/org.eclipse.jdt.core.prefs
@@ -1,9 +1,9 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -12,4 +12,4 @@
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=11
diff --git a/tests/org.eclipse.capra.handler.featureide.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.capra.handler.featureide.tests/META-INF/MANIFEST.MF
index 5d1a584..54d755f 100644
--- a/tests/org.eclipse.capra.handler.featureide.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.capra.handler.featureide.tests/META-INF/MANIFEST.MF
@@ -20,3 +20,4 @@
  ch.qos.logback.slf4j;resolution:=optional
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: org.eclipse.capra.handler.featureide.tests;x-internal:=true
+Automatic-Module-Name: org.eclipse.capra.handler.featureide.tests
diff --git a/tests/org.eclipse.capra.handler.jdt.tests/.classpath b/tests/org.eclipse.capra.handler.jdt.tests/.classpath
index eca7bdb..4a00bec 100644
--- a/tests/org.eclipse.capra.handler.jdt.tests/.classpath
+++ b/tests/org.eclipse.capra.handler.jdt.tests/.classpath
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/tests/org.eclipse.capra.handler.jdt.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.capra.handler.jdt.tests/.settings/org.eclipse.jdt.core.prefs
index 0c68a61..7adc0fb 100644
--- a/tests/org.eclipse.capra.handler.jdt.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.capra.handler.jdt.tests/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,10 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/tests/org.eclipse.capra.handler.jdt.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.capra.handler.jdt.tests/META-INF/MANIFEST.MF
index 00f1534..832e535 100644
--- a/tests/org.eclipse.capra.handler.jdt.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.capra.handler.jdt.tests/META-INF/MANIFEST.MF
@@ -15,3 +15,4 @@
  org.eclipse.capra.generic.tracemodel,
  org.eclipse.capra.generic.artifactmodel
 Export-Package: org.eclipse.capra.handler.jdt;x-internal:=true
+Automatic-Module-Name: org.eclipse.capra.handler.jdt.tests
diff --git a/tests/org.eclipse.capra.handler.uml.tests/.classpath b/tests/org.eclipse.capra.handler.uml.tests/.classpath
index 22f3064..f0d0c73 100644
--- a/tests/org.eclipse.capra.handler.uml.tests/.classpath
+++ b/tests/org.eclipse.capra.handler.uml.tests/.classpath
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/tests/org.eclipse.capra.handler.uml.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.capra.handler.uml.tests/.settings/org.eclipse.jdt.core.prefs
index 3a21537..a58ebdc 100644
--- a/tests/org.eclipse.capra.handler.uml.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.capra.handler.uml.tests/.settings/org.eclipse.jdt.core.prefs
@@ -1,11 +1,15 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/tests/org.eclipse.capra.handler.uml.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.capra.handler.uml.tests/META-INF/MANIFEST.MF
index e41a479..1a94ea3 100644
--- a/tests/org.eclipse.capra.handler.uml.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.capra.handler.uml.tests/META-INF/MANIFEST.MF
@@ -21,3 +21,4 @@
  net.sourceforge.plantuml.eclipse;bundle-version="1.1.24"
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: org.eclipse.capra.handler.uml.tests;x-internal:=true
+Automatic-Module-Name: org.eclipse.capra.handler.uml.tests
diff --git a/tests/org.eclipse.capra.testsuite/.classpath b/tests/org.eclipse.capra.testsuite/.classpath
index 22f3064..f0d0c73 100644
--- a/tests/org.eclipse.capra.testsuite/.classpath
+++ b/tests/org.eclipse.capra.testsuite/.classpath
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/tests/org.eclipse.capra.testsuite/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.capra.testsuite/.settings/org.eclipse.jdt.core.prefs
index 3a21537..a58ebdc 100644
--- a/tests/org.eclipse.capra.testsuite/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.capra.testsuite/.settings/org.eclipse.jdt.core.prefs
@@ -1,11 +1,15 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/tests/org.eclipse.capra.testsuite/META-INF/MANIFEST.MF b/tests/org.eclipse.capra.testsuite/META-INF/MANIFEST.MF
index e1ba860..d7baa4e 100644
--- a/tests/org.eclipse.capra.testsuite/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.capra.testsuite/META-INF/MANIFEST.MF
@@ -46,3 +46,4 @@
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Import-Package: org.eclipse.swt.dnd,
  org.slf4j
+Automatic-Module-Name: org.eclipse.capra.testsuite