diff --git a/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/.classpath b/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/.classpath
index 3e5654f..a621c21 100755
--- a/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/.classpath
+++ b/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/.classpath
@@ -1,11 +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.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">
 		<attributes>
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/META-INF/MANIFEST.MF b/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/META-INF/MANIFEST.MF
index 1d1fa20..75f5c80 100755
--- a/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/META-INF/MANIFEST.MF
+++ b/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/META-INF/MANIFEST.MF
@@ -5,9 +5,9 @@
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
 Automatic-Module-Name: org.eclipse.papyrus.cdo.perfo.tests
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.junit,
- org.eclipse.gmf.runtime.notation;bundle-version="1.8.0",
+ org.eclipse.gmf.runtime.notation;bundle-version="1.10.0",
  org.eclipse.papyrus.infra.gmfdiag.style;bundle-version="1.0.0",
  org.eclipse.papyrus.cdo.core.tests;bundle-version="1.2.0",
  org.eclipse.papyrus.uml.tools;bundle-version="4.1.0",
diff --git a/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/build.properties b/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/build.properties
index 2d0496e..dd3bc48 100755
--- a/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/build.properties
+++ b/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/build.properties
@@ -13,6 +13,6 @@
 ###############################################################################
 
 source.. = src/
-output.. = bin/
+output.. = target/classes/
 bin.includes = META-INF/,\
                .
diff --git a/cdo/benchmarks/org.eclipse.papyrus.cdo.uml.benchmarks.creation.tests/.classpath b/cdo/benchmarks/org.eclipse.papyrus.cdo.uml.benchmarks.creation.tests/.classpath
index 3e5654f..a621c21 100755
--- a/cdo/benchmarks/org.eclipse.papyrus.cdo.uml.benchmarks.creation.tests/.classpath
+++ b/cdo/benchmarks/org.eclipse.papyrus.cdo.uml.benchmarks.creation.tests/.classpath
@@ -1,11 +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.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">
 		<attributes>
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/cdo/benchmarks/org.eclipse.papyrus.cdo.uml.benchmarks.creation.tests/.settings/org.eclipse.jdt.core.prefs b/cdo/benchmarks/org.eclipse.papyrus.cdo.uml.benchmarks.creation.tests/.settings/org.eclipse.jdt.core.prefs
index 0c68a61..f4d933e 100755
--- a/cdo/benchmarks/org.eclipse.papyrus.cdo.uml.benchmarks.creation.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/cdo/benchmarks/org.eclipse.papyrus.cdo.uml.benchmarks.creation.tests/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
 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.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=11
diff --git a/cdo/benchmarks/org.eclipse.papyrus.cdo.uml.benchmarks.creation.tests/META-INF/MANIFEST.MF b/cdo/benchmarks/org.eclipse.papyrus.cdo.uml.benchmarks.creation.tests/META-INF/MANIFEST.MF
index 2be8002..4b9eac6 100755
--- a/cdo/benchmarks/org.eclipse.papyrus.cdo.uml.benchmarks.creation.tests/META-INF/MANIFEST.MF
+++ b/cdo/benchmarks/org.eclipse.papyrus.cdo.uml.benchmarks.creation.tests/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
 Automatic-Module-Name: org.eclipse.papyrus.cdo.uml.benchmarks.creation.tests
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.eclipse.uml2.uml;bundle-version="5.5.0",
  org.junit;bundle-version="4.12.0",
  org.eclipse.emf.cdo.explorer,
diff --git a/cdo/benchmarks/org.eclipse.papyrus.cdo.uml.benchmarks.creation.tests/build.properties b/cdo/benchmarks/org.eclipse.papyrus.cdo.uml.benchmarks.creation.tests/build.properties
index 34d2e4d..56d7765 100755
--- a/cdo/benchmarks/org.eclipse.papyrus.cdo.uml.benchmarks.creation.tests/build.properties
+++ b/cdo/benchmarks/org.eclipse.papyrus.cdo.uml.benchmarks.creation.tests/build.properties
@@ -1,4 +1,4 @@
 source.. = src/
-output.. = bin/
+output.. = target/classes/
 bin.includes = META-INF/,\
                .
diff --git a/cdo/bundles/org.eclipse.papyrus.cdo.core/.classpath b/cdo/bundles/org.eclipse.papyrus.cdo.core/.classpath
index dbc46ec..1746ad8 100755
--- a/cdo/bundles/org.eclipse.papyrus.cdo.core/.classpath
+++ b/cdo/bundles/org.eclipse.papyrus.cdo.core/.classpath
@@ -1,8 +1,8 @@
 <?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-gen"/>
-	<classpathentry kind="src" path="src/"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/cdo/bundles/org.eclipse.papyrus.cdo.core/.settings/org.eclipse.jdt.core.prefs b/cdo/bundles/org.eclipse.papyrus.cdo.core/.settings/org.eclipse.jdt.core.prefs
index b3aa6d6..e7bf213 100755
--- a/cdo/bundles/org.eclipse.papyrus.cdo.core/.settings/org.eclipse.jdt.core.prefs
+++ b/cdo/bundles/org.eclipse.papyrus.cdo.core/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +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.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=11
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff --git a/cdo/bundles/org.eclipse.papyrus.cdo.core/META-INF/MANIFEST.MF b/cdo/bundles/org.eclipse.papyrus.cdo.core/META-INF/MANIFEST.MF
index c1322ed..8faecc0 100755
--- a/cdo/bundles/org.eclipse.papyrus.cdo.core/META-INF/MANIFEST.MF
+++ b/cdo/bundles/org.eclipse.papyrus.cdo.core/META-INF/MANIFEST.MF
@@ -1,30 +1,28 @@
 Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.emf.ecore.xmi;visibility:=reexport,
- org.eclipse.emf.cdo.explorer;bundle-version="[4.3.0,5.0.0)";visibility:=reexport,
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.resourceloading;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf.readonly;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.emf.workspace;bundle-version="[1.5.1,2.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
- org.eclipse.emf.cdo.dawn;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.emf.cdo.dawn.gmf;bundle-version="[2.1.0,3.0.0)",
- org.eclipse.emf.transaction;bundle-version="[1.4.0,2.0.0)";visibility:=reexport,
- org.eclipse.gmf.runtime.notation;bundle-version="[1.5.0,2.0.0)",
- org.eclipse.equinox.security;bundle-version="[1.1.100,2.0.0)",
- org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)",
- com.google.guava;bundle-version="11.0.0",
- org.eclipse.papyrus.infra.services.controlmode;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.emf.commands.core;bundle-version="[1.7.0,2.0.0)",
- org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.7.0,2.0.0)",
- org.eclipse.papyrus.infra.services.localizer;bundle-version="1.2.0",
- org.eclipse.net4j;bundle-version="[4.3.0,5.0.0)",
- org.eclipse.emf.cdo.admin;bundle-version="[4.1.200,5.0.0)",
- org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.internationalization;bundle-version="[1.2.100,2.0.0)"
+Require-Bundle: org.eclipse.emf.cdo.explorer;bundle-version="[4.8.0,5.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.core;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.core.log;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.services.resourceloading;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.emf;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.infra.emf.readonly;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
+ org.eclipse.emf.cdo.dawn;bundle-version="[2.2.0,3.0.0)",
+ org.eclipse.emf.cdo.dawn.gmf;bundle-version="[2.3.0,3.0.0)",
+ org.eclipse.emf.transaction;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
+ org.eclipse.gmf.runtime.notation;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.equinox.security;bundle-version="[1.3.0,2.0.0)",
+ org.eclipse.core.expressions;bundle-version="[3.7.0,4.0.0)",
+ com.google.guava;bundle-version="11.1.0";visibility:=reexport,
+ org.eclipse.papyrus.infra.services.controlmode;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.papyrus.infra.services.localizer;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.emf.cdo.admin;bundle-version="[4.2.0,5.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.internationalization;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.emf.gmf;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.ui;bundle-version="[3.118.0,4.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.5.0,6.0.0)",
+ org.eclipse.papyrus.infra.tools;bundle-version="[4.0.0,5.0.0)"
 Export-Package: org.eclipse.papyrus.cdo.core,
  org.eclipse.papyrus.cdo.core.admin,
  org.eclipse.papyrus.cdo.core.exporter,
@@ -68,5 +66,5 @@
 Bundle-ManifestVersion: 2
 Bundle-Description: %pluginDescription
 Bundle-SymbolicName: org.eclipse.papyrus.cdo.core;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Automatic-Module-Name: org.eclipse.papyrus.cdo.core
diff --git a/cdo/bundles/org.eclipse.papyrus.cdo.core/build.properties b/cdo/bundles/org.eclipse.papyrus.cdo.core/build.properties
index 4051162..733d331 100755
--- a/cdo/bundles/org.eclipse.papyrus.cdo.core/build.properties
+++ b/cdo/bundles/org.eclipse.papyrus.cdo.core/build.properties
@@ -22,5 +22,5 @@
 jars.compile.order = .
 source.. = src/,\
            src-gen/
-output.. = bin/
+output.. = target/classes
 src.includes = about.html
diff --git a/cdo/bundles/org.eclipse.papyrus.cdo.security.properties/.classpath b/cdo/bundles/org.eclipse.papyrus.cdo.security.properties/.classpath
index eca7bdb..e491e18 100755
--- a/cdo/bundles/org.eclipse.papyrus.cdo.security.properties/.classpath
+++ b/cdo/bundles/org.eclipse.papyrus.cdo.security.properties/.classpath
@@ -1,7 +1,7 @@
 <?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"/>
+	<classpathentry kind="output" path="target/classes"/>  
 </classpath>
