diff --git a/plugins/org.obeonetwork.dsl.bpmn2.design/.classpath b/plugins/org.obeonetwork.dsl.bpmn2.design/.classpath
index eca7bdba..e801ebfb 100644
--- a/plugins/org.obeonetwork.dsl.bpmn2.design/.classpath
+++ b/plugins/org.obeonetwork.dsl.bpmn2.design/.classpath
@@ -1,6 +1,6 @@
 <?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"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/plugins/org.obeonetwork.dsl.bpmn2.design/META-INF/MANIFEST.MF b/plugins/org.obeonetwork.dsl.bpmn2.design/META-INF/MANIFEST.MF
index 09186607..af27e799 100644
--- a/plugins/org.obeonetwork.dsl.bpmn2.design/META-INF/MANIFEST.MF
+++ b/plugins/org.obeonetwork.dsl.bpmn2.design/META-INF/MANIFEST.MF
@@ -1,4 +1,5 @@
 Bundle-ManifestVersion: 2
+Automatic-Module-Name: org.obeonetwork.dsl.bpmn2.design
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.obeonetwork.dsl.bpmn2.design;singleton:=true
 Bundle-Version: 4.1.4.qualifier
@@ -21,7 +22,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.sirius.ext.base,
  org.eclipse.emf.edit.ui
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: org.obeonetwork.bpmn2.design
 Bundle-Vendor: %providerName
 Import-Package: org.eclipse.gmf.runtime.notation
diff --git a/plugins/org.obeonetwork.dsl.bpmn2.edit/.classpath b/plugins/org.obeonetwork.dsl.bpmn2.edit/.classpath
index 36157842..bba47f29 100644
--- a/plugins/org.obeonetwork.dsl.bpmn2.edit/.classpath
+++ b/plugins/org.obeonetwork.dsl.bpmn2.edit/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src-gen"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/plugins/org.obeonetwork.dsl.bpmn2.edit/META-INF/MANIFEST.MF b/plugins/org.obeonetwork.dsl.bpmn2.edit/META-INF/MANIFEST.MF
index a564cd69..bba6fe23 100644
--- a/plugins/org.obeonetwork.dsl.bpmn2.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.obeonetwork.dsl.bpmn2.edit/META-INF/MANIFEST.MF
@@ -1,5 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
+Automatic-Module-Name: org.obeonetwork.dsl.bpmn2.edit
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.obeonetwork.dsl.bpmn2.edit;singleton:=true
 Bundle-Version: 4.1.4.qualifier
@@ -7,7 +8,7 @@ Bundle-ClassPath: .
 Bundle-Activator: org.obeonetwork.dsl.bpmn2.provider.Bpmn2EditPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: org.obeonetwork.dsl.bpmn2.bpmdi.provider,
  org.obeonetwork.dsl.bpmn2.provider,
  org.obeonetwork.dsl.dd.dc.provider,
diff --git a/plugins/org.obeonetwork.dsl.bpmn2.editor/.classpath b/plugins/org.obeonetwork.dsl.bpmn2.editor/.classpath
index 36157842..bba47f29 100644
--- a/plugins/org.obeonetwork.dsl.bpmn2.editor/.classpath
+++ b/plugins/org.obeonetwork.dsl.bpmn2.editor/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src-gen"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/plugins/org.obeonetwork.dsl.bpmn2.editor/META-INF/MANIFEST.MF b/plugins/org.obeonetwork.dsl.bpmn2.editor/META-INF/MANIFEST.MF
index feedea36..a4d1ba94 100644
--- a/plugins/org.obeonetwork.dsl.bpmn2.editor/META-INF/MANIFEST.MF
+++ b/plugins/org.obeonetwork.dsl.bpmn2.editor/META-INF/MANIFEST.MF
@@ -1,5 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
+Automatic-Module-Name: org.obeonetwork.dsl.bpmn2.editor
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.obeonetwork.dsl.bpmn2.editor;singleton:=true
 Bundle-Version: 4.1.4.qualifier
