From 6c8408c1d5376b015d199779dbe2127a7ff01db5 Mon Sep 17 00:00:00 2001
From: Alvaro Sanchez-Leon <alvsan09@gmail.com>
Date: Wed, 4 Mar 2015 16:26:30 -0500
Subject: [PATCH] Remove Jetty from target definitions as this is no longer
 needed

Jetty has already been removed from the cdt-e4.5.target
However it's ocassionally causing errors in 4.4 and it's not
actually needed as it's now included in the platform.

This change removes Jetty from all available target files.

Change-Id: Iaff7497a8387c13b6bfc011b5ded905b134994da
---
 releng/org.eclipse.cdt.target/cdt-e3.8.target    | 6 +-----
 releng/org.eclipse.cdt.target/cdt-e4.2.target    | 6 +-----
 releng/org.eclipse.cdt.target/cdt-e4.3.target    | 6 +-----
 releng/org.eclipse.cdt.target/cdt-e4.4.target    | 6 +-----
 releng/org.eclipse.cdt.target/cdt-staging.target | 6 +-----
 5 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/releng/org.eclipse.cdt.target/cdt-e3.8.target b/releng/org.eclipse.cdt.target/cdt-e3.8.target
index 9cff665b326..79bac5f9b92 100644
--- a/releng/org.eclipse.cdt.target/cdt-e3.8.target
+++ b/releng/org.eclipse.cdt.target/cdt-e3.8.target
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
 
-<target name="cdt_e3.8" sequenceNumber="9">
+<target name="cdt_e3.8" sequenceNumber="10">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.jetty.bundles.f.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/jetty/updates/jetty-bundles-8.x"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.apache.log4j" version="0.0.0"/>
 <unit id="org.apache.log4j.source" version="0.0.0"/>
 <unit id="net.sourceforge.lpg.lpgjavaruntime" version="0.0.0"/>
diff --git a/releng/org.eclipse.cdt.target/cdt-e4.2.target b/releng/org.eclipse.cdt.target/cdt-e4.2.target
index f32602c87a9..07034199b2c 100644
--- a/releng/org.eclipse.cdt.target/cdt-e4.2.target
+++ b/releng/org.eclipse.cdt.target/cdt-e4.2.target
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
 
-<target name="cdt_e4.2" sequenceNumber="3">
+<target name="cdt_e4.2" sequenceNumber="4">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.jetty.bundles.f.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/jetty/updates/jetty-bundles-8.x"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.apache.log4j" version="0.0.0"/>
 <unit id="org.apache.log4j.source" version="0.0.0"/>
 <unit id="net.sourceforge.lpg.lpgjavaruntime" version="0.0.0"/>
diff --git a/releng/org.eclipse.cdt.target/cdt-e4.3.target b/releng/org.eclipse.cdt.target/cdt-e4.3.target
index aa26e1b0fd8..dbc55ee3891 100644
--- a/releng/org.eclipse.cdt.target/cdt-e4.3.target
+++ b/releng/org.eclipse.cdt.target/cdt-e4.3.target
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
 
-<target name="cdt_e4.3" sequenceNumber="17">
+<target name="cdt_e4.3" sequenceNumber="18">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.jetty.bundles.f.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/jetty/updates/jetty-bundles-8.x"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.apache.log4j" version="0.0.0"/>
 <unit id="org.apache.log4j.source" version="0.0.0"/>
 <unit id="net.sourceforge.lpg.lpgjavaruntime" version="0.0.0"/>
diff --git a/releng/org.eclipse.cdt.target/cdt-e4.4.target b/releng/org.eclipse.cdt.target/cdt-e4.4.target
index 65073e1760d..638df47c7d5 100644
--- a/releng/org.eclipse.cdt.target/cdt-e4.4.target
+++ b/releng/org.eclipse.cdt.target/cdt-e4.4.target
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="cdt_e4.4" sequenceNumber="19">
+<?pde version="3.8"?><target name="cdt_e4.4" sequenceNumber="20">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.jetty.bundles.f.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/jetty/updates/jetty-bundles-8.x"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.apache.log4j" version="0.0.0"/>
 <unit id="org.apache.log4j.source" version="0.0.0"/>
 <unit id="net.sourceforge.lpg.lpgjavaruntime" version="0.0.0"/>
diff --git a/releng/org.eclipse.cdt.target/cdt-staging.target b/releng/org.eclipse.cdt.target/cdt-staging.target
index 5862af1fbb9..2ccae55724d 100644
--- a/releng/org.eclipse.cdt.target/cdt-staging.target
+++ b/releng/org.eclipse.cdt.target/cdt-staging.target
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="cdt_staging" sequenceNumber="10">
+<?pde version="3.8"?><target name="cdt_staging" sequenceNumber="11">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.jetty.bundles.f.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/jetty/updates/jetty-bundles-8.x"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.apache.log4j" version="0.0.0"/>
 <unit id="org.apache.log4j.source" version="0.0.0"/>
 <unit id="net.sourceforge.lpg.lpgjavaruntime" version="0.0.0"/>