diff --git a/bundles/org.eclipse.capra.handler.cdt/META-INF/MANIFEST.MF b/bundles/org.eclipse.capra.handler.cdt/META-INF/MANIFEST.MF
index 4aa5173..92f6f4c 100644
--- a/bundles/org.eclipse.capra.handler.cdt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.capra.handler.cdt/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@
 Bundle-Vendor: %Bundle-Vendor
 Bundle-SymbolicName: org.eclipse.capra.handler.cdt;singleton:=true
 Bundle-Version: 0.8.2.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.eclipse.cdt.core,
  org.eclipse.capra.core,
  org.eclipse.text,
diff --git a/bundles/org.eclipse.capra.handler.gef/META-INF/MANIFEST.MF b/bundles/org.eclipse.capra.handler.gef/META-INF/MANIFEST.MF
index 10ec6fc..574d9f7 100644
--- a/bundles/org.eclipse.capra.handler.gef/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.capra.handler.gef/META-INF/MANIFEST.MF
@@ -10,5 +10,5 @@
  org.eclipse.papyrus.infra.emf,
  org.eclipse.gmf.runtime.diagram.ui
 Import-Package: org.eclipse.capra.ui.helpers
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: org.eclipse.capra.handler.gef
diff --git a/bundles/org.eclipse.capra.handler.papyrus/META-INF/MANIFEST.MF b/bundles/org.eclipse.capra.handler.papyrus/META-INF/MANIFEST.MF
index 668c63f..805e144 100644
--- a/bundles/org.eclipse.capra.handler.papyrus/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.capra.handler.papyrus/META-INF/MANIFEST.MF
@@ -11,5 +11,5 @@
  org.eclipse.papyrus.emf.facet.custom.metamodel,
  org.eclipse.papyrus.infra.emf,
  org.eclipse.core.resources
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: org.eclipse.capra.handler.papyrus
diff --git a/bundles/org.eclipse.capra.ui.cdt/META-INF/MANIFEST.MF b/bundles/org.eclipse.capra.ui.cdt/META-INF/MANIFEST.MF
index 3b4815d..a287bec 100644
--- a/bundles/org.eclipse.capra.ui.cdt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.capra.ui.cdt/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@
  org.eclipse.ui.workbench,
  org.eclipse.capra.ui,
  org.eclipse.capra.handler.cdt
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.capra.ui.cdt,
  org.eclipse.capra.ui.cdt.preferences
diff --git a/pom.xml b/pom.xml
index 5e848b2..6512262 100644
--- a/pom.xml
+++ b/pom.xml
@@ -87,8 +87,8 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<tycho-version>1.3.0</tycho-version>
-		<org.jboss.tools.tycho-plugins.version>1.3.0</org.jboss.tools.tycho-plugins.version>
+		<tycho-version>2.1.0</tycho-version>
+		<org.jboss.tools.tycho-plugins.version>1.6.0</org.jboss.tools.tycho-plugins.version>
 	</properties>
 
 	<profiles>
@@ -168,21 +168,11 @@
 						<environment>
 							<os>win32</os>
 							<ws>win32</ws>
-							<arch>x86</arch>
-						</environment>
-						<environment>
-							<os>win32</os>
-							<ws>win32</ws>
 							<arch>x86_64</arch>
 						</environment>
 						<environment>
 							<os>linux</os>
 							<ws>gtk</ws>
-							<arch>x86</arch>
-						</environment>
-						<environment>
-							<os>linux</os>
-							<ws>gtk</ws>
 							<arch>x86_64</arch>
 						</environment>
 						<environment>
