Merge branch 'master' into stable-6.0

* master:
  Update target platform to Jetty 10.0.6

Change-Id: I8e19332129cb5fcd8f6a74298654342fe1a57e67

5 files changed, 39 insertions, 47 deletions

diff --git a/org.eclipse.mylyn.github.target/github.target b/org.eclipse.mylyn.github.target/github.target
index d4bf45a6..637eb81b 100644
--- a/org.eclipse.mylyn.github.target/github.target
+++ b/org.eclipse.mylyn.github.target/github.target
@@ -1,28 +1,26 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="github" sequenceNumber="1636553393">
+<target name="github" sequenceNumber="1637666736">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
-      <unit id="org.eclipse.jetty.client" version="9.4.44.v20210927"/>
-      <unit id="org.eclipse.jetty.client.source" version="9.4.44.v20210927"/>
-      <unit id="org.eclipse.jetty.continuation" version="9.4.44.v20210927"/>
-      <unit id="org.eclipse.jetty.continuation.source" version="9.4.44.v20210927"/>
-      <unit id="org.eclipse.jetty.http" version="9.4.44.v20210927"/>
-      <unit id="org.eclipse.jetty.http.source" version="9.4.44.v20210927"/>
-      <unit id="org.eclipse.jetty.io" version="9.4.44.v20210927"/>
-      <unit id="org.eclipse.jetty.io.source" version="9.4.44.v20210927"/>
-      <unit id="org.eclipse.jetty.security" version="9.4.44.v20210927"/>
-      <unit id="org.eclipse.jetty.security.source" version="9.4.44.v20210927"/>
-      <unit id="org.eclipse.jetty.server" version="9.4.44.v20210927"/>
-      <unit id="org.eclipse.jetty.server.source" version="9.4.44.v20210927"/>
-      <unit id="org.eclipse.jetty.servlet" version="9.4.44.v20210927"/>
-      <unit id="org.eclipse.jetty.servlet.source" version="9.4.44.v20210927"/>
-      <unit id="org.eclipse.jetty.util" version="9.4.44.v20210927"/>
-      <unit id="org.eclipse.jetty.util.source" version="9.4.44.v20210927"/>
-      <unit id="org.eclipse.jetty.util.ajax" version="9.4.44.v20210927"/>
-      <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.44.v20210927"/>
-      <repository id="jetty-9.4.x" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.44.v20210927/"/>
+      <unit id="jakarta.servlet-api" version="4.0.0"/>
+      <unit id="jakarta.servlet-api.source" version="4.0.0"/>
+      <unit id="org.eclipse.jetty.http" version="10.0.6"/>
+      <unit id="org.eclipse.jetty.http.source" version="10.0.6"/>
+      <unit id="org.eclipse.jetty.io" version="10.0.6"/>
+      <unit id="org.eclipse.jetty.io.source" version="10.0.6"/>
+      <unit id="org.eclipse.jetty.security" version="10.0.6"/>
+      <unit id="org.eclipse.jetty.security.source" version="10.0.6"/>
+      <unit id="org.eclipse.jetty.server" version="10.0.6"/>
+      <unit id="org.eclipse.jetty.server.source" version="10.0.6"/>
+      <unit id="org.eclipse.jetty.servlet" version="10.0.6"/>
+      <unit id="org.eclipse.jetty.servlet.source" version="10.0.6"/>
+      <unit id="org.eclipse.jetty.util" version="10.0.6"/>
+      <unit id="org.eclipse.jetty.util.source" version="10.0.6"/>
+      <unit id="org.eclipse.jetty.util.ajax" version="10.0.6"/>
+      <unit id="org.eclipse.jetty.util.ajax.source" version="10.0.6"/>
+      <repository id="jetty-10.0.x" location="https://download.eclipse.org/eclipse/jetty/10.0.6/"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.eclipse.license.feature.group" version="0.0.0"/>
@@ -49,8 +47,6 @@
       <unit id="javaewah.source" version="1.1.13.v20211029-0839"/>
       <unit id="javax.activation" version="1.1.0.v201211130549"/>
       <unit id="javax.activation.source" version="1.1.0.v201211130549"/>
-      <unit id="javax.servlet" version="3.1.0.v201410161800"/>
-      <unit id="javax.servlet.source" version="3.1.0.v201410161800"/>
       <unit id="javax.xml.bind" version="2.2.0.v201105210648"/>
       <unit id="javax.xml.bind.source" version="2.2.0.v201105210648"/>
       <unit id="javax.xml.stream" version="1.0.1.v201004272200"/>
diff --git a/org.eclipse.mylyn.github.target/github.tpd b/org.eclipse.mylyn.github.target/github.tpd
index 038b7e93..d5bb6518 100644
--- a/org.eclipse.mylyn.github.target/github.tpd
+++ b/org.eclipse.mylyn.github.target/github.tpd
@@ -1,6 +1,6 @@
 target "github" with source configurePhase
 
-include "projects/jetty-9.4.x.tpd"
+include "projects/jetty-10.0.x.tpd"
 include "projects/license.tpd"
 include "projects/swtbot-snapshot.tpd"
 include "orbit/S20211108222137.tpd"
