releng: Add e4.25 and update eStaging targets with 2022-06 M2

Add new dependency 'org.eclipse.e4.ui.progress' to target and RCP
feature. To be able to build with older targets, add same dependency to
older targets as well.

Change-Id: Idea8fac45ee65bc8077aa0f41b5f48eb700eea77
Signed-off-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/c/tracecompass/org.eclipse.tracecompass/+/195102
Tested-by: Trace Compass Bot <tracecompass-bot@eclipse.org>
Tested-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
Reviewed-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
diff --git a/rcp/org.eclipse.tracecompass.rcp/feature.xml b/rcp/org.eclipse.tracecompass.rcp/feature.xml
index 130af88..ef9dd92 100644
--- a/rcp/org.eclipse.tracecompass.rcp/feature.xml
+++ b/rcp/org.eclipse.tracecompass.rcp/feature.xml
@@ -149,6 +149,13 @@
          unpack="false"/>
 
    <plugin
+         id="org.eclipse.e4.ui.progress"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
          id="org.eclipse.remote.core"
          download-size="0"
          install-size="0"
diff --git a/rcp/org.eclipse.tracecompass.rcp/pom.xml b/rcp/org.eclipse.tracecompass.rcp/pom.xml
index e3e4865..57fa970 100644
--- a/rcp/org.eclipse.tracecompass.rcp/pom.xml
+++ b/rcp/org.eclipse.tracecompass.rcp/pom.xml
@@ -88,6 +88,7 @@
                 <plugin id="com.google.gson"/>
                 <plugin id="com.google.guava"/>
                 <plugin id="org.apache.commons.io"/>
+                <plugin id="org.eclipse.e4.ui.progress"/>
                 <plugin id="org.eclipse.remote.core"/>
                 <plugin id="org.eclipse.remote.jsch.core"/>
                 <plugin id="org.eclipse.remote.jsch.ui"/>
@@ -110,6 +111,7 @@
                 <plugin id="org.eclipse.wst.xml.ui"/>
                 <plugin id="org.eclipse.wst.xsd.core"/>
                 <plugin id="org.eclipse.xsd"/>
+                
               </excludes>
             </configuration>
           </execution>
diff --git a/releng/org.eclipse.tracecompass.target/pom.xml b/releng/org.eclipse.tracecompass.target/pom.xml
index 9683fe8..db29df2 100644
--- a/releng/org.eclipse.tracecompass.target/pom.xml
+++ b/releng/org.eclipse.tracecompass.target/pom.xml
@@ -68,6 +68,31 @@
                     <classifier>tracecompass-e4.20</classifier>
                   </artifact>
                   <artifact>
+                    <file>tracecompass-e4.21.target</file>
+                    <type>target</type>
+                    <classifier>tracecompass-e4.21</classifier>
+                  </artifact>
+                  <artifact>
+                    <file>tracecompass-e4.22.target</file>
+                    <type>target</type>
+                    <classifier>tracecompass-e4.22</classifier>
+                  </artifact>
+                  <artifact>
+                    <file>tracecompass-e4.23.target</file>
+                    <type>target</type>
+                    <classifier>tracecompass-e4.23</classifier>
+                  </artifact>
+                  <artifact>
+                    <file>tracecompass-e4.24.target</file>
+                    <type>target</type>
+                    <classifier>tracecompass-e4.24</classifier>
+                  </artifact>
+                  <artifact>
+                    <file>tracecompass-e4.25.target</file>
+                    <type>target</type>
+                    <classifier>tracecompass-e4.25</classifier>
+                  </artifact>
+                  <artifact>
                     <file>tracecompass-eStaging.target</file>
                     <type>target</type>
                     <classifier>tracecompass-eStaging</classifier>
diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-e4.16.target b/releng/org.eclipse.tracecompass.target/tracecompass-e4.16.target
index 39b9f8e..ed447b9 100644
--- a/releng/org.eclipse.tracecompass.target/tracecompass-e4.16.target
+++ b/releng/org.eclipse.tracecompass.target/tracecompass-e4.16.target
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-e4.16" sequenceNumber="11">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-e4.16" sequenceNumber="12">
 <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"/>
@@ -60,6 +60,10 @@
 <repository location="https://download.eclipse.org/eclipse/updates/4.16/R-4.16-202006040540/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.e4.ui.progress" version="0.0.0"/>
+<repository location="https://download.eclipse.org/eclipse/updates/4.17/R-4.17-202009021800/"/>
+</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"/>
 <repository location="https://archive.eclipse.org/tracecompass/tracecompass-test-traces/repository/1.7.2/"/>
 </location>
diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-e4.17.target b/releng/org.eclipse.tracecompass.target/tracecompass-e4.17.target
index b03c185..d324578 100644
--- a/releng/org.eclipse.tracecompass.target/tracecompass-e4.17.target
+++ b/releng/org.eclipse.tracecompass.target/tracecompass-e4.17.target
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-e4.17" sequenceNumber="13">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-e4.17" sequenceNumber="14">
 <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"/>