diff --git a/cdo/bundles/org.eclipse.papyrus.cdo.security.properties/.settings/org.eclipse.jdt.core.prefs b/cdo/bundles/org.eclipse.papyrus.cdo.security.properties/.settings/org.eclipse.jdt.core.prefs
index 74c6d08..9ea44d5 100755
--- a/cdo/bundles/org.eclipse.papyrus.cdo.security.properties/.settings/org.eclipse.jdt.core.prefs
+++ b/cdo/bundles/org.eclipse.papyrus.cdo.security.properties/.settings/org.eclipse.jdt.core.prefs
@@ -1,16 +1,16 @@
 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
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=11
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff --git a/cdo/bundles/org.eclipse.papyrus.cdo.security.properties/META-INF/MANIFEST.MF b/cdo/bundles/org.eclipse.papyrus.cdo.security.properties/META-INF/MANIFEST.MF
index 9eb1454..27e467d 100755
--- a/cdo/bundles/org.eclipse.papyrus.cdo.security.properties/META-INF/MANIFEST.MF
+++ b/cdo/bundles/org.eclipse.papyrus.cdo.security.properties/META-INF/MANIFEST.MF
@@ -5,9 +5,9 @@
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
 Automatic-Module-Name: org.eclipse.papyrus.cdo.security.properties
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.papyrus.infra.properties;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.ui;bundle-version="3.112.0",
- org.eclipse.core.runtime;bundle-version="3.15.0"
+Bundle-RequiredExecutionEnvironment: JavaSE-11
+Require-Bundle: org.eclipse.papyrus.infra.properties;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.ui;bundle-version="[3.118.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.19.0,4.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.papyrus.cdo.security.properties.Activator
diff --git a/cdo/bundles/org.eclipse.papyrus.cdo.security.properties/build.properties b/cdo/bundles/org.eclipse.papyrus.cdo.security.properties/build.properties
index e6e8a8e..2f0a706 100755
--- a/cdo/bundles/org.eclipse.papyrus.cdo.security.properties/build.properties
+++ b/cdo/bundles/org.eclipse.papyrus.cdo.security.properties/build.properties
@@ -1,5 +1,5 @@
 source.. = src/
-output.. = bin/
+output.. = target/classes
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
diff --git a/cdo/bundles/org.eclipse.papyrus.cdo.security/.classpath b/cdo/bundles/org.eclipse.papyrus.cdo.security/.classpath
index 43b9862..1db08c6 100755
--- a/cdo/bundles/org.eclipse.papyrus.cdo.security/.classpath
+++ b/cdo/bundles/org.eclipse.papyrus.cdo.security/.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="target/classes"/>
diff --git a/cdo/bundles/org.eclipse.papyrus.cdo.security/.settings/org.eclipse.jdt.core.prefs b/cdo/bundles/org.eclipse.papyrus.cdo.security/.settings/org.eclipse.jdt.core.prefs
index 49ce3e3..037f04a 100755
--- a/cdo/bundles/org.eclipse.papyrus.cdo.security/.settings/org.eclipse.jdt.core.prefs
+++ b/cdo/bundles/org.eclipse.papyrus.cdo.security/.settings/org.eclipse.jdt.core.prefs
@@ -1,16 +1,18 @@
 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
 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.release=disabled
-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
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
diff --git a/cdo/bundles/org.eclipse.papyrus.cdo.security/META-INF/MANIFEST.MF b/cdo/bundles/org.eclipse.papyrus.cdo.security/META-INF/MANIFEST.MF
index 24fba95..a1d54eb 100755
--- a/cdo/bundles/org.eclipse.papyrus.cdo.security/META-INF/MANIFEST.MF
+++ b/cdo/bundles/org.eclipse.papyrus.cdo.security/META-INF/MANIFEST.MF
@@ -5,9 +5,11 @@
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: Eclipse Modeling Poject
 Automatic-Module-Name: org.eclipse.papyrus.cdo.authentification
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.ui,
- org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.emf.cdo.security;bundle-version="[4.3.0,5.0.0)",
- org.eclipse.papyrus.infra.properties.ui;bundle-version="[3.4.0,4.0.0)"
+Bundle-RequiredExecutionEnvironment: JavaSE-11
+Require-Bundle: org.eclipse.ui;bundle-version="[3.118.0,4.0.0)",
+ org.eclipse.papyrus.infra.ui;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.emf.cdo.security;bundle-version="[4.4.0,5.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.properties.ui;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.infra.constraints;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.widgets;bundle-version="[4.0.0,5.0.0)"
 Export-Package: org.eclipse.papyrus.cdo.security.internal.handlers
diff --git a/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/.classpath b/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/.classpath
index ad32c83..e491e18 100755
--- a/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/.classpath
+++ b/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/.classpath
@@ -1,7 +1,7 @@
 <?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"/>
+	<classpathentry kind="output" path="target/classes"/>  
 </classpath>
diff --git a/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/META-INF/MANIFEST.MF b/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/META-INF/MANIFEST.MF
index 8fe7b50..c42afa1 100755
--- a/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/META-INF/MANIFEST.MF
+++ b/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/META-INF/MANIFEST.MF
@@ -3,17 +3,12 @@
  org.eclipse.papyrus.cdo.internal.ui.customization.properties.messages;x-internal:=true,
  org.eclipse.papyrus.cdo.internal.ui.customization.properties.storage;x-internal:=true,
  org.eclipse.papyrus.cdo.internal.ui.customization.properties.storage.action;x-internal:=true
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.views.properties;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.properties;bundle-version="1.2.0",
- org.eclipse.papyrus.views.properties.toolsmiths;bundle-version="1.2.0",
- org.eclipse.papyrus.cdo.core;bundle-version="1.2.0",
- org.eclipse.emf.edit.ui;bundle-version="2.8.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.cdo.ui;bundle-version="1.2.0",
- com.google.guava;bundle-version="11.0.0"
+Require-Bundle: org.eclipse.papyrus.views.properties;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.papyrus.infra.properties;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.views.properties.toolsmiths;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.emf;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.cdo.ui;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.properties.ui;bundle-version="[4.0.0,5.0.0)"
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
 Bundle-Version: 1.2.0.qualifier
@@ -23,4 +18,5 @@
 Bundle-ManifestVersion: 2
 Bundle-Description: %pluginDescription
 Bundle-SymbolicName: org.eclipse.papyrus.cdo.ui.customization.properties;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-11
+Automatic-Module-Name: org.eclipse.papyrus.cdo.ui.customization.properties
diff --git a/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/build.properties b/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/build.properties
index 22af330..0ae38ef 100755
--- a/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/build.properties
+++ b/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/build.properties
@@ -12,7 +12,7 @@
 #  		CEA LIST - Initial API and implementation
 ###############################################################################
 source.. = src/
-output.. = bin/
+output.. = target/classes
 bin.includes = META-INF/,\
                .,\
                plugin.properties,\
diff --git a/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/CDOTextURIHandler.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/CDOTextURIHandler.java
index 35a0217..de654cb 100755
--- a/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/CDOTextURIHandler.java
+++ b/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/CDOTextURIHandler.java
@@ -23,7 +23,6 @@
 import org.eclipse.emf.cdo.util.CDOURIUtil;
 import org.eclipse.emf.cdo.util.CDOUtil;
 import org.eclipse.emf.cdo.view.CDOView;
-import org.eclipse.emf.cdo.view.CDOViewSet;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.ecore.resource.URIHandler;
diff --git a/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/.classpath b/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/.classpath
index 14129a1..cbd391f 100644
--- a/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/.classpath
+++ b/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/.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.7"/>
+	<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="target/classes"/>
 </classpath>
diff --git a/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/.settings/org.eclipse.jdt.core.prefs b/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/.settings/org.eclipse.jdt.core.prefs
index 631db84..13ed7a6 100755
--- a/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/.settings/org.eclipse.jdt.core.prefs
+++ b/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,13 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+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.7
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
diff --git a/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/META-INF/MANIFEST.MF b/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/META-INF/MANIFEST.MF
index ef8f389..fa4f935 100755
--- a/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/META-INF/MANIFEST.MF
+++ b/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
-Require-Bundle: org.eclipse.help;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.papyrus.infra.doc;bundle-version="[1.2.0,2.0.0)"
+Require-Bundle: org.eclipse.help;bundle-version="[3.8.0,4.0.0)",
+ org.eclipse.papyrus.infra.doc;bundle-version="[2.0.0,3.0.0)"
 Bundle-Vendor: %providerName
 Bundle-Version: 1.2.0.qualifier
 Bundle-Localization: plugin
@@ -8,4 +8,5 @@
 Bundle-ManifestVersion: 2
 Bundle-Description: %pluginDescription
 Bundle-SymbolicName: org.eclipse.papyrus.cdo.ui.doc;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-11
+Automatic-Module-Name: org.eclipse.papyrus.cdo.ui.doc
diff --git a/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/pom.xml b/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/pom.xml
index 105c4e4..71ac970 100755
--- a/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/pom.xml
+++ b/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/pom.xml
@@ -11,7 +11,6 @@
 	</parent>
 
 	<artifactId>org.eclipse.papyrus.cdo.ui.doc</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 	
 	<build>
diff --git a/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/.classpath b/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/.classpath
index ad32c83..e491e18 100755
--- a/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/.classpath
+++ b/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/.classpath
@@ -1,7 +1,7 @@
 <?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"/>
+	<classpathentry kind="output" path="target/classes"/>  
 </classpath>
diff --git a/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/META-INF/MANIFEST.MF b/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/META-INF/MANIFEST.MF
index e537508..5a59419 100755
--- a/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/META-INF/MANIFEST.MF
+++ b/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/META-INF/MANIFEST.MF
@@ -1,24 +1,13 @@
 Manifest-Version: 1.0
 Export-Package: org.eclipse.papyrus.cdo.internal.ui.hyperlink;x-internal:=true
-Require-Bundle: org.eclipse.ui;bundle-version="3.105.0",
- org.eclipse.core.runtime;bundle-version="3.9.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.hyperlink;bundle-version="1.2.0",
- org.eclipse.emf.transaction;bundle-version="1.4.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.cdo.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.common.core;bundle-version="[1.7.0,
- 2.0.0)",
- org.eclipse.gmf.runtime.notation;bundle-version="[1.7.0,
- 2.0.0)",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.7.0,
- 2.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
- com.google.guava;bundle-version="11.0.0"
+Require-Bundle: org.eclipse.papyrus.infra.hyperlink;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.infra.emf;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.cdo.ui;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.widgets;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[4.0.0,5.0.0)"
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
 Bundle-Version: 1.2.0.qualifier
@@ -28,4 +17,5 @@
 Bundle-Activator: org.eclipse.papyrus.cdo.internal.ui.hyperlink.Activator
 Bundle-Description: %pluginDescription
 Bundle-SymbolicName: org.eclipse.papyrus.cdo.ui.hyperlink;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-11
+Automatic-Module-Name: org.eclipse.papyrus.cdo.ui.hyperlink
diff --git a/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/build.properties b/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/build.properties
index ac5f4de..21c1c86 100755
--- a/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/build.properties
+++ b/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/build.properties
@@ -12,7 +12,7 @@
 #  		CEA LIST - Initial API and implementation
 ###############################################################################
 source.. = src/