diff --git a/org.eclipse.mylyn.github.target/orbit/S20211108222137.tpd b/org.eclipse.mylyn.github.target/orbit/S20211108222137.tpd
index c6f9abf9..72e1494e 100644
--- a/org.eclipse.mylyn.github.target/orbit/S20211108222137.tpd
+++ b/org.eclipse.mylyn.github.target/orbit/S20211108222137.tpd
@@ -16,8 +16,6 @@ location "https://download.eclipse.org/tools/orbit/downloads/drops/S202111082221
 	javaewah.source [1.1.13.v20211029-0839,1.1.13.v20211029-0839]
 	javax.activation [1.1.0.v201211130549,1.1.0.v201211130549]
 	javax.activation.source [1.1.0.v201211130549,1.1.0.v201211130549]
-	javax.servlet [3.1.0.v201410161800,3.1.0.v201410161800]
-	javax.servlet.source [3.1.0.v201410161800,3.1.0.v201410161800]
 	javax.xml.bind [2.2.0.v201105210648,2.2.0.v201105210648]
 	javax.xml.bind.source [2.2.0.v201105210648,2.2.0.v201105210648]
 	javax.xml.stream [1.0.1.v201004272200,1.0.1.v201004272200]
diff --git a/org.eclipse.mylyn.github.target/projects/jetty-10.0.x.tpd b/org.eclipse.mylyn.github.target/projects/jetty-10.0.x.tpd
new file mode 100644
index 00000000..6c3ee183
--- /dev/null
+++ b/org.eclipse.mylyn.github.target/projects/jetty-10.0.x.tpd
@@ -0,0 +1,20 @@
+target "jetty-10.0.x" with source configurePhase
+
+location jetty-10.0.x "https://download.eclipse.org/eclipse/jetty/10.0.6/" {
+	jakarta.servlet-api [4.0.0, 5.0.0)
+	jakarta.servlet-api.source [4.0.0, 5.0.0)
+	org.eclipse.jetty.http [10.0.6,10.0.6]
+	org.eclipse.jetty.http.source [10.0.6,10.0.6]
+	org.eclipse.jetty.io [10.0.6,10.0.6]
+	org.eclipse.jetty.io.source [10.0.6,10.0.6]
+	org.eclipse.jetty.security [10.0.6,10.0.6]
+	org.eclipse.jetty.security.source [10.0.6,10.0.6]
+	org.eclipse.jetty.server [10.0.6,10.0.6]
+	org.eclipse.jetty.server.source [10.0.6,10.0.6]
+	org.eclipse.jetty.servlet [10.0.6,10.0.6]
+	org.eclipse.jetty.servlet.source [10.0.6,10.0.6]
+	org.eclipse.jetty.util [10.0.6,10.0.6]
+	org.eclipse.jetty.util.source [10.0.6,10.0.6]
+	org.eclipse.jetty.util.ajax [10.0.6,10.0.6]
+	org.eclipse.jetty.util.ajax.source [10.0.6,10.0.6]
+}
diff --git a/org.eclipse.mylyn.github.target/projects/jetty-9.4.x.tpd b/org.eclipse.mylyn.github.target/projects/jetty-9.4.x.tpd
deleted file mode 100644
index 8a143ce2..00000000
--- a/org.eclipse.mylyn.github.target/projects/jetty-9.4.x.tpd
+++ /dev/null
@@ -1,22 +0,0 @@
-target "jetty-9.4.x" with source configurePhase
-
-location jetty-9.4.x "https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.44.v20210927/" {
-	org.eclipse.jetty.client [9.4.44.v20210927,9.4.44.v20210927]
-	org.eclipse.jetty.client.source [9.4.44.v20210927,9.4.44.v20210927]
-	org.eclipse.jetty.continuation [9.4.44.v20210927,9.4.44.v20210927]
-	org.eclipse.jetty.continuation.source [9.4.44.v20210927,9.4.44.v20210927]
-	org.eclipse.jetty.http [9.4.44.v20210927,9.4.44.v20210927]
-	org.eclipse.jetty.http.source [9.4.44.v20210927,9.4.44.v20210927]
-	org.eclipse.jetty.io [9.4.44.v20210927,9.4.44.v20210927]
-	org.eclipse.jetty.io.source [9.4.44.v20210927,9.4.44.v20210927]
-	org.eclipse.jetty.security [9.4.44.v20210927,9.4.44.v20210927]
-	org.eclipse.jetty.security.source [9.4.44.v20210927,9.4.44.v20210927]
-	org.eclipse.jetty.server [9.4.44.v20210927,9.4.44.v20210927]
-	org.eclipse.jetty.server.source [9.4.44.v20210927,9.4.44.v20210927]
-	org.eclipse.jetty.servlet [9.4.44.v20210927,9.4.44.v20210927]
-	org.eclipse.jetty.servlet.source [9.4.44.v20210927,9.4.44.v20210927]
-	org.eclipse.jetty.util [9.4.44.v20210927,9.4.44.v20210927]
-	org.eclipse.jetty.util.source [9.4.44.v20210927,9.4.44.v20210927]
-	org.eclipse.jetty.util.ajax [9.4.44.v20210927,9.4.44.v20210927]
-	org.eclipse.jetty.util.ajax.source [9.4.44.v20210927,9.4.44.v20210927]
-}