@@ -57,6 +57,7 @@
 <unit id="org.eclipse.ui.trace" version="0.0.0"/>
 <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.17/R-4.17-202009021800/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-e4.18.target b/releng/org.eclipse.tracecompass.target/tracecompass-e4.18.target
index 328cdad..b43557b 100644
--- a/releng/org.eclipse.tracecompass.target/tracecompass-e4.18.target
+++ b/releng/org.eclipse.tracecompass.target/tracecompass-e4.18.target
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-e4.18" sequenceNumber="8">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-e4.18" sequenceNumber="9">
 <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"/>
@@ -54,6 +54,7 @@
 <unit id="org.eclipse.ui.trace" version="0.0.0"/>
 <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.18/R-4.18-202012021800/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-e4.19.target b/releng/org.eclipse.tracecompass.target/tracecompass-e4.19.target
index 8856db0..349eb12 100644
--- a/releng/org.eclipse.tracecompass.target/tracecompass-e4.19.target
+++ b/releng/org.eclipse.tracecompass.target/tracecompass-e4.19.target
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-e4.19" sequenceNumber="10">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-e4.19" sequenceNumber="11">
 <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"/>
@@ -55,6 +55,7 @@
 <unit id="org.eclipse.ui.trace" version="0.0.0"/>
 <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.19/R-4.19-202103031800/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-e4.20.target b/releng/org.eclipse.tracecompass.target/tracecompass-e4.20.target
index 565e259..46e0c57 100644
--- a/releng/org.eclipse.tracecompass.target/tracecompass-e4.20.target
+++ b/releng/org.eclipse.tracecompass.target/tracecompass-e4.20.target
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-e4.20" sequenceNumber="5">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-e4.20" sequenceNumber="6">
 <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"/>
@@ -35,6 +35,7 @@
 <unit id="javax.xml.bind" version="0.0.0"/>
 <unit id="javax.activation" version="1.1.0.v201211130549"/>
 <unit id="javax.xml.stream" version="0.0.0"/>
+<unit id="org.eclipse.e4.ui.progress" version="0.0.0"/>
 <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-e4.21.target b/releng/org.eclipse.tracecompass.target/tracecompass-e4.21.target
index ed38826..f106ab3 100644
--- a/releng/org.eclipse.tracecompass.target/tracecompass-e4.21.target
+++ b/releng/org.eclipse.tracecompass.target/tracecompass-e4.21.target
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-e4.21" sequenceNumber="7">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-e4.21" sequenceNumber="8">
 <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"/>
@@ -55,6 +55,7 @@
 <unit id="org.eclipse.ui.trace" version="0.0.0"/>
 <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.21/R-4.21-202109060500/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-e4.22.target b/releng/org.eclipse.tracecompass.target/tracecompass-e4.22.target
index f1ef6dc..cfae8e5 100644
--- a/releng/org.eclipse.tracecompass.target/tracecompass-e4.22.target
+++ b/releng/org.eclipse.tracecompass.target/tracecompass-e4.22.target
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-e4.22" sequenceNumber="7">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-e4.22" sequenceNumber="8">
 <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"/>
@@ -55,6 +55,7 @@
 <unit id="org.eclipse.ui.trace" version="0.0.0"/>
 <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.22/R-4.22-202111241800/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-e4.23.target b/releng/org.eclipse.tracecompass.target/tracecompass-e4.23.target
index 3673487..e6a12b5 100644
--- a/releng/org.eclipse.tracecompass.target/tracecompass-e4.23.target
+++ b/releng/org.eclipse.tracecompass.target/tracecompass-e4.23.target
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-e4.23" sequenceNumber="5">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-e4.23" sequenceNumber="6">
 <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"/>
@@ -55,6 +55,7 @@
 <unit id="org.eclipse.ui.trace" version="0.0.0"/>
 <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.23/R-4.23-202203080310/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-e4.24.target b/releng/org.eclipse.tracecompass.target/tracecompass-e4.24.target
index e413b8a..a26f2ac 100644
--- a/releng/org.eclipse.tracecompass.target/tracecompass-e4.24.target
+++ b/releng/org.eclipse.tracecompass.target/tracecompass-e4.24.target
@@ -55,6 +55,7 @@
 <unit id="org.eclipse.ui.trace" version="0.0.0"/>
 <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.24/R-4.24-202206070700/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-e4.25.target b/releng/org.eclipse.tracecompass.target/tracecompass-e4.25.target