-output.. = bin/
+output.. = target/classes
 bin.includes = META-INF/,\
                .,\
                about.html,\
diff --git a/cdo/bundles/org.eclipse.papyrus.cdo.ui/.classpath b/cdo/bundles/org.eclipse.papyrus.cdo.ui/.classpath
index 25d360e..1d6cb79 100755
--- a/cdo/bundles/org.eclipse.papyrus.cdo.ui/.classpath
+++ b/cdo/bundles/org.eclipse.papyrus.cdo.ui/.classpath
@@ -1,7 +1,7 @@
 <?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"/>
+	<classpathentry kind="output" path="target/classes"/>  
 </classpath>
diff --git a/cdo/bundles/org.eclipse.papyrus.cdo.ui/META-INF/MANIFEST.MF b/cdo/bundles/org.eclipse.papyrus.cdo.ui/META-INF/MANIFEST.MF
index 32943ac..aed01cd 100755
--- a/cdo/bundles/org.eclipse.papyrus.cdo.ui/META-INF/MANIFEST.MF
+++ b/cdo/bundles/org.eclipse.papyrus.cdo.ui/META-INF/MANIFEST.MF
@@ -1,53 +1,55 @@
 Manifest-Version: 1.0
 Export-Package: org.eclipse.papyrus.cdo.internal.ui.adapters;x-friends:="org.eclipse.papyrus.cdo.ui.tests",
  org.eclipse.papyrus.cdo.internal.ui.decorators;x-friends:="org.eclipse.papyrus.cdo.ui.tests",
- org.eclipse.papyrus.cdo.internal.ui.dialogs;x-friends:="org.eclipse.papyrus.cdo.ui.tests,org.eclipse.papyrus.cdo.ui.customization.properties,org.eclipse.papyrus.cdo.ui.hyperlink",
- org.eclipse.papyrus.cdo.internal.ui.dnd;x-friends:="org.eclipse.papyrus.cdo.ui.hyperlink,org.eclipse.papyrus.cdo.ui.tests",
- org.eclipse.papyrus.cdo.internal.ui.editors;x-friends:="org.eclipse.papyrus.cdo.ui.tests,org.eclipse.papyrus.cdo.uml.search.ui,org.eclipse.papyrus.cdo.ui.hyperlink",
+ org.eclipse.papyrus.cdo.internal.ui.dialogs;x-friends:="org.eclipse.papyrus.cdo.ui.tests,
+ org.eclipse.papyrus.cdo.ui.customization.properties,
+ org.eclipse.papyrus.cdo.ui.hyperlink",
+ org.eclipse.papyrus.cdo.internal.ui.dnd;x-friends:="org.eclipse.papyrus.cdo.ui.hyperlink,
+ org.eclipse.papyrus.cdo.ui.tests",
+ org.eclipse.papyrus.cdo.internal.ui.editors;x-friends:="org.eclipse.papyrus.cdo.ui.tests,
+ org.eclipse.papyrus.cdo.uml.search.ui,
+ org.eclipse.papyrus.cdo.ui.hyperlink",
  org.eclipse.papyrus.cdo.internal.ui.expressions;x-friends:="org.eclipse.papyrus.cdo.ui.tests",
  org.eclipse.papyrus.cdo.internal.ui.handlers;x-friends:="org.eclipse.papyrus.cdo.ui.tests",
  org.eclipse.papyrus.cdo.internal.ui.l10n;x-internal:=true,
  org.eclipse.papyrus.cdo.internal.ui.markers;x-friends:="org.eclipse.papyrus.cdo.ui.tests",
  org.eclipse.papyrus.cdo.internal.ui.providers;x-friends:="org.eclipse.papyrus.cdo.ui.tests",
  org.eclipse.papyrus.cdo.internal.ui.util;x-friends:="org.eclipse.papyrus.cdo.ui.tests",
- org.eclipse.papyrus.cdo.internal.ui.views;
-  x-friends:="org.eclipse.papyrus.cdo.ui.tests,
-   org.eclipse.papyrus.cdo.uml.diagram.ui,
-   org.eclipse.papyrus.cdo.uml.ui,
-   org.eclipse.papyrus.cdo.uml.ui.tests,
-   org.eclipse.papyrus.cdo.ui.hyperlink",
+ org.eclipse.papyrus.cdo.internal.ui.views; x-friends:="org.eclipse.papyrus.cdo.ui.tests,
+ org.eclipse.papyrus.cdo.uml.diagram.ui,
+ org.eclipse.papyrus.cdo.uml.ui,
+ org.eclipse.papyrus.cdo.uml.ui.tests,
+ org.eclipse.papyrus.cdo.ui.hyperlink",
  org.eclipse.papyrus.cdo.internal.ui.widgets;x-internal:=true,
- org.eclipse.papyrus.cdo.internal.ui.wizards;x-friends:="org.eclipse.papyrus.cdo.ui.tests,org.eclipse.papyrus.cdo.uml.diagram.ui,org.eclipse.papyrus.cdo.ui.customization.properties",
+ org.eclipse.papyrus.cdo.internal.ui.wizards;x-friends:="org.eclipse.papyrus.cdo.ui.tests,
+ org.eclipse.papyrus.cdo.uml.diagram.ui,
+ org.eclipse.papyrus.cdo.ui.customization.properties",
  org.eclipse.papyrus.cdo.ui
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.ui.ide;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.ui.workbench,
- org.eclipse.papyrus.cdo.core;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.emf.cdo.ui;bundle-version="[4.3.0,5.0.0)";visibility:=reexport,
- org.eclipse.emf.cdo.explorer.ui;bundle-version="[4.3.0,5.0.0)";visibility:=reexport,
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.emf.cdo.dawn;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.emf.cdo.dawn.gmf;bundle-version="[2.1.0,3.0.0)",
- org.eclipse.emf.cdo.dawn.ui;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.onefile;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.markerlistener;bundle-version="1.2.0",
- org.eclipse.papyrus.cdo.validation.problems;bundle-version="1.2.0",
- org.eclipse.papyrus.cdo.validation.problems.edit;bundle-version="1.2.0",
- org.eclipse.papyrus.editor;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.2.0",
- com.google.guava;bundle-version="11.0.0",
- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.controlmode;bundle-version="1.2.0",
- org.eclipse.ui.navigator;bundle-version="3.5.300",
- org.eclipse.emf.cdo.ui.admin;bundle-version="[4.1.200,5.0.0)",
- org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.onefile.ui;bundle-version="1.2.0"
+Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.17.0,4.0.0)",
+ org.eclipse.papyrus.infra.core.log;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.cdo.core;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.cdo.ui;bundle-version="[4.9.0,5.0.0)";visibility:=reexport,
+ org.eclipse.emf.cdo.explorer.ui;bundle-version="[4.7.0,5.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.emf.cdo.dawn;bundle-version="[2.2.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.cdo.dawn.gmf;bundle-version="[2.3.0,3.0.0)",
+ org.eclipse.emf.cdo.dawn.ui;bundle-version="[2.2.0,3.0.0)",
+ org.eclipse.papyrus.infra.emf;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.infra.onefile;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.services.markerlistener;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.cdo.validation.problems.edit;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.editor;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.services.controlmode;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.emf.cdo.ui.admin;bundle-version="[4.3.0,5.0.0)",
+ org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.ui;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.onefile.ui;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="[1.7.0,2.0.0)"
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
 Bundle-Version: 1.2.0.qualifier
@@ -57,4 +59,5 @@
 Bundle-ManifestVersion: 2
 Bundle-Description: %pluginDescription
 Bundle-SymbolicName: org.eclipse.papyrus.cdo.ui;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-11
+Automatic-Module-Name: org.eclipse.papyrus.cdo.ui
diff --git a/cdo/bundles/org.eclipse.papyrus.cdo.ui/build.properties b/cdo/bundles/org.eclipse.papyrus.cdo.ui/build.properties
index eee5432..d97da33 100755
--- a/cdo/bundles/org.eclipse.papyrus.cdo.ui/build.properties
+++ b/cdo/bundles/org.eclipse.papyrus.cdo.ui/build.properties
@@ -13,7 +13,7 @@
 ###############################################################################
 
 source.. = src/
-output.. = bin/
+output.. = target/classes
 bin.includes = META-INF/,\
                .,\
                plugin.properties,\
diff --git a/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/.classpath b/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/.classpath
index ad32c83..e491e18 100755
--- a/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/.classpath
+++ b/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/.classpath
@@ -1,7 +1,7 @@
 <?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"/>
+	<classpathentry kind="output" path="target/classes"/>  
 </classpath>
diff --git a/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/META-INF/MANIFEST.MF b/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/META-INF/MANIFEST.MF
index c13d3a2..9d5657e 100755
--- a/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/META-INF/MANIFEST.MF
+++ b/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/META-INF/MANIFEST.MF
@@ -3,15 +3,8 @@
  org.eclipse.papyrus.cdo.uml.diagram.internal.ui.handlers;x-internal:=true,
  org.eclipse.papyrus.cdo.uml.diagram.internal.ui.l10n;x-internal:=true,
  org.eclipse.papyrus.cdo.uml.diagram.internal.ui.wizards;x-internal:=true
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.cdo.core;bundle-version="1.2.0",
- org.eclipse.papyrus.cdo.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.wizards;bundle-version="1.2.0",
- com.google.guava;bundle-version="11.0.0",
- org.eclipse.emf.cdo.explorer.ui;bundle-version="4.4.0",
- org.eclipse.ui.navigator;bundle-version="3.5.500"
+Require-Bundle: org.eclipse.papyrus.cdo.ui;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.wizards;bundle-version="[4.0.0,5.0.0)"
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
 Bundle-Version: 1.2.0.qualifier
@@ -21,4 +14,5 @@
 Bundle-ManifestVersion: 2
 Bundle-Description: %pluginDescription
 Bundle-SymbolicName: org.eclipse.papyrus.cdo.uml.diagram.ui;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-11
+Automatic-Module-Name: org.eclipse.papyrus.cdo.uml.diagram.ui
diff --git a/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/build.properties b/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/build.properties
index 269d0c3..a798198 100755
--- a/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/build.properties
+++ b/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/build.properties
@@ -12,7 +12,7 @@
 #  		CEA LIST - Initial API and implementation
 ###############################################################################
 source.. = src/
-output.. = bin/
+output.. = target/classes
 bin.includes = META-INF/,\
                .,\
                plugin.properties,\
diff --git a/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/.classpath b/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/.classpath
index ad32c83..e491e18 100755
--- a/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/.classpath
+++ b/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/.classpath
@@ -1,7 +1,7 @@
 <?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"/>
+	<classpathentry kind="output" path="target/classes"/>  
 </classpath>
diff --git a/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/META-INF/MANIFEST.MF b/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/META-INF/MANIFEST.MF
index 0386bbf..8238b83 100755
--- a/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/META-INF/MANIFEST.MF
+++ b/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/META-INF/MANIFEST.MF
@@ -3,21 +3,15 @@
  org.eclipse.papyrus.cdo.uml.search.internal.ui.open;x-friends:="org.eclipse.papyrus.cdo.uml.search.ui.tests",
  org.eclipse.papyrus.cdo.uml.search.internal.ui.query;x-friends:="org.eclipse.papyrus.cdo.uml.search.ui.tests",
  org.eclipse.papyrus.cdo.uml.search.internal.ui.scope;x-friends:="org.eclipse.papyrus.cdo.uml.search.ui.tests"
-Require-Bundle: org.eclipse.core.runtime;bundle-version="3.9.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.cdo.core;bundle-version="1.2.0",
- org.eclipse.emf.cdo.common;bundle-version="[4.3.0,5.0.0)",
- org.eclipse.ui;bundle-version="3.105.0",
- org.eclipse.uml2.uml;bundle-version="4.1.0",
- org.eclipse.papyrus.uml.search.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.views.search;bundle-version="1.2.0",
- org.eclipse.search;bundle-version="3.9.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.openelement;bundle-version="1.2.0",
- org.eclipse.papyrus.cdo.ui;bundle-version="1.2.0",
- com.google.guava,
- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0"
+Require-Bundle: org.eclipse.uml2.uml;bundle-version="[5.5.0,6.0.0)",
+ org.eclipse.papyrus.uml.search.ui;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.views.search;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.search;bundle-version="[3.12.0,4.0.0)",
+ org.eclipse.papyrus.infra.emf;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.services.openelement;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.cdo.ui;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.ui;bundle-version="[3.0.0,4.0.0)"
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
 Bundle-Version: 1.2.0.qualifier
@@ -27,4 +21,5 @@
 Bundle-Activator: org.eclipse.papyrus.cdo.uml.search.internal.ui.Activator
 Bundle-Description: %pluginDescription
 Bundle-SymbolicName: org.eclipse.papyrus.cdo.uml.search.ui;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-11
+Automatic-Module-Name: org.eclipse.papyrus.cdo.uml.search.ui
diff --git a/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/build.properties b/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/build.properties
index f17769c..e47ebda 100755
--- a/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/build.properties
+++ b/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/build.properties
@@ -12,7 +12,7 @@
 #  		CEA LIST - Initial API and implementation
 ###############################################################################
 source.. = src/
-output.. = bin/
+output.. = target/classes
 bin.includes = META-INF/,\
                .,\
                plugin.properties,\
diff --git a/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/.classpath b/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/.classpath
index ad32c83..e491e18 100755
--- a/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/.classpath
+++ b/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/.classpath
@@ -1,7 +1,7 @@
 <?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"/>
+	<classpathentry kind="output" path="target/classes"/>  
 </classpath>
diff --git a/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/META-INF/MANIFEST.MF b/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/META-INF/MANIFEST.MF
index 306d7eb..2bc7c48 100755
--- a/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/META-INF/MANIFEST.MF
+++ b/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/META-INF/MANIFEST.MF
@@ -2,13 +2,10 @@
 Export-Package: org.eclipse.papyrus.cdo.uml.internal.ui;x-friends:="org.eclipse.papyrus.cdo.uml.ui.tests",
  org.eclipse.papyrus.cdo.uml.internal.ui.importsources;x-friends:="org.eclipse.papyrus.cdo.uml.ui.tests",
  org.eclipse.papyrus.cdo.uml.internal.ui.l10n;x-internal:=true
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools;bundle-version="1.2.0",
- org.eclipse.papyrus.cdo.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
- com.google.guava;bundle-version="11.0.0"
+Require-Bundle: org.eclipse.papyrus.uml.tools;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.papyrus.cdo.ui;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.widgets;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.5.0,6.0.0)"
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
 Bundle-Version: 1.2.0.qualifier
