[571047] Remove unused dependencies

As workflow and server features has been deleted in the previous commit,
a lot of plug-ins can be removed from the TPs and the update site.

* org.hamcrest.core
* javax.servlet
* javax.websocket
* com.google.gson
* org.reactivestreams
* com.graphql.java.dataloader
* com.graphql.java
* jetty plug-ins

Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=571047 https://bugs.eclipse.org/bugs/show_bug.cgi?id=574125
Change-Id: Ia164707630208b654523fa19425df9d116f360ad
Signed-off-by: Laurent Fasani <laurent.fasani@obeo.fr>
diff --git a/packaging/org.eclipse.sirius.update/category.xml b/packaging/org.eclipse.sirius.update/category.xml
index be9c282..99595d9 100644
--- a/packaging/org.eclipse.sirius.update/category.xml
+++ b/packaging/org.eclipse.sirius.update/category.xml
@@ -202,9 +202,6 @@
    <feature id="org.eclipse.elk.ui.feature.source" version="0.0.0">
       <category name="Sirius.Dependencies"/>
    </feature>
-   <bundle id="com.google.gson" version="0.0.0">
-      <category name="Sirius.Dependencies"/>
-   </bundle>
    <category-def name="Sirius" label="Sirius">
       <description>
          The Sirius Modeling Platform
diff --git a/plugins/org.eclipse.sirius.tests.swtbot.support/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.tests.swtbot.support/META-INF/MANIFEST.MF
index ccd883b..9611748 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot.support/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.tests.swtbot.support/META-INF/MANIFEST.MF
@@ -12,7 +12,6 @@
  org.eclipse.swtbot.eclipse.finder;visibility:=reexport,
  org.eclipse.swtbot.swt.finder;visibility:=reexport,
  org.eclipse.swtbot.eclipse.gef.finder;bundle-version="2.0.5",
- org.hamcrest.core;bundle-version="[1.1.0,2.0.0)",
  org.hamcrest.library;bundle-version="[1.1.0,2.0.0)",
  org.apache.log4j;bundle-version="1.2.13",
  org.eclipse.draw2d;bundle-version="3.4.2",
diff --git a/releng/org.eclipse.sirius.targets/modules/jetty-9.4.tpd b/releng/org.eclipse.sirius.targets/modules/jetty-9.4.tpd
deleted file mode 100644
index 47daaeb..0000000
--- a/releng/org.eclipse.sirius.targets/modules/jetty-9.4.tpd
+++ /dev/null
@@ -1,21 +0,0 @@
-target "Jetty 9.4.x"
-
-location Jetty-9.4.29 "https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.29.v20200521/" {
-	org.eclipse.jetty.io [9.4.29,9.4.30)
-	org.eclipse.jetty.continuation [9.4.29,9.4.30)
-	org.eclipse.jetty.http [9.4.29,9.4.30)
-	org.eclipse.jetty.server [9.4.29,9.4.30)
-	org.eclipse.jetty.servlet [9.4.29,9.4.30)
-	org.eclipse.jetty.servlets [9.4.29,9.4.30)
-	org.eclipse.jetty.util [9.4.29,9.4.30)
-	org.eclipse.jetty.security [9.4.29,9.4.30)
-	org.eclipse.jetty.websocket.servlet [9.4.29,9.4.30)
-	org.eclipse.jetty.websocket.common [9.4.29,9.4.30)
-	org.eclipse.jetty.websocket.server [9.4.29,9.4.30)
-	org.eclipse.jetty.websocket.api [9.4.29,9.4.30)
-	org.eclipse.jetty.client [9.4.29,9.4.30)
-	org.eclipse.jetty.websocket.client [9.4.29,9.4.30)
-	org.eclipse.jetty.xml [9.4.29,9.4.30)
-	org.eclipse.jetty.websocket.javax.websocket [9.4.29,9.4.30)
-	org.eclipse.jetty.websocket.javax.websocket.server [9.4.29,9.4.30)
-}
\ No newline at end of file
diff --git a/releng/org.eclipse.sirius.targets/modules/orbit.tpd b/releng/org.eclipse.sirius.targets/modules/orbit.tpd
index 3bd4580..c48afc5 100644
--- a/releng/org.eclipse.sirius.targets/modules/orbit.tpd
+++ b/releng/org.eclipse.sirius.targets/modules/orbit.tpd
@@ -3,19 +3,12 @@
 location Orbit "https://download.eclipse.org/tools/orbit/downloads/drops/R20190602212107/repository" {
     org.apache.log4j lazy
     org.easymock lazy
-    org.hamcrest.core lazy
     org.hamcrest.library lazy
     org.junit [4.11.0,5.0.0)
-    javax.servlet lazy
-    javax.websocket lazy
-    com.google.gson lazy
     org.slf4j.api [1.7.2,1.7.3)
     ch.qos.logback.slf4j [1.0.7,1.0.8)
     ch.qos.logback.classic [1.0.7,1.0.8)
     ch.qos.logback.core [1.0.7,1.0.8)
     org.apache.xalan 2.7.1
     org.antlr.runtime [4.7.1,4.7.2)
-    org.reactivestreams [1.0.2,1.0.3)
-    com.graphql.java.dataloader [2.1.1,2.1.2)
-    com.graphql.java [11.0.0,11.0.1)
 }
