[509735] Add Jetty to the target platform

Bug: 509735
Change-Id: I2a12ed69b0b6d096902c8a6a2e69c14a7d9a69eb
Signed-off-by: Stéphane Bégaudeau <stephane.begaudeau@obeo.fr>

10 files changed, 94 insertions, 4 deletions

diff --git a/releng/org.eclipse.sirius.targets/modules/jetty-9.4.tpd b/releng/org.eclipse.sirius.targets/modules/jetty-9.4.tpd
new file mode 100644
index 0000000000..34848f146d
--- /dev/null
+++ b/releng/org.eclipse.sirius.targets/modules/jetty-9.4.tpd
@@ -0,0 +1,15 @@
+target "Jetty 9.4.x"
+
+location "http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/" {
+	org.eclipse.jetty.io [9.0.0,9.5.0)
+	org.eclipse.jetty.http [9.0.0,9.5.0)
+	org.eclipse.jetty.server [9.0.0,9.5.0)
+	org.eclipse.jetty.servlet [9.0.0,9.5.0)
+	org.eclipse.jetty.servlets [9.0.0,9.5.0)
+	org.eclipse.jetty.util [9.0.0,9.5.0)
+	org.eclipse.jetty.osgi.boot [9.0.0,9.5.0)
+
+	// The bundle to use for the standard Java WebSocket API
+	// org.eclipse.jetty.websocket.javax.websocket [9.0.0,9.5.0)
+	// org.eclipse.jetty.websocket.javax.websocket.server [9.0.0,9.5.0)
+}
\ 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 b403ab0856..76739ad82a 100644
--- a/releng/org.eclipse.sirius.targets/modules/orbit.tpd
+++ b/releng/org.eclipse.sirius.targets/modules/orbit.tpd
@@ -6,4 +6,13 @@ location Orbit "http://download.eclipse.org/tools/orbit/downloads/drops/R2017081
     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)
 }
diff --git a/releng/org.eclipse.sirius.targets/sirius_canary.target b/releng/org.eclipse.sirius.targets/sirius_canary.target
index 858c781a42..35f018206f 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/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="sirius_canary" sequenceNumber="1519627598">
+<target name="sirius_canary" sequenceNumber="1519996466">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.license.feature.group" version="0.0.0"/>
@@ -15,6 +15,16 @@
       <repository id="EEF-Latest" location="http://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.8.v20171121"/>
+      <unit id="org.eclipse.jetty.http" version="9.4.8.v20171121"/>
+      <unit id="org.eclipse.jetty.server" version="9.4.8.v20171121"/>
+      <unit id="org.eclipse.jetty.servlet" version="9.4.8.v20171121"/>
+      <unit id="org.eclipse.jetty.servlets" version="9.4.8.v20171121"/>
+      <unit id="org.eclipse.jetty.util" version="9.4.8.v20171121"/>
+      <unit id="org.eclipse.jetty.osgi.boot" version="9.4.8.v20171121"/>
+      <repository location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/"/>
+    </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-Oxygen-Master" location="http://download.eclipse.org/sirius/updates/nightly/latest/oxygen/"/>
     </location>
diff --git a/releng/org.eclipse.sirius.targets/sirius_canary.targetplatform b/releng/org.eclipse.sirius.targets/sirius_canary.targetplatform
index 9fe15edd6a..ad624e5c2f 100644
--- a/releng/org.eclipse.sirius.targets/sirius_canary.targetplatform
+++ b/releng/org.eclipse.sirius.targets/sirius_canary.targetplatform
@@ -2,6 +2,7 @@ target "sirius_canary"
 
 include "modules/shared-license.tpd"
 include "modules/eef-nightly.tpd"
+include "modules/jetty-9.4.tpd"
 
 with source, requirements
 
diff --git a/releng/org.eclipse.sirius.targets/sirius_neon.target b/releng/org.eclipse.sirius.targets/sirius_neon.target
index 055604cbf5..18b028f92b 100644
--- a/releng/org.eclipse.sirius.targets/sirius_neon.target
+++ b/releng/org.eclipse.sirius.targets/sirius_neon.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="sirius_neon" sequenceNumber="1519393040">
+<target name="sirius_neon" sequenceNumber="1519985815">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.apache.log4j" version="0.0.0"/>
@@ -9,6 +9,13 @@
       <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"/>
       <repository id="Orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170818183741/repository"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
@@ -50,6 +57,16 @@
       <repository id="ELK-0.3" location="http://download.eclipse.org/elk/updates/releases/0.3.0/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.jetty.io" version="9.4.8.v20171121"/>
+      <unit id="org.eclipse.jetty.http" version="9.4.8.v20171121"/>
+      <unit id="org.eclipse.jetty.server" version="9.4.8.v20171121"/>
+      <unit id="org.eclipse.jetty.servlet" version="9.4.8.v20171121"/>
+      <unit id="org.eclipse.jetty.servlets" version="9.4.8.v20171121"/>
+      <unit id="org.eclipse.jetty.util" version="9.4.8.v20171121"/>
+      <unit id="org.eclipse.jetty.osgi.boot" version="9.4.8.v20171121"/>
+      <repository location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/"/>
+    </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-Neon-Master" location="http://download.eclipse.org/sirius/updates/nightly/latest/neon/"/>
     </location>