@@ -18,4 +15,5 @@
 Bundle-ManifestVersion: 2
 Bundle-Description: %pluginDescription
 Bundle-SymbolicName: org.eclipse.papyrus.cdo.uml.ui;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-11
+Automatic-Module-Name: org.eclipse.papyrus.cdo.uml.ui
diff --git a/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/build.properties b/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/build.properties
index 1400d94..6e90f07 100755
--- a/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/build.properties
+++ b/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/build.properties
@@ -12,7 +12,7 @@
 #  		CEA LIST - Initial API and implementation
 ###############################################################################
 source.. = src/
-output.. = bin/
+output.. = target/classes
 bin.includes = META-INF/,\
                .,\
                about.html,\
diff --git a/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/.classpath b/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/.classpath
index ad32c83..e491e18 100755
--- a/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/.classpath
+++ b/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/.classpath
@@ -1,7 +1,7 @@
 <?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"/>
+	<classpathentry kind="output" path="target/classes"/>  
 </classpath>
diff --git a/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/META-INF/MANIFEST.MF b/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/META-INF/MANIFEST.MF
index 70fb566..94d74b5 100755
--- a/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/META-INF/MANIFEST.MF
+++ b/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/META-INF/MANIFEST.MF
@@ -1,9 +1,6 @@
 Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.8.0,
- 4.0.0)",
- org.eclipse.papyrus.cdo.validation.problems;bundle-version="1.2.0",
- org.eclipse.emf.edit;bundle-version="[2.8.0,
- 3.0.0)";visibility:=reexport
+Require-Bundle: org.eclipse.papyrus.cdo.validation.problems;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.edit;bundle-version="[2.16.0,3.0.0)";visibility:=reexport
 Export-Package: org.eclipse.papyrus.cdo.validation.problems.edit,
  org.eclipse.papyrus.cdo.validation.problems.provider
 Bundle-Vendor: %providerName
@@ -16,4 +13,5 @@
 Bundle-ManifestVersion: 2
 Bundle-Description: %pluginDescription
 Bundle-SymbolicName: org.eclipse.papyrus.cdo.validation.problems.edit;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-11
+Automatic-Module-Name: org.eclipse.papyrus.cdo.validation.problems.edit
diff --git a/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/build.properties b/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/build.properties
index 390dcac..90f5f35 100755
--- a/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/build.properties
+++ b/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/build.properties
@@ -14,7 +14,7 @@
 
 jars.compile.order = .
 source.. = src/
-output.. = bin/
+output.. = target/classes
 
 bin.includes = .,\
                icons/,\
diff --git a/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/.classpath b/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/.classpath
index ad32c83..e491e18 100755
--- a/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/.classpath
+++ b/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/.classpath
@@ -1,7 +1,7 @@
 <?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"/>
+	<classpathentry kind="output" path="target/classes"/>  
 </classpath>
diff --git a/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/META-INF/MANIFEST.MF b/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/META-INF/MANIFEST.MF
index fce0fbe..2365d26 100755
--- a/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/META-INF/MANIFEST.MF
+++ b/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/META-INF/MANIFEST.MF
@@ -1,10 +1,5 @@
 Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.8.0,
- 4.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.8.0,
- 3.0.0)";visibility:=reexport,
- org.eclipse.emf.cdo;bundle-version="[4.2.0,
- 5.0.0)";visibility:=reexport
+Require-Bundle: org.eclipse.emf.cdo;bundle-version="[4.12.0,5.0.0)";visibility:=reexport
 Export-Package: org.eclipse.papyrus.cdo.validation.problems,
  org.eclipse.papyrus.cdo.validation.problems.impl,
  org.eclipse.papyrus.cdo.validation.problems.internal;x-internal:=true,
@@ -19,4 +14,5 @@
 Bundle-ManifestVersion: 2
 Bundle-Description: %pluginDescription
 Bundle-SymbolicName: org.eclipse.papyrus.cdo.validation.problems;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-11
+Automatic-Module-Name: org.eclipse.papyrus.cdo.validation.problems
diff --git a/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/build.properties b/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/build.properties
index 38e9b0f..2cd817b 100755
--- a/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/build.properties
+++ b/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/build.properties
@@ -13,10 +13,9 @@
 ###############################################################################
 
 
-jre.compilation.profile = JavaSE-1.6
 jars.compile.order = .
 source.. = src/
-output.. = bin/
+output.. = target/classes
 
 bin.includes = .,\
                model/,\
diff --git a/cdo/bundles/org.eclipse.papyrus.infra.core.architecture.cdo/.classpath b/cdo/bundles/org.eclipse.papyrus.infra.core.architecture.cdo/.classpath
index 22f3064..1097f4f 100644
--- a/cdo/bundles/org.eclipse.papyrus.infra.core.architecture.cdo/.classpath
+++ b/cdo/bundles/org.eclipse.papyrus.infra.core.architecture.cdo/.classpath
@@ -1,7 +1,7 @@
 <?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"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="output" path="target/classes"/>  
 </classpath>