diff --git a/releng/org.eclipse.sirius.targets/sirius_2020-06.target b/releng/org.eclipse.sirius.targets/sirius_2020-06.target
index 182c449..13760dd 100644
--- a/releng/org.eclipse.sirius.targets/sirius_2020-06.target
+++ b/releng/org.eclipse.sirius.targets/sirius_2020-06.target
@@ -1,26 +1,19 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="sirius_2020-06" sequenceNumber="1623006047">
+<target name="sirius_2020-06" sequenceNumber="1623333343">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.apache.log4j" version="0.0.0"/>
       <unit id="org.easymock" version="0.0.0"/>
-      <unit id="org.hamcrest.core" version="0.0.0"/>
       <unit id="org.hamcrest.library" version="0.0.0"/>
       <unit id="org.junit" version="4.12.0.v201504281640"/>
-      <unit id="javax.servlet" version="0.0.0"/>
-      <unit id="javax.websocket" version="0.0.0"/>
-      <unit id="com.google.gson" version="0.0.0"/>
       <unit id="org.slf4j.api" version="1.7.2.v20121108-1250"/>
       <unit id="ch.qos.logback.slf4j" version="1.0.7.v201505121915"/>
       <unit id="ch.qos.logback.classic" version="1.0.7.v20121108-1250"/>
       <unit id="ch.qos.logback.core" version="1.0.7.v20121108-1250"/>
       <unit id="org.apache.xalan" version="2.7.1.v201005080400"/>
       <unit id="org.antlr.runtime" version="4.7.1.v20181120-0808"/>
-      <unit id="org.reactivestreams" version="1.0.2.v20181120-0809"/>
-      <unit id="com.graphql.java.dataloader" version="2.1.1.v20181120-0809"/>
-      <unit id="com.graphql.java" version="11.0.0.v20181120-0810"/>
       <repository id="Orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20190602212107/repository"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
@@ -68,26 +61,6 @@
       <repository id="ELK-0.7" location="https://download.eclipse.org/elk/updates/releases/0.7.1/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.jetty.io" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.continuation" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.http" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.server" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.servlet" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.servlets" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.util" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.security" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.websocket.servlet" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.websocket.common" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.websocket.server" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.websocket.api" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.client" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.websocket.client" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.xml" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.websocket.javax.websocket" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.websocket.javax.websocket.server" version="9.4.29.v20200521"/>
-      <repository id="Jetty-9.4.29" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.29.v20200521/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/>
       <repository id="GMF-Notation-1.13.0" location="https://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R202004160913"/>
     </location>
