[EMF viewers] Updated target definition
diff --git a/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emf.metamodelviewer.sphinx.impl/META-INF/MANIFEST.MF b/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emf.metamodelviewer.sphinx.impl/META-INF/MANIFEST.MF
index 868acfd..df1ecd2 100644
--- a/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emf.metamodelviewer.sphinx.impl/META-INF/MANIFEST.MF
+++ b/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emf.metamodelviewer.sphinx.impl/META-INF/MANIFEST.MF
@@ -5,6 +5,6 @@
 Bundle-Version: 0.9.8.qualifier
 Automatic-Module-Name: org.eclipse.app4mc.emf.metamodelviewer.sphinx.impl
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.app4mc.emf.metamodelviewer.sphinx.wrapper;bundle-version="0.9.8",
- org.eclipse.emf.ecore;bundle-version="2.20.0",
- org.eclipse.sphinx.emf;bundle-version="0.11.0"
+Require-Bundle: org.eclipse.app4mc.emf.metamodelviewer.sphinx.wrapper,
+ org.eclipse.emf.ecore,
+ org.eclipse.sphinx.emf
diff --git a/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emf.viewer.plantuml/META-INF/MANIFEST.MF b/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emf.viewer.plantuml/META-INF/MANIFEST.MF
index 73d9c25..2d468d6 100644
--- a/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emf.viewer.plantuml/META-INF/MANIFEST.MF
+++ b/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emf.viewer.plantuml/META-INF/MANIFEST.MF
@@ -6,13 +6,9 @@
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.app4mc.emf.viewer.plantuml.Activator
 Bundle-Vendor: Eclipse APP4MC
-Require-Bundle: com.google.guava,
- org.eclipse.core.runtime,
+Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore,
  org.eclipse.emf.ecore.xmi,
- org.eclipse.xtext.xbase.lib,
- org.eclipse.xtend.lib,
- org.eclipse.xtend.lib.macro,
  org.eclipse.ui,
  org.eclipse.ui.browser,
  org.eclipse.e4.ui.model.workbench,
diff --git a/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emf.viewer.plantuml/src/org/eclipse/app4mc/emf/viewer/plantuml/handlers/EClassAllReferencesHandler.java b/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emf.viewer.plantuml/src/org/eclipse/app4mc/emf/viewer/plantuml/handlers/EClassAllReferencesHandler.java
index 35d16ad..ed487d2 100644
--- a/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emf.viewer.plantuml/src/org/eclipse/app4mc/emf/viewer/plantuml/handlers/EClassAllReferencesHandler.java
+++ b/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emf.viewer.plantuml/src/org/eclipse/app4mc/emf/viewer/plantuml/handlers/EClassAllReferencesHandler.java
@@ -33,7 +33,6 @@
 
 import net.sourceforge.plantuml.eclipse.utils.PlantumlConstants;
 