diff --git a/cdo/bundles/org.eclipse.papyrus.infra.core.architecture.cdo/META-INF/MANIFEST.MF b/cdo/bundles/org.eclipse.papyrus.infra.core.architecture.cdo/META-INF/MANIFEST.MF
index df048b7..6d2f7df 100644
--- a/cdo/bundles/org.eclipse.papyrus.infra.core.architecture.cdo/META-INF/MANIFEST.MF
+++ b/cdo/bundles/org.eclipse.papyrus.infra.core.architecture.cdo/META-INF/MANIFEST.MF
@@ -7,15 +7,12 @@
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: org.eclipse.papyrus.infra.core.architecture.cdo
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecore.xmi;bundle-version="[2.12.0,3.0.0)",
- org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.14.0,4.0.0)",
- org.eclipse.papyrus.infra.types;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
- org.eclipse.papyrus.emf;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.papyrus.infra.core.architecture;bundle-version="[2.1.100,3.0.0)"
+Require-Bundle: org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.jdt.core;bundle-version="[3.23.0,4.0.0)",
+ org.eclipse.papyrus.infra.types;bundle-version="[5.0.0,6.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.emf;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.emf.cdo;bundle-version="[4.12.0,5.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.core.architecture;bundle-version="[3.0.0,4.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
diff --git a/cdo/bundles/org.eclipse.papyrus.infra.core.architecture.cdo/build.properties b/cdo/bundles/org.eclipse.papyrus.infra.core.architecture.cdo/build.properties
index 543fdec..8d657a4 100644
--- a/cdo/bundles/org.eclipse.papyrus.infra.core.architecture.cdo/build.properties
+++ b/cdo/bundles/org.eclipse.papyrus.infra.core.architecture.cdo/build.properties
@@ -20,4 +20,4 @@
                about.html
 jars.compile.order = .
 source.. = src/
-output.. = bin/
+output.. = target/classes
diff --git a/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/.classpath b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/.classpath
index eca7bdb..e491e18 100644
--- a/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/.classpath
+++ b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/.classpath
@@ -1,7 +1,7 @@
 <?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"/>
+	<classpathentry kind="output" path="target/classes"/>  
 </classpath>
diff --git a/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/.settings/org.eclipse.jdt.core.prefs b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/.settings/org.eclipse.jdt.core.prefs
index 1255b32..4c774ea 100644
--- a/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/.settings/org.eclipse.jdt.core.prefs
+++ b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/.settings/org.eclipse.jdt.core.prefs
@@ -9,8 +9,8 @@
 org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 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.APILeak=warning
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
@@ -103,7 +103,7 @@
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=11
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff --git a/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/META-INF/MANIFEST.MF b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/META-INF/MANIFEST.MF
index c536aeb..aa84339 100644
--- a/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/META-INF/MANIFEST.MF
+++ b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/META-INF/MANIFEST.MF
@@ -6,13 +6,15 @@
 Bundle-Name: %pluginName
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.css.cdo;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.e4.ui.css.core;bundle-version="[0.11.0,1.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="2.2.1",
- org.eclipse.emf.cdo;bundle-version="4.6.0",
- org.eclipse.emf.cdo.ecore;bundle-version="1.0.0",
- org.eclipse.emf.cdo.gmf.notation;bundle-version="1.10.0"
-Import-Package: com.google.common.collect;version="21.0.0"
+Bundle-RequiredExecutionEnvironment: JavaSE-11
+Require-Bundle: org.eclipse.e4.ui.css.core;bundle-version="[0.12.0,1.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.emf.cdo.ecore;bundle-version="[1.1.0,2.0.0)",
+ org.eclipse.emf.cdo.gmf.notation;bundle-version="[1.10.0,2.0.0)";visibility:=reexport,
+ org.eclipse.gmf.runtime.notation;bundle-version="[1.10.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.gmfdiag.css.model;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.core.databinding.observable;bundle-version="[1.10.0,2.0.0)"
+Import-Package: com.google.common.collect;version="[27.1.0,28.0.0)"
 Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.css.cdo
 Export-Package: org.eclipse.papyrus.infra.gmfdiag.css.cdo;version="2.2.1",
  org.eclipse.papyrus.infra.gmfdiag.css.cdo.factory;version="2.2.1",
diff --git a/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/build.properties b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/build.properties
index 26318c4..548acf4 100644
--- a/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/build.properties
+++ b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/build.properties
@@ -1,5 +1,5 @@
 source.. = src/
-output.. = bin/
+output.. = target/classes
 bin.includes = META-INF/,\
                .,\
                about.html,\
diff --git a/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/.classpath b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/.classpath
index 26e67d6..9600a15 100644
--- a/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/.classpath
+++ b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/.classpath
@@ -1,7 +1,7 @@
 <?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-gen"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="output" path="target/classes"/>  
 </classpath>
diff --git a/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/.settings/org.eclipse.jdt.core.prefs b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/.settings/org.eclipse.jdt.core.prefs
index 8ddd9a8..1cf0cc7 100644
--- a/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/.settings/org.eclipse.jdt.core.prefs
+++ b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/.settings/org.eclipse.jdt.core.prefs
@@ -1,15 +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=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.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=11
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff --git a/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/META-INF/MANIFEST.MF b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/META-INF/MANIFEST.MF
index 2a9ec79..902d4ba 100644
--- a/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/META-INF/MANIFEST.MF
+++ b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/META-INF/MANIFEST.MF
@@ -6,12 +6,10 @@
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: org.eclipse.papyrus.infra.gmfdiag.style.cdo.impl;version="1.0.0"
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.gmfdiag.style;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.emf.cdo;bundle-version="[4.6.0,5.0.0)",
- org.eclipse.emf.cdo.gmf.notation;bundle-version="1.10.0",
- org.eclipse.gmf.runtime.notation;bundle-version="1.10.0"
+Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.style;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.emf.cdo.gmf.notation;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.gmf.runtime.notation;bundle-version="[1.10.0,2.0.0)"
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.style.cdo
diff --git a/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/build.properties b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/build.properties
index 32c48dd..650b18b 100644
--- a/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/build.properties
+++ b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/build.properties
@@ -19,7 +19,7 @@
                about.html
 jars.compile.order = .
 source.. = src-gen/
-output.. = bin/
+output.. = target/classes
 src.includes = Migrate gmfdiag.style to CDO.launch,\
                migrate.ant,\
                pom.xml
diff --git a/cdo/bundles/org.eclipse.papyrus.infra.nattable.model.cdo/.classpath b/cdo/bundles/org.eclipse.papyrus.infra.nattable.model.cdo/.classpath
index ad32c83..e491e18 100644
--- a/cdo/bundles/org.eclipse.papyrus.infra.nattable.model.cdo/.classpath
+++ b/cdo/bundles/org.eclipse.papyrus.infra.nattable.model.cdo/.classpath
@@ -1,7 +1,7 @@
 <?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"/>
+	<classpathentry kind="output" path="target/classes"/>  
 </classpath>
diff --git a/cdo/bundles/org.eclipse.papyrus.infra.nattable.model.cdo/META-INF/MANIFEST.MF b/cdo/bundles/org.eclipse.papyrus.infra.nattable.model.cdo/META-INF/MANIFEST.MF
index a8d997f..32abadb 100644
--- a/cdo/bundles/org.eclipse.papyrus.infra.nattable.model.cdo/META-INF/MANIFEST.MF
+++ b/cdo/bundles/org.eclipse.papyrus.infra.nattable.model.cdo/META-INF/MANIFEST.MF
@@ -1,12 +1,9 @@
 Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
- org.eclipse.papyrus.infra.types;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
- org.eclipse.papyrus.infra.emf.expressions;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
- org.eclipse.papyrus.emf;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.emf.cdo.ecore;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.papyrus.infra.nattable.model;bundle-version="[4.2.0,5.0.0)"
+Require-Bundle: org.eclipse.papyrus.infra.types;bundle-version="[5.0.0,6.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.emf.expressions;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.emf;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.emf.cdo.ecore;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.nattable.model;bundle-version="[5.0.0,6.0.0)";visibility:=reexport
 Export-Package: org.eclipse.papyrus.infra.nattable.model.cdo,
  org.eclipse.papyrus.infra.nattable.model.cdo.nattable.impl,
  org.eclipse.papyrus.infra.nattable.model.cdo.nattable.nattableaxis.impl,
@@ -30,5 +27,5 @@
 Bundle-ManifestVersion: 2
 Bundle-Description: %pluginDescription
 Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.model.cdo;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Automatic-Module-Name: org.eclipse.papyrus.infra.nattable.model.cdo
diff --git a/cdo/bundles/org.eclipse.papyrus.infra.nattable.model.cdo/build.properties b/cdo/bundles/org.eclipse.papyrus.infra.nattable.model.cdo/build.properties
index 7663594..d97960b 100644
--- a/cdo/bundles/org.eclipse.papyrus.infra.nattable.model.cdo/build.properties
+++ b/cdo/bundles/org.eclipse.papyrus.infra.nattable.model.cdo/build.properties
@@ -19,5 +19,5 @@
                about.html
 jars.compile.order = .
 source.. = src/
-output.. = bin/
+output.. = target/classes
 src.includes = about.html
diff --git a/cdo/bundles/uml/org.eclipse.uml2.uml.cdo/.classpath b/cdo/bundles/uml/org.eclipse.uml2.uml.cdo/.classpath
index 798048d..bc57d23 100644
--- a/cdo/bundles/uml/org.eclipse.uml2.uml.cdo/.classpath
+++ b/cdo/bundles/uml/org.eclipse.uml2.uml.cdo/.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/J2SE-1.5"/>
+	<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="target/classes"/>
diff --git a/cdo/bundles/uml/org.eclipse.uml2.uml.cdo/.settings/org.eclipse.jdt.core.prefs b/cdo/bundles/uml/org.eclipse.uml2.uml.cdo/.settings/org.eclipse.jdt.core.prefs
index be81bc3..30c444a 100644
--- a/cdo/bundles/uml/org.eclipse.uml2.uml.cdo/.settings/org.eclipse.jdt.core.prefs
+++ b/cdo/bundles/uml/org.eclipse.uml2.uml.cdo/.settings/org.eclipse.jdt.core.prefs
@@ -19,8 +19,8 @@
 org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.problem.APILeak=warning
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
@@ -32,6 +32,7 @@
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
 org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
 org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -77,6 +78,7 @@
 org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
 org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
 org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
 org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
 org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -114,7 +116,8 @@
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
diff --git a/cdo/bundles/uml/org.eclipse.uml2.uml.cdo/META-INF/MANIFEST.MF b/cdo/bundles/uml/org.eclipse.uml2.uml.cdo/META-INF/MANIFEST.MF
index 9520e97..ebe3cfc 100755
--- a/cdo/bundles/uml/org.eclipse.uml2.uml.cdo/META-INF/MANIFEST.MF
+++ b/cdo/bundles/uml/org.eclipse.uml2.uml.cdo/META-INF/MANIFEST.MF
@@ -7,18 +7,11 @@
 Bundle-Activator: org.eclipse.uml2.uml.cdo.internal.UMLCDOPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: org.eclipse.uml2.uml.cdo.internal.impl;x-friends:="org.eclipse.uml2.uml.cdo.tests",
  org.eclipse.uml2.uml.cdo.internal.util;x-friends:="org.eclipse.uml2.uml.cdo.tests"
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";resolution:=optional;x-installation:=greedy,
- org.eclipse.emf.ecore;bundle-version="[2.14.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecore.xmi;bundle-version="[2.14.0,3.0.0)";visibility:=reexport,
- org.eclipse.uml2.common;bundle-version="[2.4.0,3.0.0)";visibility:=reexport,
- org.eclipse.uml2.types;bundle-version="[2.4.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.mapping.ecore2xml;bundle-version="[2.9.0,3.0.0)";visibility:=reexport,
- org.eclipse.uml2.uml;bundle-version="[5.5.0,5.6.0)";visibility:=reexport,
- org.eclipse.emf.cdo;bundle-version="[4.5.0,5.0.0)",
- org.eclipse.emf.cdo.ecore;bundle-version="[1.0.0,2.0.0)"
+Require-Bundle: org.eclipse.uml2.uml;bundle-version="[5.5.0,6.0.0)";visibility:=reexport,
+ org.eclipse.emf.cdo.ecore;bundle-version="[1.1.0,2.0.0)"
 Eclipse-LazyStart: true
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.uml2.uml.cdo
diff --git a/cdo/bundles/uml/org.eclipse.uml2.uml.cdo/UML Explorer.launch b/cdo/bundles/uml/org.eclipse.uml2.uml.cdo/UML Explorer.launch
index 9e5ad9d..d5ebb10 100644
--- a/cdo/bundles/uml/org.eclipse.uml2.uml.cdo/UML Explorer.launch
+++ b/cdo/bundles/uml/org.eclipse.uml2.uml.cdo/UML Explorer.launch
@@ -18,7 +18,7 @@
 <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
 </listAttribute>
 <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.eclipse.emf.cdo.ui.team.history.test=false"/>
diff --git a/cdo/bundles/uml/org.eclipse.uml2.uml.profile.standard.cdo/.classpath b/cdo/bundles/uml/org.eclipse.uml2.uml.profile.standard.cdo/.classpath
index 304e861..1097f4f 100644
--- a/cdo/bundles/uml/org.eclipse.uml2.uml.profile.standard.cdo/.classpath
+++ b/cdo/bundles/uml/org.eclipse.uml2.uml.profile.standard.cdo/.classpath
@@ -1,7 +1,7 @@
 <?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/J2SE-1.5"/>
+	<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"/>
+	<classpathentry kind="output" path="target/classes"/>  
 </classpath>
diff --git a/cdo/bundles/uml/org.eclipse.uml2.uml.profile.standard.cdo/META-INF/MANIFEST.MF b/cdo/bundles/uml/org.eclipse.uml2.uml.profile.standard.cdo/META-INF/MANIFEST.MF
index bd0d26e..b1108fb 100644
--- a/cdo/bundles/uml/org.eclipse.uml2.uml.profile.standard.cdo/META-INF/MANIFEST.MF
+++ b/cdo/bundles/uml/org.eclipse.uml2.uml.profile.standard.cdo/META-INF/MANIFEST.MF
@@ -6,10 +6,9 @@
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: org.eclipse.uml2.uml.profile.standard.cdo
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";resolution:=optional;x-installation:=greedy,
- org.eclipse.uml2.uml.profile.standard;bundle-version="1.5.0";visibility:=reexport,
- org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)"
+Require-Bundle: org.eclipse.uml2.uml.profile.standard;bundle-version="[1.5.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.cdo;bundle-version="[4.12.0,5.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.uml2.uml.profile.standard.cdo
diff --git a/cdo/bundles/uml/org.eclipse.uml2.uml.profile.standard.cdo/build.properties b/cdo/bundles/uml/org.eclipse.uml2.uml.profile.standard.cdo/build.properties
index 8c22674..ef99c13 100644
--- a/cdo/bundles/uml/org.eclipse.uml2.uml.profile.standard.cdo/build.properties
+++ b/cdo/bundles/uml/org.eclipse.uml2.uml.profile.standard.cdo/build.properties
@@ -9,7 +9,7 @@
 #   Kenn Hussey - 535301
 #
 source.. = src/
-output.. = bin/
+output.. = target/classes
 bin.includes = about.html,\
                plugin.*,\
                .,\
diff --git a/cdo/pom.xml b/cdo/pom.xml
index 4156b7c..aed75f6 100755
--- a/cdo/pom.xml
+++ b/cdo/pom.xml
@@ -12,18 +12,15 @@
 	<name>Collaborative Modeling - CDO</name>
 
 	<properties>
-		<tycho-version>1.6.0</tycho-version>
-		<tychoExtrasVersion>1.6.0</tychoExtrasVersion>
+		<tycho-version>2.1.0</tycho-version>
+		<tychoExtrasVersion>2.1.0</tychoExtrasVersion>
 		<jarSignerVersion>1.1.5</jarSignerVersion>
-		<findbugs.version>3.0.1</findbugs.version>
-		<xtext.version>2.16.0</xtext.version>
-		<jboss.version>1.3.0</jboss.version>
-		<jacoco.version>0.8.5</jacoco.version>
+		<xtext.version>2.23.0</xtext.version>
+		<jacoco.version>0.8.6</jacoco.version>
 		<testConfig>CI_TESTS_CONFIG</testConfig>
 		<test.argLine>-Xms512m -Xmx2048m -XX:SoftRefLRUPolicyMSPerMB=100
 		</test.argLine>
-		<java.source>1.8</java.source>
-		<java.target>1.8</java.target>
+		<java.release>11</java.release>
 		<mylyn.wikitext.version>3.0.29</mylyn.wikitext.version>
 
 		<targetPlatform.groupID>org.eclipse.papyrus.cdo
@@ -61,10 +58,6 @@
 			<!-- url>https://repo.eclipse.org/content/repositories/mylyn-releases/</url -->
 			<url>https://repo.eclipse.org/content/repositories/mylyn/</url>
 		</pluginRepository>
-		<pluginRepository>
-			<id>org.jboss.tools.tycho-plugins</id>
-			<url>https://repository.jboss.org/</url>
-		</pluginRepository>
 	</pluginRepositories>
 
 	<repositories>
@@ -204,8 +197,7 @@
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-compiler-plugin</artifactId>
 				<configuration>
-					<source>${java.source}</source>
-					<target>${java.target}</target>
+					<release>${java.release}</release>
 					<optimize>true</optimize>
 					<showWarnings>true</showWarnings>
 				</configuration>
diff --git a/cdo/releng/targetplatforms/org.eclipse.papyrus.cdo.targetplatform/org.eclipse.papyrus.cdo.targetplatform.target b/cdo/releng/targetplatforms/org.eclipse.papyrus.cdo.targetplatform/org.eclipse.papyrus.cdo.targetplatform.target
index bab2b9d..c58e3eb 100755
--- a/cdo/releng/targetplatforms/org.eclipse.papyrus.cdo.targetplatform/org.eclipse.papyrus.cdo.targetplatform.target
+++ b/cdo/releng/targetplatforms/org.eclipse.papyrus.cdo.targetplatform/org.eclipse.papyrus.cdo.targetplatform.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="CollaborativeModeling CDO - Papyrus Nightly" sequenceNumber="1599815269">
+<target name="CollaborativeModeling CDO - Papyrus Nightly" sequenceNumber="1605544246">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
@@ -11,10 +11,10 @@
       <repository id="papyrus" location="https://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/master/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.sdk.feature.group" version="4.16.0.v20200604-0951"/>
-      <unit id="org.eclipse.emf.sdk.feature.group" version="2.22.0.v20200519-1135"/>
+      <unit id="org.eclipse.sdk.feature.group" version="4.18.0.v20201028-2203"/>
+      <unit id="org.eclipse.emf.sdk.feature.group" version="2.24.0.v20200917-1439"/>
       <unit id="org.eclipse.uml2.sdk.feature.group" version="5.5.1.v20200302-1312"/>
-      <repository id="eclipse" location="https://download.eclipse.org/releases/2020-06/"/>
+      <repository id="eclipse" location="https://download.eclipse.org/releases/2020-12/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.emf.cdo.explorer" version="0.0.0"/>
diff --git a/cdo/releng/targetplatforms/org.eclipse.papyrus.cdo.targetplatform/org.eclipse.papyrus.cdo.targetplatform.tpd b/cdo/releng/targetplatforms/org.eclipse.papyrus.cdo.targetplatform/org.eclipse.papyrus.cdo.targetplatform.tpd
index db124ae..91a2dd3 100755
--- a/cdo/releng/targetplatforms/org.eclipse.papyrus.cdo.targetplatform/org.eclipse.papyrus.cdo.targetplatform.tpd
+++ b/cdo/releng/targetplatforms/org.eclipse.papyrus.cdo.targetplatform/org.eclipse.papyrus.cdo.targetplatform.tpd
@@ -12,7 +12,7 @@
  org.eclipse.papyrus.toolsmiths.feature.feature.group lazy
 }
 