@@ -7,7 +8,7 @@ Bundle-ClassPath: .
 Bundle-Activator: org.obeonetwork.dsl.bpmn2.presentation.Bpmn2EditorPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: org.obeonetwork.dsl.bpmn2.bpmdi.presentation,
  org.obeonetwork.dsl.bpmn2.presentation,
  org.obeonetwork.dsl.dd.dc.presentation
diff --git a/plugins/org.obeonetwork.dsl.bpmn2/.classpath b/plugins/org.obeonetwork.dsl.bpmn2/.classpath
index 0c22b5d7..ad5e13cc 100644
--- a/plugins/org.obeonetwork.dsl.bpmn2/.classpath
+++ b/plugins/org.obeonetwork.dsl.bpmn2/.classpath
@@ -1,6 +1,6 @@
 <?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.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="src-gen"/>
diff --git a/plugins/org.obeonetwork.dsl.bpmn2/META-INF/MANIFEST.MF b/plugins/org.obeonetwork.dsl.bpmn2/META-INF/MANIFEST.MF
index 1a3a2d9c..3d071d9e 100644
--- a/plugins/org.obeonetwork.dsl.bpmn2/META-INF/MANIFEST.MF
+++ b/plugins/org.obeonetwork.dsl.bpmn2/META-INF/MANIFEST.MF
@@ -1,12 +1,13 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
+Automatic-Module-Name: org.obeonetwork.dsl.bpmn2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.obeonetwork.dsl.bpmn2;singleton:=true
 Bundle-Version: 4.1.4.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
  org.eclipse.emf.ecore.xmi;visibility:=reexport,
diff --git a/samples/org.obeonetwork.dsl.bpmn2.samples.pack.core/.classpath b/samples/org.obeonetwork.dsl.bpmn2.samples.pack.core/.classpath
index ad32c83a..e801ebfb 100644
--- a/samples/org.obeonetwork.dsl.bpmn2.samples.pack.core/.classpath
+++ b/samples/org.obeonetwork.dsl.bpmn2.samples.pack.core/.classpath
@@ -1,6 +1,6 @@
 <?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.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/samples/org.obeonetwork.dsl.bpmn2.samples.pack.core/META-INF/MANIFEST.MF b/samples/org.obeonetwork.dsl.bpmn2.samples.pack.core/META-INF/MANIFEST.MF
index 0c3c7d1b..6c4af492 100644
--- a/samples/org.obeonetwork.dsl.bpmn2.samples.pack.core/META-INF/MANIFEST.MF
+++ b/samples/org.obeonetwork.dsl.bpmn2.samples.pack.core/META-INF/MANIFEST.MF
@@ -1,5 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
+Automatic-Module-Name: org.obeonetwork.dsl.bpmn2.samples.pack.core
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.obeonetwork.dsl.bpmn2.samples.pack.core;singleton:=true
 Bundle-Version: 4.1.4.qualifier
@@ -10,4 +11,4 @@ Require-Bundle: org.eclipse.ui,
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/samples/org.obeonetwork.dsl.bpmn2.samples/.classpath b/samples/org.obeonetwork.dsl.bpmn2.samples/.classpath
index ad32c83a..e801ebfb 100644
--- a/samples/org.obeonetwork.dsl.bpmn2.samples/.classpath
+++ b/samples/org.obeonetwork.dsl.bpmn2.samples/.classpath
@@ -1,6 +1,6 @@
 <?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.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/samples/org.obeonetwork.dsl.bpmn2.samples/META-INF/MANIFEST.MF b/samples/org.obeonetwork.dsl.bpmn2.samples/META-INF/MANIFEST.MF
index f814170c..8c3b99ad 100644
--- a/samples/org.obeonetwork.dsl.bpmn2.samples/META-INF/MANIFEST.MF
+++ b/samples/org.obeonetwork.dsl.bpmn2.samples/META-INF/MANIFEST.MF
@@ -1,9 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
+Automatic-Module-Name: org.obeonetwork.dsl.bpmn2.samples
 Bundle-Name: Samples
 Bundle-SymbolicName: org.obeonetwork.dsl.bpmn2.samples;singleton:=true
 Bundle-Version: 4.1.4.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-Activator: org.obeonetwork.dsl.bpmn2.samples.Bpmn2SamplesPlugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,