diff --git a/releng/org.eclipse.sirius.targets/sirius_2020-06.targetplatform b/releng/org.eclipse.sirius.targets/sirius_2020-06.targetplatform
index a73af3b..d970cc4 100644
--- a/releng/org.eclipse.sirius.targets/sirius_2020-06.targetplatform
+++ b/releng/org.eclipse.sirius.targets/sirius_2020-06.targetplatform
@@ -7,7 +7,6 @@
 include "modules/acceleo-3.7.tpd"
 include "modules/eef-2.1.tpd"
 include "modules/elk-0.7.tpd"
-include "modules/jetty-9.4.tpd"
 include "modules/gmf-runtime-1.13.tpd"
 
 with source, requirements
diff --git a/releng/org.eclipse.sirius.targets/sirius_2020-09.target b/releng/org.eclipse.sirius.targets/sirius_2020-09.target
index f77c5fb..9a2a1eb 100644
--- a/releng/org.eclipse.sirius.targets/sirius_2020-09.target
+++ b/releng/org.eclipse.sirius.targets/sirius_2020-09.target
@@ -1,26 +1,19 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="sirius_2020-09" sequenceNumber="1623006049">
+<target name="sirius_2020-09" sequenceNumber="1623333344">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.apache.log4j" version="0.0.0"/>
       <unit id="org.easymock" version="0.0.0"/>
-      <unit id="org.hamcrest.core" version="0.0.0"/>
       <unit id="org.hamcrest.library" version="0.0.0"/>
       <unit id="org.junit" version="4.12.0.v201504281640"/>
-      <unit id="javax.servlet" version="0.0.0"/>
-      <unit id="javax.websocket" version="0.0.0"/>
-      <unit id="com.google.gson" version="0.0.0"/>
       <unit id="org.slf4j.api" version="1.7.2.v20121108-1250"/>
       <unit id="ch.qos.logback.slf4j" version="1.0.7.v201505121915"/>
       <unit id="ch.qos.logback.classic" version="1.0.7.v20121108-1250"/>
       <unit id="ch.qos.logback.core" version="1.0.7.v20121108-1250"/>
       <unit id="org.apache.xalan" version="2.7.1.v201005080400"/>
       <unit id="org.antlr.runtime" version="4.7.1.v20181120-0808"/>
-      <unit id="org.reactivestreams" version="1.0.2.v20181120-0809"/>
-      <unit id="com.graphql.java.dataloader" version="2.1.1.v20181120-0809"/>
-      <unit id="com.graphql.java" version="11.0.0.v20181120-0810"/>
       <repository id="Orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20190602212107/repository"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
@@ -68,26 +61,6 @@
       <repository id="ELK-0.7" location="https://download.eclipse.org/elk/updates/releases/0.7.1/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.jetty.io" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.continuation" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.http" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.server" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.servlet" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.servlets" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.util" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.security" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.websocket.servlet" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.websocket.common" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.websocket.server" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.websocket.api" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.client" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.websocket.client" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.xml" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.websocket.javax.websocket" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.websocket.javax.websocket.server" version="9.4.29.v20200521"/>
-      <repository id="Jetty-9.4.29" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.29.v20200521/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/>
       <repository id="GMF-Notation-1.13.0" location="https://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R202004160913"/>
     </location>
diff --git a/releng/org.eclipse.sirius.targets/sirius_2020-09.targetplatform b/releng/org.eclipse.sirius.targets/sirius_2020-09.targetplatform
index 5980fe6..fc97c90 100644
--- a/releng/org.eclipse.sirius.targets/sirius_2020-09.targetplatform
+++ b/releng/org.eclipse.sirius.targets/sirius_2020-09.targetplatform
@@ -7,7 +7,6 @@
 include "modules/acceleo-3.7.tpd"
 include "modules/eef-2.1.tpd"
 include "modules/elk-0.7.tpd"
-include "modules/jetty-9.4.tpd"
 include "modules/gmf-runtime-1.13.tpd"
 
 with source, requirements