-location "https://download.eclipse.org/releases/2020-06/" eclipse {
+location "https://download.eclipse.org/releases/2020-12/" eclipse {
  org.eclipse.sdk.feature.group
  org.eclipse.emf.sdk.feature.group
  org.eclipse.uml2.sdk.feature.group
diff --git a/cdo/tests/org.eclipse.papyrus.cdo.core.tests/.classpath b/cdo/tests/org.eclipse.papyrus.cdo.core.tests/.classpath
index ad32c83..e491e18 100755
--- a/cdo/tests/org.eclipse.papyrus.cdo.core.tests/.classpath
+++ b/cdo/tests/org.eclipse.papyrus.cdo.core.tests/.classpath
@@ -1,7 +1,7 @@
 <?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"/>
+	<classpathentry kind="output" path="target/classes"/>  
 </classpath>
diff --git a/cdo/tests/org.eclipse.papyrus.cdo.core.tests/META-INF/MANIFEST.MF b/cdo/tests/org.eclipse.papyrus.cdo.core.tests/META-INF/MANIFEST.MF
index 6869c6c..fd215a4 100755
--- a/cdo/tests/org.eclipse.papyrus.cdo.core.tests/META-INF/MANIFEST.MF
+++ b/cdo/tests/org.eclipse.papyrus.cdo.core.tests/META-INF/MANIFEST.MF
@@ -1,19 +1,19 @@
 Manifest-Version: 1.0
-Require-Bundle: org.eclipse.papyrus.cdo.core;bundle-version="1.2.0";visibility:=reexport,
- org.junit;bundle-version="4.11.0";visibility:=reexport,
- org.eclipse.uml2.uml;bundle-version="4.0.0";visibility:=reexport,
- org.eclipse.emf.cdo.server.net4j;bundle-version="[4.1.0,5.0.0)",
- org.eclipse.emf.cdo.net4j;bundle-version="[4.1.0,5.0.0)",
- org.eclipse.net4j.jvm;bundle-version="[4.1.0,5.0.0)",
- org.eclipse.papyrus.uml.tools;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.core.expressions;bundle-version="3.4.0",
- org.eclipse.papyrus.infra.services.controlmode;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.resourceloading;bundle-version="1.2.0",
- org.eclipse.papyrus.junit.utils;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.papyrus.junit.framework;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0"
+Require-Bundle: org.eclipse.papyrus.cdo.core;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.junit;bundle-version="[4.13.0,5.0.0)";visibility:=reexport,
+ org.eclipse.uml2.uml;bundle-version="[5.5.0,6.0.0)";visibility:=reexport,
+ org.eclipse.emf.cdo.server.net4j;bundle-version="[4.3.0,5.0.0)",
+ org.eclipse.net4j.jvm;bundle-version="[4.2.0,5.0.0)",
+ org.eclipse.papyrus.uml.tools;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.core.expressions;bundle-version="[3.7.0,4.0.0)",
+ org.eclipse.papyrus.infra.services.controlmode;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.emf;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.junit.utils;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.junit.framework;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.gmf.runtime.common.core;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.papyrus.infra.core.log;bundle-version="[2.0.0,3.0.0)"
 Export-Package: org.eclipse.papyrus.cdo.core.resource.tests,
  org.eclipse.papyrus.cdo.core.tests,
  org.eclipse.papyrus.cdo.core.util.tests,
@@ -29,7 +29,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Description: %pluginDescription
 Bundle-SymbolicName: org.eclipse.papyrus.cdo.core.tests
-Import-Package: com.google.common.base;version="10.0.1",
- com.google.common.collect;version="10.0.1",
- com.google.common.io;version="10.0.1"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Import-Package: com.google.common.base;version="[27.1.0,28.0.0)",
+ com.google.common.collect;version="[27.1.0,28.0.0)",
+ com.google.common.io;version="[27.1.0,28.0.0)"
+Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/cdo/tests/org.eclipse.papyrus.cdo.core.tests/Papyrus CDO Core Tests.launch b/cdo/tests/org.eclipse.papyrus.cdo.core.tests/Papyrus CDO Core Tests.launch
index b095114..a101020 100755
--- a/cdo/tests/org.eclipse.papyrus.cdo.core.tests/Papyrus CDO Core Tests.launch
+++ b/cdo/tests/org.eclipse.papyrus.cdo.core.tests/Papyrus CDO Core Tests.launch
@@ -23,7 +23,7 @@
 <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
 <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
 <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.cdo.core.tests.AllTests"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.cdo.core.tests"/>
diff --git a/cdo/tests/org.eclipse.papyrus.cdo.core.tests/build.properties b/cdo/tests/org.eclipse.papyrus.cdo.core.tests/build.properties
index b46ca58..1267bfb 100755
--- a/cdo/tests/org.eclipse.papyrus.cdo.core.tests/build.properties
+++ b/cdo/tests/org.eclipse.papyrus.cdo.core.tests/build.properties
@@ -12,7 +12,7 @@
 #  		CEA LIST - Initial API and implementation
 ###############################################################################
 source.. = src/
-output.. = bin/
+output.. = target/classes
 bin.includes = META-INF/,\
                .,\
                plugin.properties,\
diff --git a/cdo/tests/org.eclipse.papyrus.cdo.tests/.classpath b/cdo/tests/org.eclipse.papyrus.cdo.tests/.classpath
index ad32c83..e491e18 100755
--- a/cdo/tests/org.eclipse.papyrus.cdo.tests/.classpath
+++ b/cdo/tests/org.eclipse.papyrus.cdo.tests/.classpath
@@ -1,7 +1,7 @@
 <?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"/>
+	<classpathentry kind="output" path="target/classes"/>  
 </classpath>
diff --git a/cdo/tests/org.eclipse.papyrus.cdo.tests/META-INF/MANIFEST.MF b/cdo/tests/org.eclipse.papyrus.cdo.tests/META-INF/MANIFEST.MF
index 3c6ff0b..987c8c5 100755
--- a/cdo/tests/org.eclipse.papyrus.cdo.tests/META-INF/MANIFEST.MF
+++ b/cdo/tests/org.eclipse.papyrus.cdo.tests/META-INF/MANIFEST.MF
@@ -1,9 +1,8 @@
 Manifest-Version: 1.0
-Require-Bundle: org.eclipse.papyrus.cdo.core.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.cdo.ui.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.cdo.validation.problems.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.cdo.uml.ui.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.cdo.uml.search.ui.tests;bundle-version="1.2.0"
+Require-Bundle: org.eclipse.papyrus.cdo.ui.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.cdo.validation.problems.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.cdo.uml.ui.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.cdo.uml.search.ui.tests;bundle-version="[1.2.0,2.0.0)"
 Export-Package: org.eclipse.papyrus.cdo.tests
 Bundle-Vendor: %providerName
 Bundle-Version: 1.2.0.qualifier
@@ -12,4 +11,4 @@
 Bundle-ManifestVersion: 2
 Bundle-Description: %pluginDescription
 Bundle-SymbolicName: org.eclipse.papyrus.cdo.tests
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/cdo/tests/org.eclipse.papyrus.cdo.tests/Papyrus All CDO Tests.launch b/cdo/tests/org.eclipse.papyrus.cdo.tests/Papyrus All CDO Tests.launch
index d112125..5747f2f 100755
--- a/cdo/tests/org.eclipse.papyrus.cdo.tests/Papyrus All CDO Tests.launch
+++ b/cdo/tests/org.eclipse.papyrus.cdo.tests/Papyrus All CDO Tests.launch
@@ -35,7 +35,7 @@
 <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
 <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
 <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.cdo.tests.AllTests"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.cdo.tests"/>
diff --git a/cdo/tests/org.eclipse.papyrus.cdo.tests/build.properties b/cdo/tests/org.eclipse.papyrus.cdo.tests/build.properties
index 19577a0..e8aea47 100755
--- a/cdo/tests/org.eclipse.papyrus.cdo.tests/build.properties
+++ b/cdo/tests/org.eclipse.papyrus.cdo.tests/build.properties
@@ -12,7 +12,7 @@
 #  		CEA LIST - Initial API and implementation
 ###############################################################################
 source.. = src/
-output.. = bin/
+output.. = target/classes
 bin.includes = META-INF/,\
                .,\
                about.html,\
diff --git a/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/.classpath b/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/.classpath
index ad32c83..e491e18 100755
--- a/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/.classpath
+++ b/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/.classpath
@@ -1,7 +1,7 @@
 <?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"/>
+	<classpathentry kind="output" path="target/classes"/>  
 </classpath>
diff --git a/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/META-INF/MANIFEST.MF b/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/META-INF/MANIFEST.MF
index aa54f65..c667a3a 100755
--- a/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/META-INF/MANIFEST.MF
+++ b/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/META-INF/MANIFEST.MF
@@ -1,27 +1,19 @@
 Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.ui.ide;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.ui.workbench,
- org.eclipse.papyrus.cdo.core;bundle-version="1.2.0",
- org.eclipse.emf.cdo.ui;bundle-version="[4.2.0,5.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.emf.cdo.dawn;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.emf.cdo.dawn.gmf;bundle-version="[2.1.0,3.0.0)",
- org.eclipse.emf.cdo.dawn.ui;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.cdo.core.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.cdo.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.validation;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.markerlistener;bundle-version="1.2.0",
- org.eclipse.papyrus.cdo.validation.problems;bundle-version="1.2.0",
- org.eclipse.papyrus.cdo.validation.problems.edit;bundle-version="1.2.0",
- org.eclipse.emf.cdo.server.ocl;bundle-version="4.2.0",
- org.eclipse.papyrus.junit.utils;bundle-version="1.2.0",
- org.eclipse.papyrus.junit.framework;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0"
+Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.17.0,4.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.emf.cdo.dawn.gmf;bundle-version="[2.3.0,3.0.0)",
+ org.eclipse.emf.cdo.dawn.ui;bundle-version="[2.2.0,3.0.0)",
+ org.eclipse.papyrus.infra.emf;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.cdo.core.tests;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.cdo.ui;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.services.validation;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.infra.services.markerlistener;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.cdo.validation.problems.edit;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.emf.cdo.server.ocl;bundle-version="[4.3.0,5.0.0)",
+ org.eclipse.papyrus.infra.ui;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
+ org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="[1.7.0,2.0.0)";visibility:=reexport
 Export-Package: org.eclipse.papyrus.cdo.internal.ui.editors.tests;x-internal:=true,
  org.eclipse.papyrus.cdo.internal.ui.markers.tests;x-internal:=true,
  org.eclipse.papyrus.cdo.internal.ui.views.tests;x-internal:=true,
@@ -33,7 +25,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Description: %pluginDescription
 Bundle-SymbolicName: org.eclipse.papyrus.cdo.ui.tests;singleton:=true
-Import-Package: com.google.common.base;version="10.0.1",
- com.google.common.cache;version="10.0.1",
- com.google.common.collect;version="10.0.1"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Import-Package: com.google.common.base;version="[27.1.0,28.0.0)",
+ com.google.common.cache;version="[27.1.0,28.0.0)",
+ com.google.common.collect;version="[27.1.0,28.0.0)"
+Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/Papyrus CDO UI Tests.launch b/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/Papyrus CDO UI Tests.launch
index c58be3f..29d72d6 100755
--- a/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/Papyrus CDO UI Tests.launch
+++ b/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/Papyrus CDO UI Tests.launch
@@ -24,7 +24,7 @@
 <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
 <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
 <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.cdo.ui.tests.AllTests"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.cdo.ui.tests"/>
diff --git a/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/build.properties b/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/build.properties
index 8919c34..e195756 100755
--- a/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/build.properties
+++ b/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/build.properties
@@ -12,7 +12,7 @@
 #  		CEA LIST - Initial API and implementation
 ###############################################################################
 source.. = src/
-output.. = bin/
+output.. = target/classes
 bin.includes = META-INF/,\
                .,\
                plugin.properties,\
diff --git a/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/.classpath b/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/.classpath
index ad32c83..e491e18 100755
--- a/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/.classpath
+++ b/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/.classpath
@@ -1,7 +1,7 @@
 <?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"/>
+	<classpathentry kind="output" path="target/classes"/>  
 </classpath>
diff --git a/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/META-INF/MANIFEST.MF b/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/META-INF/MANIFEST.MF
index 6d0eaec..e632819 100755
--- a/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/META-INF/MANIFEST.MF
+++ b/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/META-INF/MANIFEST.MF
@@ -1,13 +1,11 @@
 Manifest-Version: 1.0
-Require-Bundle: org.eclipse.papyrus.cdo.core.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.cdo.uml.search.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.search.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.views.search;bundle-version="1.2.0",
- org.eclipse.ui;bundle-version="3.105.0",
- org.eclipse.papyrus.cdo.ui;bundle-version="1.2.0",
- org.eclipse.search;bundle-version="3.9.0",
- org.eclipse.emf.cdo.server.ocl;bundle-version="4.2.0",
- org.eclipse.papyrus.junit.framework;bundle-version="1.2.0"
+Require-Bundle: org.eclipse.papyrus.cdo.core.tests;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.cdo.uml.search.ui;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.search.ui;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.views.search;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.cdo.ui;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.search;bundle-version="[3.12.0,4.0.0)";visibility:=reexport,
+ org.eclipse.emf.cdo.server.ocl;bundle-version="[4.3.0,5.0.0)"
 Export-Package: org.eclipse.papyrus.cdo.uml.search.ui.tests
 Bundle-Vendor: %providerName
 Bundle-Version: 1.2.0.qualifier
@@ -16,6 +14,6 @@
 Bundle-ManifestVersion: 2
 Bundle-Description: %pluginDescription
 Bundle-SymbolicName: org.eclipse.papyrus.cdo.uml.search.ui.tests
-Import-Package: com.google.common.base;version="10.0.1",
- com.google.common.collect;version="10.0.1"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Import-Package: com.google.common.base;version="[27.1.0,28.0.0)",
+ com.google.common.collect;version="[27.1.0,28.0.0)"
+Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/Papyrus CDO Search UI Tests.launch b/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/Papyrus CDO Search UI Tests.launch
index 6873d8e..a99dfe2 100755
--- a/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/Papyrus CDO Search UI Tests.launch
+++ b/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/Papyrus CDO Search UI Tests.launch
@@ -24,7 +24,7 @@
 <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
 <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
 <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.cdo.uml.search.ui.tests.AllTests"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.cdo.uml.search.ui.tests"/>
diff --git a/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/build.properties b/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/build.properties
index b47b324..0ae3ad9 100755
--- a/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/build.properties
+++ b/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/build.properties
@@ -12,7 +12,7 @@
 #  		CEA LIST - Initial API and implementation
 ###############################################################################
 source.. = src/
-output.. = bin/
+output.. = target/classes
 bin.includes = META-INF/,\
                .,\
                plugin.properties,\
diff --git a/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/.classpath b/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/.classpath
index ad32c83..e491e18 100755
--- a/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/.classpath
+++ b/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/.classpath
@@ -1,7 +1,7 @@
 <?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"/>
+	<classpathentry kind="output" path="target/classes"/>  
 </classpath>
diff --git a/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/META-INF/MANIFEST.MF b/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/META-INF/MANIFEST.MF
index e852f75..e5494d5 100755
--- a/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/META-INF/MANIFEST.MF
+++ b/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/META-INF/MANIFEST.MF
@@ -1,15 +1,11 @@
 Manifest-Version: 1.0
-Require-Bundle: org.junit;bundle-version="4.10.0",
- org.eclipse.papyrus.cdo.core.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.cdo.ui.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.cdo.uml.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools;bundle-version="1.2.0",
- org.eclipse.ui;bundle-version="3.100.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
- org.eclipse.papyrus.cdo.ui;bundle-version="1.2.0",
- org.eclipse.emf.cdo.server.ocl;bundle-version="4.2.0",
- org.eclipse.papyrus.junit.framework;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0"
+Require-Bundle: org.eclipse.papyrus.cdo.ui.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.cdo.uml.ui;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.tools;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.papyrus.infra.widgets;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.cdo.ui;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.emf.cdo.server.ocl;bundle-version="[4.3.0,5.0.0)",
+ org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="[2.0.0,3.0.0)"
 Export-Package: org.eclipse.papyrus.cdo.uml.internal.ui.importsources.tests;x-internal:=true,
  org.eclipse.papyrus.cdo.uml.ui.tests
 Bundle-Vendor: %providerName
@@ -19,4 +15,4 @@
 Bundle-ManifestVersion: 2
 Bundle-Description: %pluginDescription
 Bundle-SymbolicName: org.eclipse.papyrus.cdo.uml.ui.tests
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/Papyrus CDO UML UI Tests.launch b/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/Papyrus CDO UML UI Tests.launch
index 83405b7..d403359 100755
--- a/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/Papyrus CDO UML UI Tests.launch
+++ b/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/Papyrus CDO UML UI Tests.launch
@@ -24,7 +24,7 @@
 <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
 <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
 <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.cdo.uml.ui.tests.AllTests"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.cdo.uml.ui.tests"/>
diff --git a/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/build.properties b/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/build.properties
index 19577a0..e8aea47 100755
--- a/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/build.properties
+++ b/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/build.properties
@@ -12,7 +12,7 @@
 #  		CEA LIST - Initial API and implementation
 ###############################################################################
 source.. = src/
-output.. = bin/
+output.. = target/classes
 bin.includes = META-INF/,\
                .,\
                about.html,\
diff --git a/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/.classpath b/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/.classpath
index ad32c83..e491e18 100755
--- a/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/.classpath
+++ b/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/.classpath
@@ -1,7 +1,7 @@
 <?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"/>
+	<classpathentry kind="output" path="target/classes"/>  
 </classpath>
diff --git a/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/META-INF/MANIFEST.MF b/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/META-INF/MANIFEST.MF
index 31ae0c0..ce7bc93 100755
--- a/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/META-INF/MANIFEST.MF
+++ b/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/META-INF/MANIFEST.MF
@@ -2,18 +2,10 @@
 Export-Package: org.eclipse.papyrus.cdo.validation.problems.edit.tests,
  org.eclipse.papyrus.cdo.validation.problems.tests,
  org.eclipse.papyrus.cdo.validation.problems.util.tests
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.8.0,
- 4.0.0)",
- org.eclipse.papyrus.cdo.validation.problems;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.papyrus.cdo.validation.problems.edit;bundle-version="1.2.0",
- org.eclipse.emf.ecore.xmi;bundle-version="[2.8.0,
- 3.0.0)";visibility:=reexport,
- org.junit;visibility:=reexport,
- org.eclipse.emf.ecore.edit;bundle-version="[2.8.0,
- 3.0.0)",
- org.eclipse.papyrus.cdo.core.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.junit.framework;bundle-version="1.2.0",
- com.google.guava;bundle-version="11.0.0"
+Require-Bundle: org.eclipse.papyrus.cdo.validation.problems;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.cdo.validation.problems.edit;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.emf.ecore.edit;bundle-version="[2.13.0,3.0.0)",
+ org.eclipse.papyrus.cdo.core.tests;bundle-version="[1.2.0,2.0.0)";visibility:=reexport
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
@@ -23,4 +15,4 @@
 Bundle-ManifestVersion: 2
 Bundle-Description: %pluginDescription
 Bundle-SymbolicName: org.eclipse.papyrus.cdo.validation.problems.tests;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/build.properties b/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/build.properties
