diff --git a/core/org.eclipse.cdt.core.tests/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core.tests/META-INF/MANIFEST.MF
index d67e449333a..80281c25445 100644
--- a/core/org.eclipse.cdt.core.tests/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.cdt.core.tests/META-INF/MANIFEST.MF
@@ -43,7 +43,8 @@ Require-Bundle: org.eclipse.core.resources,
  org.eclipse.jface.text,
  org.eclipse.core.filesystem,
  org.eclipse.ltk.core.refactoring;bundle-version="3.4.0",
- org.hamcrest,
+ org.hamcrest.core,
+ org.hamcrest.library,
  com.google.gson;bundle-version="[2.8.6,3.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %providerName
diff --git a/core/org.eclipse.cdt.ui.tests/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.ui.tests/META-INF/MANIFEST.MF
index a23c820e594..79c3b898b97 100644
--- a/core/org.eclipse.cdt.ui.tests/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.cdt.ui.tests/META-INF/MANIFEST.MF
@@ -40,7 +40,8 @@ Require-Bundle: org.eclipse.jface.text,
  org.eclipse.osgi,
  org.eclipse.e4.core.contexts;bundle-version="[1.8.300,2.0.0)",
  org.mockito,
- org.hamcrest
+ org.hamcrest.core,
+ org.hamcrest.library
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/debug/org.eclipse.cdt.debug.application.product/debug.product b/debug/org.eclipse.cdt.debug.application.product/debug.product
index f4dae08eee4..7663237c62b 100644
--- a/debug/org.eclipse.cdt.debug.application.product/debug.product
+++ b/debug/org.eclipse.cdt.debug.application.product/debug.product
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
+
 <!--
    Copyright (c) 2015, 2021 Contributors to the Eclipse Foundation
 
@@ -186,15 +187,17 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
       <plugin id="com.sun.jna"/>
       <plugin id="com.sun.jna.platform"/>
       <plugin id="com.sun.xml.bind"/>
+      <plugin id="jakarta.servlet-api"/>
       <plugin id="jakarta.xml.bind"/>
       <plugin id="javax.activation"/>
       <plugin id="javax.annotation"/>
       <plugin id="javax.el"/>
       <plugin id="javax.inject"/>
-      <plugin id="javax.servlet"/>
       <plugin id="javax.servlet.jsp"/>
       <plugin id="javax.xml"/>
       <plugin id="javax.xml.stream"/>
+      <plugin id="net.bytebuddy.byte-buddy"/>
+      <plugin id="net.bytebuddy.byte-buddy-agent"/>
       <plugin id="org.apache.batik.constants"/>
       <plugin id="org.apache.batik.css"/>
       <plugin id="org.apache.batik.i18n"/>
@@ -211,10 +214,12 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
       <plugin id="org.apache.lucene.analyzers-smartcn"/>
       <plugin id="org.apache.lucene.core"/>
       <plugin id="org.apache.xmlgraphics"/>
+      <plugin id="org.bouncycastle.bcpg"/>
+      <plugin id="org.bouncycastle.bcprov"/>
       <plugin id="org.eclipse.cdt.core"/>
       <plugin id="org.eclipse.cdt.core.linux" fragment="true"/>
-      <plugin id="org.eclipse.cdt.core.linux.x86_64" fragment="true"/>
       <plugin id="org.eclipse.cdt.core.linux.aarch64" fragment="true"/>
+      <plugin id="org.eclipse.cdt.core.linux.x86_64" fragment="true"/>
       <plugin id="org.eclipse.cdt.core.macosx" fragment="true"/>
       <plugin id="org.eclipse.cdt.core.native"/>
       <plugin id="org.eclipse.cdt.core.win32" fragment="true"/>
@@ -257,6 +262,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
       <plugin id="org.eclipse.core.filesystem.win32.x86_64" fragment="true"/>
       <plugin id="org.eclipse.core.jobs"/>
       <plugin id="org.eclipse.core.net"/>
+      <plugin id="org.eclipse.core.net.linux" fragment="true"/>
       <plugin id="org.eclipse.core.net.linux.x86_64" fragment="true"/>
       <!-- Does not exist, see Bug 566638: plugin id="org.eclipse.core.net.linux.aarch64" fragment="true"/ -->
       <plugin id="org.eclipse.core.net.win32.x86_64" fragment="true"/>
@@ -282,6 +288,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
       <plugin id="org.eclipse.e4.ui.ide"/>
       <plugin id="org.eclipse.e4.ui.model.workbench"/>
       <plugin id="org.eclipse.e4.ui.services"/>