diff --git a/releng/org.eclipse.sirius.targets/sirius_2020-12.target b/releng/org.eclipse.sirius.targets/sirius_2020-12.target
index a44efd5..76a1b65 100644
--- a/releng/org.eclipse.sirius.targets/sirius_2020-12.target
+++ b/releng/org.eclipse.sirius.targets/sirius_2020-12.target
@@ -1,26 +1,19 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="sirius_2020-12" sequenceNumber="1623006049">
+<target name="sirius_2020-12" sequenceNumber="1623333343">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.apache.log4j" version="0.0.0"/>
       <unit id="org.easymock" version="0.0.0"/>
-      <unit id="org.hamcrest.core" version="0.0.0"/>
       <unit id="org.hamcrest.library" version="0.0.0"/>
       <unit id="org.junit" version="4.12.0.v201504281640"/>
-      <unit id="javax.servlet" version="0.0.0"/>
-      <unit id="javax.websocket" version="0.0.0"/>
-      <unit id="com.google.gson" version="0.0.0"/>
       <unit id="org.slf4j.api" version="1.7.2.v20121108-1250"/>
       <unit id="ch.qos.logback.slf4j" version="1.0.7.v201505121915"/>
       <unit id="ch.qos.logback.classic" version="1.0.7.v20121108-1250"/>
       <unit id="ch.qos.logback.core" version="1.0.7.v20121108-1250"/>
       <unit id="org.apache.xalan" version="2.7.1.v201005080400"/>
       <unit id="org.antlr.runtime" version="4.7.1.v20181120-0808"/>
-      <unit id="org.reactivestreams" version="1.0.2.v20181120-0809"/>
-      <unit id="com.graphql.java.dataloader" version="2.1.1.v20181120-0809"/>
-      <unit id="com.graphql.java" version="11.0.0.v20181120-0810"/>
       <repository id="Orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20190602212107/repository"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
@@ -68,26 +61,6 @@
       <repository id="ELK-0.7" location="https://download.eclipse.org/elk/updates/releases/0.7.1/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.jetty.io" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.continuation" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.http" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.server" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.servlet" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.servlets" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.util" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.security" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.websocket.servlet" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.websocket.common" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.websocket.server" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.websocket.api" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.client" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.websocket.client" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.xml" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.websocket.javax.websocket" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.websocket.javax.websocket.server" version="9.4.29.v20200521"/>
-      <repository id="Jetty-9.4.29" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.29.v20200521/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/>
       <repository id="GMF-Notation-1.13.0" location="https://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R202004160913"/>
     </location>
diff --git a/releng/org.eclipse.sirius.targets/sirius_2020-12.targetplatform b/releng/org.eclipse.sirius.targets/sirius_2020-12.targetplatform
index 2471177..82585ef 100644
--- a/releng/org.eclipse.sirius.targets/sirius_2020-12.targetplatform
+++ b/releng/org.eclipse.sirius.targets/sirius_2020-12.targetplatform
@@ -7,7 +7,6 @@
 include "modules/acceleo-3.7.tpd"
 include "modules/eef-2.1.tpd"
 include "modules/elk-0.7.tpd"
-include "modules/jetty-9.4.tpd"
 include "modules/gmf-runtime-1.13.tpd"
 
 with source, requirements
diff --git a/releng/org.eclipse.sirius.targets/sirius_2021-03.target b/releng/org.eclipse.sirius.targets/sirius_2021-03.target
index ccccee2..6272d45 100644
--- a/releng/org.eclipse.sirius.targets/sirius_2021-03.target
+++ b/releng/org.eclipse.sirius.targets/sirius_2021-03.target
@@ -1,26 +1,19 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="sirius_2021-03" sequenceNumber="1623006049">
+<target name="sirius_2021-03" sequenceNumber="1623333343">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.apache.log4j" version="0.0.0"/>
       <unit id="org.easymock" version="0.0.0"/>