index b672bb2..bfc6326 100755
--- a/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/build.properties
+++ b/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/build.properties
@@ -15,7 +15,7 @@
 
 jars.compile.order = .
 source.. = src/
-output.. = bin/
+output.. = target/classes
 
 bin.includes = .,\
                META-INF/,\
diff --git a/cdo/tests/uml/org.eclipse.uml2.uml.cdo.tests/.classpath b/cdo/tests/uml/org.eclipse.uml2.uml.cdo.tests/.classpath
index 304e861..1097f4f 100755
--- a/cdo/tests/uml/org.eclipse.uml2.uml.cdo.tests/.classpath
+++ b/cdo/tests/uml/org.eclipse.uml2.uml.cdo.tests/.classpath
@@ -1,7 +1,7 @@
 <?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/J2SE-1.5"/>
+	<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"/>
+	<classpathentry kind="output" path="target/classes"/>  
 </classpath>
diff --git a/cdo/tests/uml/org.eclipse.uml2.uml.cdo.tests/META-INF/MANIFEST.MF b/cdo/tests/uml/org.eclipse.uml2.uml.cdo.tests/META-INF/MANIFEST.MF
index 4a2d380..7e60e70 100755
--- a/cdo/tests/uml/org.eclipse.uml2.uml.cdo.tests/META-INF/MANIFEST.MF
+++ b/cdo/tests/uml/org.eclipse.uml2.uml.cdo.tests/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";resolution:=optional;x-installation:=greedy,
  org.eclipse.emf.ecore;bundle-version="[2.14.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.xmi;bundle-version="[2.14.0,3.0.0)";visibility:=reexport,