diff --git a/releng/org.eclipse.sirius.targets/sirius_neon.targetplatform b/releng/org.eclipse.sirius.targets/sirius_neon.targetplatform
index d7451d0963..9f73dd01a1 100644
--- a/releng/org.eclipse.sirius.targets/sirius_neon.targetplatform
+++ b/releng/org.eclipse.sirius.targets/sirius_neon.targetplatform
@@ -7,6 +7,7 @@ include "modules/aql-nightly.tpd"
 include "modules/acceleo-nightly.tpd"
 include "modules/eef-nightly.tpd"
 include "modules/elk-0.3.tpd"
+include "modules/jetty-9.4.tpd"
 
 with source, requirements
 
diff --git a/releng/org.eclipse.sirius.targets/sirius_oxygen.target b/releng/org.eclipse.sirius.targets/sirius_oxygen.target
index cf3cc7a2d4..7edd82423c 100644
--- a/releng/org.eclipse.sirius.targets/sirius_oxygen.target
+++ b/releng/org.eclipse.sirius.targets/sirius_oxygen.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="sirius_oxygen" sequenceNumber="1519393005">
+<target name="sirius_oxygen" sequenceNumber="1519985815">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.apache.log4j" version="0.0.0"/>
@@ -9,6 +9,13 @@
       <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"/>
       <repository id="Orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170818183741/repository"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
@@ -50,6 +57,16 @@
       <repository id="ELK-0.3" location="http://download.eclipse.org/elk/updates/releases/0.3.0/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.jetty.io" version="9.4.8.v20171121"/>
+      <unit id="org.eclipse.jetty.http" version="9.4.8.v20171121"/>
+      <unit id="org.eclipse.jetty.server" version="9.4.8.v20171121"/>
+      <unit id="org.eclipse.jetty.servlet" version="9.4.8.v20171121"/>
+      <unit id="org.eclipse.jetty.servlets" version="9.4.8.v20171121"/>
+      <unit id="org.eclipse.jetty.util" version="9.4.8.v20171121"/>
+      <unit id="org.eclipse.jetty.osgi.boot" version="9.4.8.v20171121"/>
+      <repository location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/"/>
+    </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-Oxygen-Master" location="http://download.eclipse.org/sirius/updates/nightly/latest/oxygen/"/>
     </location>
diff --git a/releng/org.eclipse.sirius.targets/sirius_oxygen.targetplatform b/releng/org.eclipse.sirius.targets/sirius_oxygen.targetplatform
index 658f274c34..1b74a24578 100644
--- a/releng/org.eclipse.sirius.targets/sirius_oxygen.targetplatform
+++ b/releng/org.eclipse.sirius.targets/sirius_oxygen.targetplatform
@@ -7,6 +7,7 @@ include "modules/aql-nightly.tpd"
 include "modules/acceleo-nightly.tpd"
 include "modules/eef-nightly.tpd"
 include "modules/elk-0.3.tpd"
+include "modules/jetty-9.4.tpd"
 
 with source, requirements
 
diff --git a/releng/org.eclipse.sirius.targets/sirius_photon.target b/releng/org.eclipse.sirius.targets/sirius_photon.target
index 7042ec925d..9b4631da1a 100644
--- a/releng/org.eclipse.sirius.targets/sirius_photon.target
+++ b/releng/org.eclipse.sirius.targets/sirius_photon.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="sirius_photon" sequenceNumber="1514364121">
+<target name="sirius_photon" sequenceNumber="1519982391">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.apache.log4j" version="0.0.0"/>
@@ -9,6 +9,13 @@
       <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"/>
       <repository id="Orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170818183741/repository"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
@@ -50,6 +57,16 @@
       <repository id="ELK-0.3" location="http://download.eclipse.org/elk/updates/releases/0.3.0/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.jetty.io" version="9.4.8.v20171121"/>
+      <unit id="org.eclipse.jetty.http" version="9.4.8.v20171121"/>
+      <unit id="org.eclipse.jetty.server" version="9.4.8.v20171121"/>
+      <unit id="org.eclipse.jetty.servlet" version="9.4.8.v20171121"/>
+      <unit id="org.eclipse.jetty.servlets" version="9.4.8.v20171121"/>
+      <unit id="org.eclipse.jetty.util" version="9.4.8.v20171121"/>
+      <unit id="org.eclipse.jetty.osgi.boot" version="9.4.8.v20171121"/>
+      <repository location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/"/>
+    </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-Oxygen-Master" location="http://download.eclipse.org/sirius/updates/nightly/latest/oxygen/"/>
     </location>
diff --git a/releng/org.eclipse.sirius.targets/sirius_photon.targetplatform b/releng/org.eclipse.sirius.targets/sirius_photon.targetplatform
index f01997beb7..0b34c8a58a 100644
--- a/releng/org.eclipse.sirius.targets/sirius_photon.targetplatform
+++ b/releng/org.eclipse.sirius.targets/sirius_photon.targetplatform
@@ -7,6 +7,8 @@ include "modules/aql-nightly.tpd"
 include "modules/acceleo-nightly.tpd"
 include "modules/eef-nightly.tpd"
 include "modules/elk-0.3.tpd"
+include "modules/jetty-9.4.tpd"
+
 with source, requirements
 
 location Sirius-Oxygen-Master "http://download.eclipse.org/sirius/updates/nightly/latest/oxygen/" {