diff --git a/rcp/org.eclipse.tracecompass.rcp/feature.xml b/rcp/org.eclipse.tracecompass.rcp/feature.xml
index 2e307ac813..3ab5c4021b 100644
--- a/rcp/org.eclipse.tracecompass.rcp/feature.xml
+++ b/rcp/org.eclipse.tracecompass.rcp/feature.xml
@@ -428,4 +428,18 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="javax.annotation"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="javax.inject"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
diff --git a/rcp/org.eclipse.tracecompass.rcp/pom.xml b/rcp/org.eclipse.tracecompass.rcp/pom.xml
index 4752315527..cdbd3ece42 100644
--- a/rcp/org.eclipse.tracecompass.rcp/pom.xml
+++ b/rcp/org.eclipse.tracecompass.rcp/pom.xml
@@ -42,6 +42,8 @@
                 <plugin id="javax.xml.bind"/>
                 <plugin id="jakarta.xml.bind"/>
                 <plugin id="javax.activation"/>
+                <plugin id="javax.annotation"/>
+                <plugin id="javax.inject"/>
                 <plugin id="javax.xml.stream"/>
                 <plugin id="org.apache.commons.cli"/>
                 <plugin id="org.apache.commons.compress"/>
diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-e4.28.target b/releng/org.eclipse.tracecompass.target/tracecompass-e4.28.target
index 50c28c0280..e63d09fd3f 100644
--- a/releng/org.eclipse.tracecompass.target/tracecompass-e4.28.target
+++ b/releng/org.eclipse.tracecompass.target/tracecompass-e4.28.target
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-e4.28" sequenceNumber="2">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-e4.28" sequenceNumber="3">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.cdt.gnu.dsf.feature.group" version="0.0.0"/>
@@ -29,7 +29,7 @@
 <unit id="org.hamcrest" version="0.0.0"/>
 <unit id="org.mozilla.javascript" version="1.7.10.v20221112-0806"/>
 <unit id="org.slf4j.api" version="0.0.0"/>
-<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20230403203110/repository/"/>
+<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20230516204213/repository/"/>
 </location>
 <!-- Add dependencies that only exists with older orbit version -->
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
@@ -61,7 +61,7 @@
 <unit id="org.eclipse.ui.views.log" version="0.0.0"/>
 <unit id="org.eclipse.jdt.junit4.runtime" version="0.0.0"/>
 <unit id="org.eclipse.e4.ui.progress" version="0.0.0"/>
-<repository location="https://download.eclipse.org/eclipse/updates/4.28-I-builds/I20230426-1800/"/>
+<repository location="https://download.eclipse.org/eclipse/updates/4.28-I-builds/I20230517-1800/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.tracecompass.testtraces.tracecompass-test-traces-ctf" version="1.7.2"/>
@@ -71,7 +71,7 @@
 <unit id="org.eclipse.wst.xml.core" version="0.0.0"/>
 <unit id="org.eclipse.wst.xml.ui" version="0.0.0"/>
 <unit id="org.eclipse.wst.xsd.core" version="0.0.0"/>
-<repository location="https://download.eclipse.org/webtools/downloads/drops/R3.30.0/S-3.30M2a-20230502092147/repository/"/>
+<repository location="https://download.eclipse.org/webtools/downloads/drops/R3.30.0/S-3.30M3-20230522153211/repository/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.xsd" version="0.0.0"/>
diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-eStaging.target b/releng/org.eclipse.tracecompass.target/tracecompass-eStaging.target
index f2b92c45da..003b5159fb 100644
--- a/releng/org.eclipse.tracecompass.target/tracecompass-eStaging.target
+++ b/releng/org.eclipse.tracecompass.target/tracecompass-eStaging.target
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-eStaging" sequenceNumber="205">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-eStaging" sequenceNumber="206">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.cdt.gnu.dsf.feature.group" version="0.0.0"/>
@@ -29,7 +29,7 @@
 <unit id="org.hamcrest" version="0.0.0"/>
 <unit id="org.mozilla.javascript" version="1.7.10.v20221112-0806"/>
 <unit id="org.slf4j.api" version="0.0.0"/>
-<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20230403203110/repository/"/>
+<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20230516204213/repository/"/>
 </location>
 <!-- Add dependencies that only exists with older orbit version -->
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
@@ -61,7 +61,7 @@
 <unit id="org.eclipse.ui.views.log" version="0.0.0"/>
 <unit id="org.eclipse.jdt.junit4.runtime" version="0.0.0"/>
 <unit id="org.eclipse.e4.ui.progress" version="0.0.0"/>
-<repository location="https://download.eclipse.org/eclipse/updates/4.28-I-builds/I20230426-1800/"/>
+<repository location="https://download.eclipse.org/eclipse/updates/4.28-I-builds/I20230517-1800/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.tracecompass.testtraces.tracecompass-test-traces-ctf" version="1.7.2"/>
@@ -71,7 +71,7 @@
 <unit id="org.eclipse.wst.xml.core" version="0.0.0"/>
 <unit id="org.eclipse.wst.xml.ui" version="0.0.0"/>
 <unit id="org.eclipse.wst.xsd.core" version="0.0.0"/>
-<repository location="https://download.eclipse.org/webtools/downloads/drops/R3.30.0/S-3.30M2a-20230502092147/repository/"/>
+<repository location="https://download.eclipse.org/webtools/downloads/drops/R3.30.0/S-3.30M3-20230522153211/repository/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.xsd" version="0.0.0"/>