+      <plugin id="org.eclipse.e4.ui.swt.gtk" fragment="true"/>
       <plugin id="org.eclipse.e4.ui.widgets"/>
       <plugin id="org.eclipse.e4.ui.workbench"/>
       <plugin id="org.eclipse.e4.ui.workbench.addons.swt"/>
@@ -314,8 +321,8 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
       <plugin id="org.eclipse.equinox.jsp.jasper.registry"/>
       <plugin id="org.eclipse.equinox.launcher"/>
       <plugin id="org.eclipse.equinox.launcher.cocoa.macosx.x86_64" fragment="true"/>
-      <plugin id="org.eclipse.equinox.launcher.gtk.linux.x86_64" fragment="true"/>
       <plugin id="org.eclipse.equinox.launcher.gtk.linux.aarch64" fragment="true"/>
+      <plugin id="org.eclipse.equinox.launcher.gtk.linux.x86_64" fragment="true"/>
       <plugin id="org.eclipse.equinox.launcher.win32.win32.x86_64" fragment="true"/>
       <plugin id="org.eclipse.equinox.p2.artifact.repository"/>
       <plugin id="org.eclipse.equinox.p2.core"/>
@@ -335,6 +342,8 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
       <plugin id="org.eclipse.equinox.preferences"/>
       <plugin id="org.eclipse.equinox.registry"/>
       <plugin id="org.eclipse.equinox.security"/>
+      <plugin id="org.eclipse.equinox.security.linux" fragment="true"/>
+      <plugin id="org.eclipse.equinox.security.linux.x86_64" fragment="true"/>
       <plugin id="org.eclipse.equinox.security.macosx" fragment="true"/>
       <plugin id="org.eclipse.equinox.security.ui"/>
       <plugin id="org.eclipse.equinox.simpleconfigurator"/>
@@ -362,11 +371,12 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
       <plugin id="org.eclipse.osgi.compatibility.state" fragment="true"/>
       <plugin id="org.eclipse.osgi.services"/>
       <plugin id="org.eclipse.osgi.util"/>
+      <plugin id="org.eclipse.pde.ds.lib"/>
       <plugin id="org.eclipse.search"/>
       <plugin id="org.eclipse.swt"/>
       <plugin id="org.eclipse.swt.cocoa.macosx.x86_64" fragment="true"/>
-      <plugin id="org.eclipse.swt.gtk.linux.x86_64" fragment="true"/>
       <plugin id="org.eclipse.swt.gtk.linux.aarch64" fragment="true"/>
+      <plugin id="org.eclipse.swt.gtk.linux.x86_64" fragment="true"/>
       <plugin id="org.eclipse.swt.win32.win32.x86_64" fragment="true"/>
       <plugin id="org.eclipse.team.core"/>
       <plugin id="org.eclipse.team.ui"/>
@@ -394,6 +404,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
       <plugin id="org.freemarker"/>
       <plugin id="org.sat4j.core"/>
       <plugin id="org.sat4j.pb"/>
+      <plugin id="org.slf4j.api"/>
       <plugin id="org.tukaani.xz"/>
       <plugin id="org.w3c.css.sac"/>
       <plugin id="org.w3c.dom.events"/>
diff --git a/releng/CDT.setup b/releng/CDT.setup
index 64045e5acfe..e62173e04ba 100644
--- a/releng/CDT.setup
+++ b/releng/CDT.setup
@@ -166,17 +166,17 @@
       <repositoryList
           name="CDT Latest Released">
         <repository
-            url="https://download.eclipse.org/eclipse/updates/4.19/R-4.19-202103031800/"/>
+            url="https://download.eclipse.org/eclipse/updates/4.22-I-builds/I20211023-1800/"/>
         <repository
-            url="https://download.eclipse.org/egit/updates-5.11/"/>
+            url="https://download.eclipse.org/egit/updates"/>
         <repository
-            url="https://download.eclipse.org/linuxtools/update-2021-03-docker-rc2"/>
+            url="https://download.eclipse.org/linuxtools/updates-docker-nightly/"/>
         <repository
-            url="https://download.eclipse.org/lsp4e/releases/0.18.0/"/>
+            url="https://download.eclipse.org/lsp4e/releases/0.19.0/"/>
         <repository
-            url="https://download.eclipse.org/modeling/emf/emf/builds/release/2.25/"/>
+            url="https://download.eclipse.org/modeling/emf/emf/builds/release/latest/"/>
         <repository
-            url="https://download.eclipse.org/mylyn/docs/releases/3.0.38/"/>
+            url="https://download.eclipse.org/mylyn/docs/releases/3.0.40/"/>
         <repository
             url="http://download.eclipse.org/mylyn/drops/3.25.2/v20200831-1956"/>
         <repository