new file mode 100644
index 0000000..382f3f4
--- /dev/null
+++ b/releng/org.eclipse.tracecompass.target/tracecompass-e4.25.target
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?>
+<target name="tracecompass-e4.25" sequenceNumber="1">
+<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"/>
+<unit id="org.eclipse.tm.terminal.control" version="0.0.0"/>
+<unit id="org.eclipse.remote.core" version="0.0.0"/>
+<unit id="org.eclipse.remote.ui" version="0.0.0"/>
+<unit id="org.eclipse.remote.jsch.core" version="0.0.0"/>
+<unit id="org.eclipse.remote.jsch.ui" version="0.0.0"/>
+<repository location="https://download.eclipse.org/tools/cdt/releases/10.7/cdt-10.7.0/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.swtbot.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.swtbot.generator.feature.feature.group" version="0.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.apache.commons.compress" version="0.0.0"/>
+<unit id="org.apache.commons.io" version="0.0.0"/>
+<unit id="org.apache.commons.lang" version="0.0.0"/>
+<unit id="org.apache.xml.serializer" version="0.0.0"/>
+<unit id="com.google.guava" version="27.1.0.v20190517-1946"/>
+<unit id="org.hamcrest" version="0.0.0"/>
+<unit id="jakarta.xml.bind" version="2.3.3.v20201118-1818"/>
+<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/I20220726195053/repository/"/>
+</location>
+<!-- Add dependencies that only exists with older orbit version -->
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="javax.activation" version="1.1.0.v201211130549"/>
+<unit id="javax.xml.bind" version="0.0.0"/>
+<unit id="javax.xml.stream" version="0.0.0"/>
+<unit id="org.antlr.runtime" version="3.2.0.v201101311130"/>
+<unit id="org.antlr.runtime.source" version="3.2.0.v201101311130"/>
+<unit id="org.apache.commons.cli" version="1.2.0.v201404270220"/>
+<unit id="org.apache.commons.lang3" version="0.0.0"/>
+<unit id="org.apache.derby" version="0.0.0"/>
+<unit id="org.json" version="0.0.0"/>
+<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.license.feature.group" version="0.0.0"/>
+<repository location="https://download.eclipse.org/cbi/updates/license/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.platform.ide" version="0.0.0"/>
+<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.pde.runtime" version="0.0.0"/>
+<unit id="org.eclipse.pde.junit.runtime" version="0.0.0"/>
+<unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.equinox.p2.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.equinox.p2.core.feature.source.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.test.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.jdt.annotation" version="0.0.0"/>
+<unit id="org.eclipse.swt.tools.spies" version="0.0.0"/>
+<unit id="org.eclipse.ui.trace" version="0.0.0"/>
+<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.25-I-builds/I20220807-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"/>
+<repository location="https://archive.eclipse.org/tracecompass/tracecompass-test-traces/repository/1.7.2/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<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.27.0/S-3.27M2-20220729084414/repository/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.xsd" version="0.0.0"/>
+<repository location="https://download.eclipse.org/modeling/emf/emf/builds/milestone/S202207260617/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.swtchart.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.swtchart.feature.source.feature.group" version="0.0.0"/>
+<repository location="https://download.eclipse.org/swtchart/releases/0.12.0/repository/"/>
+</location>
+</locations>
+<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+<launcherArgs>
+<vmArgs>-Xms40m
+-Xmx512M</vmArgs>
+<programArgs>-consolelog</programArgs>
+</launcherArgs>
+</target>
\ No newline at end of file
diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-eStaging.target b/releng/org.eclipse.tracecompass.target/tracecompass-eStaging.target
index 5873a8d..912ee0c 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="187">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-eStaging" sequenceNumber="188">
 <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"/>
@@ -23,8 +23,9 @@
 <unit id="com.google.guava" version="27.1.0.v20190517-1946"/>
 <unit id="org.hamcrest" version="0.0.0"/>
 <unit id="jakarta.xml.bind" version="2.3.3.v20201118-1818"/>
-<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220531185310/repository/"/>
+<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/I20220726195053/repository/"/>
 </location>
+<!-- Add dependencies that only exists with older orbit version -->
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="javax.activation" version="1.1.0.v201211130549"/>
 <unit id="javax.xml.bind" version="0.0.0"/>
@@ -55,7 +56,8 @@
 <unit id="org.eclipse.ui.trace" version="0.0.0"/>
 <unit id="org.eclipse.ui.views.log" version="0.0.0"/>
 <unit id="org.eclipse.jdt.junit4.runtime" version="0.0.0"/>
-<repository location="https://download.eclipse.org/eclipse/updates/4.24/R-4.24-202206070700/"/>
+<unit id="org.eclipse.e4.ui.progress" version="0.0.0"/>
+<repository location="https://download.eclipse.org/eclipse/updates/4.25-I-builds/I20220807-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"/>
@@ -65,11 +67,11 @@
 <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.26.0/R-3.26.0-20220526191850/repository/"/>
+<repository location="https://download.eclipse.org/webtools/downloads/drops/R3.27.0/S-3.27M2-20220729084414/repository/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.xsd" version="0.0.0"/>
-<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.30/"/>
+<repository location="https://download.eclipse.org/modeling/emf/emf/builds/milestone/S202207260617/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.swtchart.feature.feature.group" version="0.0.0"/>