-      <unit id="org.hamcrest.core" version="0.0.0"/>
       <unit id="org.hamcrest.library" version="0.0.0"/>
       <unit id="org.junit" version="4.12.0.v201504281640"/>
-      <unit id="javax.servlet" version="0.0.0"/>
-      <unit id="javax.websocket" version="0.0.0"/>
-      <unit id="com.google.gson" version="0.0.0"/>
       <unit id="org.slf4j.api" version="1.7.2.v20121108-1250"/>
       <unit id="ch.qos.logback.slf4j" version="1.0.7.v201505121915"/>
       <unit id="ch.qos.logback.classic" version="1.0.7.v20121108-1250"/>
       <unit id="ch.qos.logback.core" version="1.0.7.v20121108-1250"/>
       <unit id="org.apache.xalan" version="2.7.1.v201005080400"/>
       <unit id="org.antlr.runtime" version="4.7.1.v20181120-0808"/>
-      <unit id="org.reactivestreams" version="1.0.2.v20181120-0809"/>
-      <unit id="com.graphql.java.dataloader" version="2.1.1.v20181120-0809"/>
-      <unit id="com.graphql.java" version="11.0.0.v20181120-0810"/>
       <repository id="Orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20190602212107/repository"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
@@ -68,26 +61,6 @@
       <repository id="ELK-0.7" location="https://download.eclipse.org/elk/updates/releases/0.7.1/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.jetty.io" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.continuation" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.http" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.server" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.servlet" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.servlets" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.util" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.security" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.websocket.servlet" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.websocket.common" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.websocket.server" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.websocket.api" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.client" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.websocket.client" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.xml" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.websocket.javax.websocket" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.websocket.javax.websocket.server" version="9.4.29.v20200521"/>
-      <repository id="Jetty-9.4.29" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.29.v20200521/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/>
       <repository id="GMF-Notation-1.13.0" location="https://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R202004160913"/>
     </location>
diff --git a/releng/org.eclipse.sirius.targets/sirius_2021-03.targetplatform b/releng/org.eclipse.sirius.targets/sirius_2021-03.targetplatform
index e7095cc..b868e3e 100644
--- a/releng/org.eclipse.sirius.targets/sirius_2021-03.targetplatform
+++ b/releng/org.eclipse.sirius.targets/sirius_2021-03.targetplatform
@@ -7,7 +7,6 @@
 include "modules/acceleo-3.7.tpd"
 include "modules/eef-2.1.tpd"
 include "modules/elk-0.7.tpd"
-include "modules/jetty-9.4.tpd"
 include "modules/gmf-runtime-1.13.tpd"
 
 with source, requirements
diff --git a/releng/org.eclipse.sirius.targets/sirius_2021-06.target b/releng/org.eclipse.sirius.targets/sirius_2021-06.target
index 1e22554..5be8938 100644
--- a/releng/org.eclipse.sirius.targets/sirius_2021-06.target
+++ b/releng/org.eclipse.sirius.targets/sirius_2021-06.target
@@ -1,26 +1,19 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="sirius_2021-06" sequenceNumber="1623225880">
+<target name="sirius_2021-06" sequenceNumber="1623333343">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.apache.log4j" version="0.0.0"/>
       <unit id="org.easymock" version="0.0.0"/>
-      <unit id="org.hamcrest.core" version="0.0.0"/>
       <unit id="org.hamcrest.library" version="0.0.0"/>
       <unit id="org.junit" version="4.12.0.v201504281640"/>
-      <unit id="javax.servlet" version="0.0.0"/>
-      <unit id="javax.websocket" version="0.0.0"/>
-      <unit id="com.google.gson" version="0.0.0"/>
       <unit id="org.slf4j.api" version="1.7.2.v20121108-1250"/>
       <unit id="ch.qos.logback.slf4j" version="1.0.7.v201505121915"/>
       <unit id="ch.qos.logback.classic" version="1.0.7.v20121108-1250"/>
       <unit id="ch.qos.logback.core" version="1.0.7.v20121108-1250"/>
       <unit id="org.apache.xalan" version="2.7.1.v201005080400"/>
       <unit id="org.antlr.runtime" version="4.7.1.v20181120-0808"/>