@@ -194,9 +194,9 @@
           </annotation>
         </repository>
         <repository
-            url="https://download.eclipse.org/tools/orbit/downloads/drops/R20210223232630/repository"/>
+            url="https://download.eclipse.org/tools/orbit/downloads/drops/S20211020204107/repository"/>
         <repository
-            url="https://download.eclipse.org/tools/ptp/remote/releases/3.0/remote-3.0.1/"/>
+            url="https://download.eclipse.org/tools/ptp/builds/remote/3.0/2021-09/"/>
       </repositoryList>
     </targlet>
   </setupTask>
@@ -222,10 +222,10 @@
             name="com.google.gson"/>
         <requirement
             name="com.sun.jna"
-            versionRange="5.6.0"/>
+            versionRange="5.8.0"/>
         <requirement
             name="com.sun.jna.platform"
-            versionRange="5.6.0"/>
+            versionRange="5.8.0"/>
         <requirement
             name="com.sun.xml.bind"
             versionRange="2.3.3"/>
diff --git a/releng/org.eclipse.cdt.target/cdt-baseline.target b/releng/org.eclipse.cdt.target/cdt-baseline.target
index 5709a40dbbb..0c122e51b79 100644
--- a/releng/org.eclipse.cdt.target/cdt-baseline.target
+++ b/releng/org.eclipse.cdt.target/cdt-baseline.target
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="cdt-baseline" sequenceNumber="30">
+<target name="cdt-baseline" sequenceNumber="31">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <repository location="https://download.eclipse.org/eclipse/updates/4.19/R-4.19-202103031800/"/>
diff --git a/releng/org.eclipse.cdt.target/cdt.target b/releng/org.eclipse.cdt.target/cdt.target
index c48527c74d2..a74843443f2 100644
--- a/releng/org.eclipse.cdt.target/cdt.target
+++ b/releng/org.eclipse.cdt.target/cdt.target
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="cdt" sequenceNumber="106">
+<target name="cdt" sequenceNumber="107">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.license.feature.group" version="0.0.0"/>
@@ -12,7 +12,7 @@
 <unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.test.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.unittest.ui" version="0.0.0"/>
-<repository location="https://download.eclipse.org/eclipse/updates/4.19/R-4.19-202103031800/"/>
+<repository location="https://download.eclipse.org/eclipse/updates/4.22-I-builds/I20211023-1800/"/>
 </location>
 	<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 		<repository location="https://download.eclipse.org/egit/updates"/>
@@ -25,13 +25,13 @@
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.lsp4e" version="0.0.0"/>
 <unit id="org.eclipse.lsp4e.debug" version="0.0.0"/>
-<repository location="https://download.eclipse.org/lsp4e/releases/0.18.0/"/>
+<repository location="https://download.eclipse.org/lsp4e/releases/0.19.0/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/latest/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<repository location="https://download.eclipse.org/mylyn/docs/releases/3.0.38/"/>
+<repository location="https://download.eclipse.org/mylyn/docs/releases/3.0.40/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <repository location="https://download.eclipse.org/mylyn/drops/3.25.2/v20200831-1956/"/>
@@ -40,7 +40,7 @@
 <unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.swtbot.eclipse.test.junit.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.swtbot.feature.group" version="0.0.0"/>
-<repository location="https://download.eclipse.org/technology/swtbot/releases/3.0.0/"/>
+<repository location="https://download.eclipse.org/technology/swtbot/releases/3.1.0/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.tm4e.feature.feature.group" version="0.0.0"/>
@@ -74,15 +74,15 @@
 <unit id="org.mockito" version="0.0.0"/>
 <unit id="org.slf4j.impl.log4j12" version="0.0.0"/>
 <unit id="org.yaml.snakeyaml" version="0.0.0"/>
-<unit id="com.sun.jna" version="5.6.0.v20200716-0148"/>
-<unit id="com.sun.jna.platform" version="5.6.0.v20200722-0209"/>
-<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210223232630/repository/"/>
+<unit id="com.sun.jna" version="5.8.0.v20210503-0343"/>
+<unit id="com.sun.jna.platform" version="5.8.0.v20210406-1004"/>
+<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20211020204107/repository/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.remote.console.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.remote.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.remote.serial.feature.group" version="0.0.0"/>
-<repository location="https://download.eclipse.org/tools/ptp/remote/releases/3.0/remote-3.0.1/"/>
+<repository location="https://download.eclipse.org/tools/ptp/builds/remote/3.0/2021-09/"/>
 </location>
 </locations>
 <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>