diff --git a/releng/org.eclipse.capra.releng.target/org.eclipse.capra.releng.target.target b/releng/org.eclipse.capra.releng.target/org.eclipse.capra.releng.target.target
index 428928b..1674a01 100644
--- a/releng/org.eclipse.capra.releng.target/org.eclipse.capra.releng.target.target
+++ b/releng/org.eclipse.capra.releng.target/org.eclipse.capra.releng.target.target
@@ -1,75 +1,66 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?>
-<target name="Neon" sequenceNumber="77">
-<locations>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.mortbay.jetty.util" version="6.1.23.v201012071420"/>
-<unit id="org.mortbay.jetty.server" version="6.1.23.v201012071420"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160221192158/repository/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.rmf.reqif10.sdk.feature.feature.group" version="0.13.0.201509161042"/>
-<unit id="org.eclipse.rmf.reqif10.pror.sdk.feature.feature.group" version="0.13.0.201509161042"/>
-<repository location="http://download.eclipse.org/rmf/updates/releases"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.php.feature.group" version="4.2.0.201611142355"/>
-<repository location="http://download.eclipse.org/releases/neon"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.emf.ecore.xcore.sdk.feature.group" version="1.4.0.v20160526-0606"/>
-<unit id="org.eclipse.mylyn.ide_feature.feature.group" version="3.21.0.v20160912-1820"/>
-<unit id="org.eclipse.gef.sdk.feature.group" version="3.11.0.201606061308"/>
-<unit id="org.eclipse.cdt.testsrunner.feature.feature.group" version="9.2.0.201612061315"/>
-<unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="2.0.2.201612071107"/>
-<unit id="org.eclipse.cdt.sdk.feature.group" version="9.2.0.201612061315"/>
-<unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="3.2.1.201608311750"/>
-<unit id="org.eclipse.mylyn_feature.feature.group" version="3.21.0.v20160914-0252"/>
-<unit id="org.eclipse.mylyn.hudson.feature.group" version="1.13.0.v20160806-1446"/>
-<unit id="org.eclipse.emf.sdk.feature.group" version="2.12.0.v20160526-0356"/>
-<unit id="org.eclipse.zest.sdk.feature.group" version="1.7.0.201606061308"/>
-<unit id="org.eclipse.mylyn.trac_feature.feature.group" version="3.21.0.v20160630-2019"/>
-<unit id="org.eclipse.pde.source.feature.group" version="3.12.3.v20170301-0400"/>
-<repository location="http://download.eclipse.org/releases/neon"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="de.ovgu.featureide.featuremodeling.feature.group" version="3.7.0.202010141034"/>
-<repository location="http://featureide.cs.ovgu.de/update/v3/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.apache.poi.ooxml" version="3.9.0.v201405241905"/>
-<unit id="org.slf4j.api" version="1.7.2.v20121108-1250"/>
-<unit id="org.apache.xmlbeans" version="2.3.0.v201605172150"/>
-<unit id="com.google.guava" version="15.0.0.v201403281430"/>
-<unit id="com.google.guava.source" version="15.0.0.v201403281430"/>
-<unit id="org.apache.commons.collections" version="3.2.2.v201511171945"/>
-<unit id="org.apache.poi.ooxml.schemas" version="3.9.0.v201405241750"/>
-<unit id="ch.qos.logback.slf4j" version="1.0.7.v201505121915"/>
-<unit id="org.apache.poi" version="3.9.0.v201405241750"/>
-<unit id="com.fasterxml.jackson.core.jackson-core" version="2.5.0.v201504151636"/>
-<unit id="javax.xml.bind" version="2.2.0.v201105210648"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="net.sourceforge.plantuml.feature.feature.group" version="1.1.24"/>
-<repository location="http://hallvard.github.io/plantuml/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<repository location="https://download.eclipse.org/ease/release/0.6.0/"/>
-<unit id="org.eclipse.ease.feature.feature.group" version="0.6.0.I201802271533"/>
-<unit id="org.eclipse.ease.ui.feature.feature.group" version="0.6.0.I201804241621"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<repository location="http://download.eclipse.org/app4mc/updatesites/releases/0.9.5/"/>
-<unit id="org.eclipse.app4mc.platform.sdk.feature.group" version="0.9.5.201907311248"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<repository location="http://download.eclipse.org/tools/orbit/R-builds/R20170307180635/repository"/>
-<unit id="org.apache.commons.math3" version="3.5.0.v20160301-1110"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/composite/releases/"/>
-<unit id="org.eclipse.xtext.sdk.feature.group" version="2.15.0.v20180916-1232"/>
-</location>
-</locations>
-</target>
\ No newline at end of file
+<?pde?>
+<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
+<target name="eclipse-capra-e4.10" sequenceNumber="1609852128">
+  <locations>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.cdt.sdk.feature.group" version="9.6.0.201812111211"/>
+      <unit id="org.eclipse.cdt.testsrunner.feature.feature.group" version="9.6.0.201811241055"/>
+      <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="3.3.5.201812111422"/>
+      <unit id="org.eclipse.emf.ecore.xcore.sdk.feature.group" version="1.8.0.v20181203-0948"/>
+      <unit id="org.eclipse.emf.sdk.feature.group" version="2.16.0.v20181206-1055"/>
+      <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="4.2.0.201812120922"/>
+      <unit id="org.eclipse.php.feature.group" version="6.2.0.201812112302"/>
+      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.16.0.v20181203-1555"/>
+      <unit id="org.eclipse.mylyn.gerrit.feature.feature.group" version="2.15.0.v20180322-1946"/>
+      <unit id="org.eclipse.mylyn.hudson.feature.group" version="1.16.0.v20180403-2055"/>
+      <unit id="org.eclipse.gef.sdk.feature.group" version="3.11.0.201606061308"/>
+      <unit id="org.eclipse.xtend.sdk.feature.group" version="2.16.0.v20181203-1555"/>
+      <unit id="org.eclipse.pde.source.feature.group" version="3.13.300.v20181206-0815"/>
+      <repository id="eclipse-2018-12" location="http://download.eclipse.org/releases/2018-12/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.apache.poi.ooxml" version="3.9.0.v201405241905"/>
+      <unit id="org.apache.xmlbeans" version="2.3.0.v201605172150"/>
+      <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
+      <unit id="org.apache.commons.collections" version="3.2.2.v201511171945"/>
+      <unit id="org.apache.poi.ooxml.schemas" version="3.9.0.v201405241750"/>
+      <unit id="org.apache.poi" version="3.9.0.v201405241750"/>
+      <unit id="com.fasterxml.jackson.core.jackson-core" version="2.9.2.v20180207-1730"/>
+      <unit id="org.slf4j.api" version="1.7.10.v20170428-1633"/>
+      <unit id="ch.qos.logback.slf4j" version="1.1.2.v20160301-0943"/>
+      <repository id="eclipse-orbit-2018-12" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20181128170323/repository"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.mortbay.jetty.util" version="6.1.23.v201012071420"/>
+      <unit id="org.mortbay.jetty.server" version="6.1.23.v201012071420"/>
+      <repository id="eclipse-orbit-mars2" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160221192158/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.sphinx.sdk.feature.group" version="0.9.2.201601200932"/>
+      <repository location="http://download.eclipse.org/sphinx/releases/0.9.x"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.rmf.reqif10.sdk.feature.feature.group" version="0.13.0.201509161042"/>
+      <unit id="org.eclipse.rmf.reqif10.pror.sdk.feature.feature.group" version="0.13.0.201509161042"/>
+      <repository location="http://download.eclipse.org/rmf/updates/releases"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="net.sourceforge.plantuml.feature.feature.group" version="1.1.24"/>
+      <repository id="plantuml" location="http://hallvard.github.io/plantuml/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="de.ovgu.featureide.featuremodeling.feature.group" version="3.7.0.202010141034"/>
+      <repository id="feature-ide" location="http://featureide.cs.ovgu.de/update/v3/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.app4mc.platform.sdk.feature.group" version="0.9.7.202001311433"/>
+      <repository id="APP4MC" location="http://download.eclipse.org/app4mc/updatesites/releases/0.9.7/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.ease.feature.feature.group" version="0.7.0.I201907120558"/>
+      <unit id="org.eclipse.ease.ui.feature.feature.group" version="0.7.0.I201907161104"/>
+      <repository id="EASE" location="http://download.eclipse.org/ease/release/0.7.0"/>
+    </location>
+  </locations>
+</target>
diff --git a/tests/org.eclipse.capra.handler.cdt.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.capra.handler.cdt.tests/META-INF/MANIFEST.MF
index c47f31e..18ae543 100644
--- a/tests/org.eclipse.capra.handler.cdt.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.capra.handler.cdt.tests/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@
 Bundle-SymbolicName: org.eclipse.capra.handler.cdt.tests
 Bundle-Version: 0.8.2.qualifier
 Fragment-Host: org.eclipse.capra.handler.cdt
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.eclipse.core.resources,
  org.junit,
  org.eclipse.cdt.managedbuilder.core,