diff --git "a/cdo/tests/uml/org.eclipse.uml2.uml.cdo.tests/UML Bug Tests \050CDO\051.launch" "b/cdo/tests/uml/org.eclipse.uml2.uml.cdo.tests/UML Bug Tests \050CDO\051.launch"
index c196afb..0bf8468 100755
--- "a/cdo/tests/uml/org.eclipse.uml2.uml.cdo.tests/UML Bug Tests \050CDO\051.launch"
+++ "b/cdo/tests/uml/org.eclipse.uml2.uml.cdo.tests/UML Bug Tests \050CDO\051.launch"
@@ -27,7 +27,7 @@
 <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
 <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
 <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.uml2.uml.bug.tests.UMLBugTests"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.uml2.uml.tests"/>
diff --git a/cdo/tests/uml/org.eclipse.uml2.uml.cdo.tests/build.properties b/cdo/tests/uml/org.eclipse.uml2.uml.cdo.tests/build.properties
index 6343da2..669ab45 100755
--- a/cdo/tests/uml/org.eclipse.uml2.uml.cdo.tests/build.properties
+++ b/cdo/tests/uml/org.eclipse.uml2.uml.cdo.tests/build.properties
@@ -13,7 +13,7 @@
 # NLS_MESSAGEFORMAT_VAR
 
 source.. = src/
-output.. = bin/
+output.. = target/classes
 bin.includes = about.*,\
                plugin.*,\
                .,\