-      <unit id="org.reactivestreams" version="1.0.2.v20181120-0809"/>
-      <unit id="com.graphql.java.dataloader" version="2.1.1.v20181120-0809"/>
-      <unit id="com.graphql.java" version="11.0.0.v20181120-0810"/>
       <repository id="Orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20190602212107/repository"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
@@ -68,26 +61,6 @@
       <repository id="ELK-0.7" location="https://download.eclipse.org/elk/updates/releases/0.7.1/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.jetty.io" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.continuation" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.http" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.server" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.servlet" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.servlets" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.util" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.security" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.websocket.servlet" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.websocket.common" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.websocket.server" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.websocket.api" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.client" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.websocket.client" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.xml" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.websocket.javax.websocket" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.websocket.javax.websocket.server" version="9.4.29.v20200521"/>
-      <repository id="Jetty-9.4.29" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.29.v20200521/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/>
       <repository id="GMF-Notation-1.13.0" location="https://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R202004160913"/>
     </location>
diff --git a/releng/org.eclipse.sirius.targets/sirius_2021-06.targetplatform b/releng/org.eclipse.sirius.targets/sirius_2021-06.targetplatform
index 68f1579..2c3f62b 100644
--- a/releng/org.eclipse.sirius.targets/sirius_2021-06.targetplatform
+++ b/releng/org.eclipse.sirius.targets/sirius_2021-06.targetplatform
@@ -7,7 +7,6 @@
 include "modules/acceleo-3.7.tpd"
 include "modules/eef-2.1.tpd"
 include "modules/elk-0.7.tpd"
-include "modules/jetty-9.4.tpd"
 include "modules/gmf-runtime-1.13.tpd"
 
 with source, requirements
diff --git a/releng/org.eclipse.sirius.targets/sirius_canary.target b/releng/org.eclipse.sirius.targets/sirius_canary.target
index 1c18cf3..ff3e344 100644
--- a/releng/org.eclipse.sirius.targets/sirius_canary.target
+++ b/releng/org.eclipse.sirius.targets/sirius_canary.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="sirius_canary" sequenceNumber="1623225933">
+<target name="sirius_canary" sequenceNumber="1623329330">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.license.feature.group" version="0.0.0"/>
@@ -15,26 +15,6 @@
       <repository id="EEF-Latest" location="https://download.eclipse.org/modeling/emft/eef/updates/nightly/latest/neon"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.jetty.io" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.continuation" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.http" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.server" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.servlet" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.servlets" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.util" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.security" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.websocket.servlet" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.websocket.common" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.websocket.server" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.websocket.api" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.client" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.websocket.client" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.xml" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.websocket.javax.websocket" version="9.4.29.v20200521"/>
-      <unit id="org.eclipse.jetty.websocket.javax.websocket.server" version="9.4.29.v20200521"/>
-      <repository id="Jetty-9.4.29" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.29.v20200521/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.sirius.common.interpreter" version="0.0.0"/>
       <repository id="Sirius-6.5.0" location="https://download.eclipse.org/sirius/updates/releases/6.5.0/2020-06/"/>
     </location>
diff --git a/releng/org.eclipse.sirius.targets/sirius_canary.targetplatform b/releng/org.eclipse.sirius.targets/sirius_canary.targetplatform
index 2bbcdbc..fe0c9ef 100644
--- a/releng/org.eclipse.sirius.targets/sirius_canary.targetplatform
+++ b/releng/org.eclipse.sirius.targets/sirius_canary.targetplatform
@@ -2,7 +2,6 @@
 
 include "modules/shared-license.tpd"
 include "modules/eef-nightly.tpd"
-include "modules/jetty-9.4.tpd"
 
 with source, requirements