diff --git a/tests/org.eclipse.capra.handler.featureide.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.capra.handler.featureide.tests/META-INF/MANIFEST.MF
index 8596c8f..5d1a584 100644
--- a/tests/org.eclipse.capra.handler.featureide.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.capra.handler.featureide.tests/META-INF/MANIFEST.MF
@@ -15,7 +15,8 @@
  org.eclipse.core.runtime,
  org.eclipse.ui,
  de.ovgu.featureide.fm.core,
+ javax.annotation,
  org.junit,
  ch.qos.logback.slf4j;resolution:=optional
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: org.eclipse.capra.handler.featureide.tests;x-internal:=true
diff --git a/tests/org.eclipse.capra.handler.jdt.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.capra.handler.jdt.tests/META-INF/MANIFEST.MF
index b4a7356..00f1534 100644
--- a/tests/org.eclipse.capra.handler.jdt.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.capra.handler.jdt.tests/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@
 Bundle-SymbolicName: org.eclipse.capra.handler.jdt.tests
 Bundle-Version: 0.8.2.qualifier
 Fragment-Host: org.eclipse.capra.handler.jdt
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.junit,
  org.eclipse.core.resources,
  org.eclipse.jdt.launching,
diff --git a/tests/org.eclipse.capra.handler.uml.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.capra.handler.uml.tests/META-INF/MANIFEST.MF
index e8a9b71..e41a479 100644
--- a/tests/org.eclipse.capra.handler.uml.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.capra.handler.uml.tests/META-INF/MANIFEST.MF
@@ -19,5 +19,5 @@
  org.junit,
  ch.qos.logback.slf4j;resolution:=optional,
  net.sourceforge.plantuml.eclipse;bundle-version="1.1.24"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: org.eclipse.capra.handler.uml.tests;x-internal:=true
diff --git a/tests/org.eclipse.capra.testsuite/META-INF/MANIFEST.MF b/tests/org.eclipse.capra.testsuite/META-INF/MANIFEST.MF
index 0c4d5d1..e1ba860 100644
--- a/tests/org.eclipse.capra.testsuite/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.capra.testsuite/META-INF/MANIFEST.MF
@@ -43,6 +43,6 @@
  org.eclipse.capra.ui.notification,
  ch.qos.logback.slf4j;resolution:=optional,
  net.sourceforge.plantuml.eclipse;bundle-version="1.1.24"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Import-Package: org.eclipse.swt.dnd,
  org.slf4j