-@SuppressWarnings("restriction")
 public class EClassAllReferencesHandler extends AbstractPlantUMLHandler {
 	
 	@Override
diff --git a/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emf.viewer.plantuml/src/org/eclipse/app4mc/emf/viewer/plantuml/handlers/EClassContentsAndHierarchyHandler.java b/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emf.viewer.plantuml/src/org/eclipse/app4mc/emf/viewer/plantuml/handlers/EClassContentsAndHierarchyHandler.java
index 9a3dcbb..ee7c414 100644
--- a/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emf.viewer.plantuml/src/org/eclipse/app4mc/emf/viewer/plantuml/handlers/EClassContentsAndHierarchyHandler.java
+++ b/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emf.viewer.plantuml/src/org/eclipse/app4mc/emf/viewer/plantuml/handlers/EClassContentsAndHierarchyHandler.java
@@ -33,7 +33,6 @@
 
 import net.sourceforge.plantuml.eclipse.utils.PlantumlConstants;
 
-@SuppressWarnings("restriction")
 public class EClassContentsAndHierarchyHandler extends AbstractPlantUMLHandler {
 	
 	@Override
diff --git a/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emf.viewer.plantuml/src/org/eclipse/app4mc/emf/viewer/plantuml/handlers/EClassContentsFromReferenceHandler.java b/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emf.viewer.plantuml/src/org/eclipse/app4mc/emf/viewer/plantuml/handlers/EClassContentsFromReferenceHandler.java
index 2153391..b96d795 100644
--- a/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emf.viewer.plantuml/src/org/eclipse/app4mc/emf/viewer/plantuml/handlers/EClassContentsFromReferenceHandler.java
+++ b/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emf.viewer.plantuml/src/org/eclipse/app4mc/emf/viewer/plantuml/handlers/EClassContentsFromReferenceHandler.java
@@ -33,7 +33,6 @@
 
 import net.sourceforge.plantuml.eclipse.utils.PlantumlConstants;
 
-@SuppressWarnings("restriction")
 public class EClassContentsFromReferenceHandler extends AbstractPlantUMLHandler {
 	
 	@Override
diff --git a/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emf.viewer.plantuml/src/org/eclipse/app4mc/emf/viewer/plantuml/handlers/EClassContentsHandler.java b/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emf.viewer.plantuml/src/org/eclipse/app4mc/emf/viewer/plantuml/handlers/EClassContentsHandler.java
index 28c262f..9ee8cfb 100644
--- a/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emf.viewer.plantuml/src/org/eclipse/app4mc/emf/viewer/plantuml/handlers/EClassContentsHandler.java
+++ b/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emf.viewer.plantuml/src/org/eclipse/app4mc/emf/viewer/plantuml/handlers/EClassContentsHandler.java
@@ -33,7 +33,6 @@
 
 import net.sourceforge.plantuml.eclipse.utils.PlantumlConstants;
 
-@SuppressWarnings("restriction")
 public class EClassContentsHandler extends AbstractPlantUMLHandler {
 	
 	@Override
diff --git a/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emf.viewer.plantuml/src/org/eclipse/app4mc/emf/viewer/plantuml/handlers/EClassHierarchyHandler.java b/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emf.viewer.plantuml/src/org/eclipse/app4mc/emf/viewer/plantuml/handlers/EClassHierarchyHandler.java
index b493ebb..36c7f29 100644
--- a/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emf.viewer.plantuml/src/org/eclipse/app4mc/emf/viewer/plantuml/handlers/EClassHierarchyHandler.java
+++ b/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emf.viewer.plantuml/src/org/eclipse/app4mc/emf/viewer/plantuml/handlers/EClassHierarchyHandler.java
@@ -33,7 +33,6 @@
 
 import net.sourceforge.plantuml.eclipse.utils.PlantumlConstants;
 
-@SuppressWarnings("restriction")
 public class EClassHierarchyHandler extends AbstractPlantUMLHandler {
 	
 	EPartService partService;
diff --git a/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emf.viewer.plantuml/src/org/eclipse/app4mc/emf/viewer/plantuml/handlers/EObjectRefsHandler.java b/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emf.viewer.plantuml/src/org/eclipse/app4mc/emf/viewer/plantuml/handlers/EObjectRefsHandler.java
index ec69bd0..5eb9c72 100644
--- a/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emf.viewer.plantuml/src/org/eclipse/app4mc/emf/viewer/plantuml/handlers/EObjectRefsHandler.java
+++ b/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emf.viewer.plantuml/src/org/eclipse/app4mc/emf/viewer/plantuml/handlers/EObjectRefsHandler.java
@@ -34,7 +34,6 @@
 
 import net.sourceforge.plantuml.eclipse.utils.PlantumlConstants;
 
-@SuppressWarnings("restriction")
 public class EObjectRefsHandler extends AbstractPlantUMLHandler {
 
 	// Invalid as file name characters (NTFS): / ? < > \ : * | "
diff --git a/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emf.viewer.plantuml/src/org/eclipse/app4mc/emf/viewer/plantuml/handlers/ObjectContentHandler.java b/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emf.viewer.plantuml/src/org/eclipse/app4mc/emf/viewer/plantuml/handlers/ObjectContentHandler.java
index aae6a8c..226a579 100644
--- a/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emf.viewer.plantuml/src/org/eclipse/app4mc/emf/viewer/plantuml/handlers/ObjectContentHandler.java
+++ b/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emf.viewer.plantuml/src/org/eclipse/app4mc/emf/viewer/plantuml/handlers/ObjectContentHandler.java
@@ -36,7 +36,6 @@
 
 import net.sourceforge.plantuml.eclipse.utils.PlantumlConstants;
 
-@SuppressWarnings("restriction")
 public class ObjectContentHandler extends AbstractPlantUMLHandler {
 	
 	@Override
diff --git a/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emf.viewer.plantuml/src/org/eclipse/app4mc/emf/viewer/plantuml/views/DiagramView.java b/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emf.viewer.plantuml/src/org/eclipse/app4mc/emf/viewer/plantuml/views/DiagramView.java
index 80efcad..fda12bb 100644
--- a/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emf.viewer.plantuml/src/org/eclipse/app4mc/emf/viewer/plantuml/views/DiagramView.java
+++ b/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emf.viewer.plantuml/src/org/eclipse/app4mc/emf/viewer/plantuml/views/DiagramView.java
@@ -62,7 +62,6 @@
 
 import net.sourceforge.plantuml.eclipse.utils.PlantumlConstants;
 
-@SuppressWarnings("restriction")
 public class DiagramView {
 	
 	/**
diff --git a/eclipse-tools/emf-graphical-viewer/releng/org.eclipse.app4mc.emf.viewers.target/org.eclipse.app4mc.emf.viewers.target.target b/eclipse-tools/emf-graphical-viewer/releng/org.eclipse.app4mc.emf.viewers.target/org.eclipse.app4mc.emf.viewers.target.target
index 360727f..81f09d9 100644
--- a/eclipse-tools/emf-graphical-viewer/releng/org.eclipse.app4mc.emf.viewers.target/org.eclipse.app4mc.emf.viewers.target.target
+++ b/eclipse-tools/emf-graphical-viewer/releng/org.eclipse.app4mc.emf.viewers.target/org.eclipse.app4mc.emf.viewers.target.target
@@ -1,47 +1,36 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde?>
-<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="EMF Graphical Viewer Target" sequenceNumber="1606831597">
-  <locations>
-    <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.sdk.ide" version="4.14.0.I20191210-0610"/>
-      <unit id="org.eclipse.emf.ecore.xcore.lib.feature.group" version="1.5.0.v20190401-0856"/>
-      <unit id="org.eclipse.emf.sdk.feature.group" version="2.20.0.v20191028-0905"/>
-      <unit id="org.eclipse.emf.transaction.feature.group" version="1.12.0.201805140824"/>
-      <unit id="org.eclipse.emf.validation.feature.group" version="1.12.1.201812070911"/>
-      <unit id="org.eclipse.emf.workspace.feature.group" version="1.12.0.201805140824"/>
-      <unit id="org.eclipse.xtext.runtime.feature.group" version="2.20.0.v20191202-1256"/>
-      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.20.0.v20191202-1256"/>
-      <unit id="org.eclipse.xtext.xbase.feature.group" version="2.20.0.v20191202-1256"/>
-      <unit id="org.eclipse.xtext.xbase.lib.feature.group" version="2.20.0.v20191202-0910"/>
-      <unit id="org.eclipse.xtend.sdk.feature.group" version="2.20.0.v20191202-1256"/>
-      <unit id="org.eclipse.xpand.sdk.feature.group" version="2.2.0.v201605260315"/>
-      <unit id="org.apache.commons.cli" version="1.2.0.v201404270220"/>
-      <unit id="org.apache.commons.lang" version="2.6.0.v201404270220"/>
-      <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
-      <unit id="org.apache.xerces" version="2.9.0.v201101211617"/>
-      <unit id="org.apache.xalan" version="2.7.1.v201005080400"/>
-      <unit id="org.apache.xml.resolver" version="1.2.0.v201005080400"/>
-      <unit id="org.apache.xml.serializer" version="2.7.1.v201005080400"/>
-      <unit id="javax.xml" version="1.3.4.v201005080400"/>
-      <unit id="org.jdom" version="1.1.1.v201101151400"/>
-      <unit id="com.google.guava" version="27.1.0.v20190517-1946"/>
-      <unit id="org.slf4j.api" version="1.7.10.v20170428-1633"/>
-      <repository location="http://download.eclipse.org/releases/2019-12"/>
-    </location>
-    <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.sphinx.sdk.feature.group" version="0.11.2.201802230805"/>
-      <repository location="http://download.eclipse.org/sphinx/updates/0.11.x"/>
-    </location>
-    <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="net.sourceforge.plantuml.lib.feature.feature.group" version="1.2019.11"/>
-      <unit id="net.sourceforge.plantuml.feature.feature.group" version="1.1.24"/>
-      <unit id="net.sourceforge.plantuml.ecore.feature.feature.group" version="1.1.24"/>
-      <repository location="http://hallvard.github.io/plantuml"/>
-    </location>
-    <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.license.feature.group" version="2.0.2.v20181016-2210"/>
-      <repository location="http://download.eclipse.org/cbi/updates/license"/>
-    </location>
-  </locations>
-</target>
+<?pde ?>
+<target name="EMF Graphical Viewer Target">
+	<locations>
+		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+			<repository location="https://download.eclipse.org/releases/2020-06" />
+			<unit id="org.eclipse.platform.ide" version="4.16.0.I20200604-0540" />
+			<unit id="org.eclipse.platform.sdk" version="4.16.0.I20200604-0540" />
+			<unit id="org.eclipse.emf.sdk.feature.group" version="2.22.0.v20200519-1135" />
+			<unit id="org.jdom" version="1.1.1.v201101151400" />
+			<unit id="org.apache.xalan" version="2.7.1.v201005080400" />
+			<unit id="javax.activation" version="1.1.0.v201211130549" />
+			<unit id="javax.xml.bind" version="2.2.0.v201105210648" />
+			<unit id="javax.xml.stream" version="1.0.1.v201004272200" />
+		</location>
+		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+			<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository" />
+			<unit id="org.apache.log4j" version="1.2.19.v20220208-1728" />
+			<unit id="org.slf4j.api" version="1.7.30.v20200204-2150" />
+			<unit id="org.slf4j.apis.jcl" version="1.7.30.v20200204-2150" />
+			<unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201108-2042" />
+		</location>
+		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+			<repository location="https://hallvard.github.io/plantuml" />
+			<unit id="net.sourceforge.plantuml.ecore.feature.feature.group" version="1.1.24" />
+		</location>
+		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+			<repository location="https://download.eclipse.org/cbi/updates/license" />
+			<unit id="org.eclipse.license.feature.group" version="2.0.2.v20181016-2210" />
+		</location>
+		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+			<repository location="https://download.eclipse.org/sphinx/updates/0.11.x" />
+			<unit id="org.eclipse.sphinx.sdk.feature.group" version="0.11.2.201802230805" />
+		</location>
+	</locations>
+</target>
\ No newline at end of file
diff --git a/eclipse-tools/emf-graphical-viewer/releng/org.eclipse.app4mc.emf.viewers.target/org.eclipse.app4mc.emf.viewers.target.tpd b/eclipse-tools/emf-graphical-viewer/releng/org.eclipse.app4mc.emf.viewers.target/org.eclipse.app4mc.emf.viewers.target.tpd
deleted file mode 100644
index fb3f481..0000000
--- a/eclipse-tools/emf-graphical-viewer/releng/org.eclipse.app4mc.emf.viewers.target/org.eclipse.app4mc.emf.viewers.target.tpd
+++ /dev/null
@@ -1,43 +0,0 @@
-target "EMF Graphical Viewer Target"
-
-with source allEnvironments
-
-location "http://download.eclipse.org/releases/2019-12" {
-	org.eclipse.sdk.ide
-	org.eclipse.emf.ecore.xcore.lib.feature.group
-	org.eclipse.emf.sdk.feature.group
-	org.eclipse.emf.transaction.feature.group
-	org.eclipse.emf.validation.feature.group
-	org.eclipse.emf.workspace.feature.group
-	org.eclipse.xtext.runtime.feature.group
-	org.eclipse.xtext.sdk.feature.group
-	org.eclipse.xtext.xbase.feature.group
-	org.eclipse.xtext.xbase.lib.feature.group
-	org.eclipse.xtend.sdk.feature.group
-	org.eclipse.xpand.sdk.feature.group
-	org.apache.commons.cli
-	org.apache.commons.lang
-	org.apache.log4j
-	org.apache.xerces
-	org.apache.xalan
-	org.apache.xml.resolver
-	org.apache.xml.serializer
-	javax.xml
-	org.jdom
-	com.google.guava
-	org.slf4j.api
-}
-
-location "http://download.eclipse.org/sphinx/updates/0.11.x" {
-	org.eclipse.sphinx.sdk.feature.group
-}
-
-location "http://hallvard.github.io/plantuml" {
-	net.sourceforge.plantuml.lib.feature.feature.group [1.2019.11,1.2019.11]
-	net.sourceforge.plantuml.feature.feature.group [1.1.24,1.1.24]
-	net.sourceforge.plantuml.ecore.feature.feature.group [1.1.24,1.1.24]
-}
-
-location "http://download.eclipse.org/cbi/updates/license" {
-	org.eclipse.license.feature.group
-}
\ No newline at end of file