From 9610b2f77c4eac84cc2084b49651db0eb6a09f6b Mon Sep 17 00:00:00 2001
From: Patrick Tasse <patrick.tasse@gmail.com>
Date: Tue, 14 Jan 2025 15:24:51 -0500
Subject: [PATCH] releng: Add e4.35 and update eStaging targets for 2025-03 M1

Signed-off-by: Patrick Tasse <patrick.tasse@gmail.com>
---
 .../tracecompass-e4.35.target                 | 99 +++++++++++++++++++
 .../tracecompass-eStaging.target              | 12 +--
 2 files changed, 105 insertions(+), 6 deletions(-)
 create mode 100644 releng/org.eclipse.tracecompass.target/tracecompass-e4.35.target

diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-e4.35.target b/releng/org.eclipse.tracecompass.target/tracecompass-e4.35.target
new file mode 100644
index 000000000..c2519b753
--- /dev/null
+++ b/releng/org.eclipse.tracecompass.target/tracecompass-e4.35.target
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-e4.35" 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/11.6/cdt-11.6.1/"/>
+</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/4.2.1/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="bcpg" version="0.0.0"/>
+<unit id="bcprov" version="0.0.0"/>
+<unit id="ch.qos.logback.classic" version="0.0.0"/>
+<unit id="com.google.gson" version="0.0.0"/>
+<unit id="com.google.guava" version="33.4.0.jre"/>
+<unit id="jakarta.activation-api" version="1.2.2"/>
+<unit id="jakarta.annotation-api" version="1.3.5"/>
+<unit id="jakarta.el-api" version="5.0.1"/>
+<unit id="jakarta.inject.jakarta.inject-api" version="1.0.5"/>
+<unit id="jakarta.servlet.jsp-api" version="3.1.1"/>
+<unit id="jakarta.xml.bind-api" version="2.3.3"/>
+<unit id="json" version="0.0.0"/>
+<unit id="org.antlr.runtime" version="3.2.0.v20230929-1400"/>
+<unit id="org.antlr.runtime.source" version="3.2.0.v20230929-1400"/>
+<unit id="org.apache.commons.cli" version="0.0.0"/>
+<unit id="org.apache.commons.commons-compress" version="0.0.0"/>
+<unit id="org.apache.commons.commons-io" version="0.0.0"/>
+<unit id="org.apache.commons.lang" version="0.0.0"/>
+<unit id="org.apache.commons.lang3" version="0.0.0"/>
+<unit id="org.apache.xml.serializer" version="0.0.0"/>
+<unit id="org.mortbay.jasper.apache-jsp" version="0.0.0"/>
+<unit id="org.osgi.service.component.annotations" version="0.0.0"/>
+<unit id="slf4j.api" version="0.0.0"/>
+<unit id="slf4j.simple" version="0.0.0"/>
+<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/milestone/S202412231158/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.mozilla.javascript" version="0.0.0"/>
+<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.29.0/"/>
+</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.jdt.core" version="0.0.0"/>
+<unit id="org.eclipse.jdt.core.compiler.batch" 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"/>
+<unit id="org.eclipse.osgi.services" version="0.0.0"/>
+<repository location="https://download.eclipse.org/eclipse/updates/4.35-I-builds/I20250102-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.37.0/S-3.37M1-20250106075715/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/S202412300906/"/>
+</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.14.0/repository/"/>
+</location>
+</locations>
+<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+<launcherArgs>
+<vmArgs>-Xms40m
+-Xmx512M</vmArgs>
+<programArgs>-consolelog</programArgs>
+</launcherArgs>
+</target>
diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-eStaging.target b/releng/org.eclipse.tracecompass.target/tracecompass-eStaging.target
index 7be07aa15..214dddc93 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="241">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-eStaging" sequenceNumber="242">
 <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"/>
@@ -20,7 +20,7 @@
 <unit id="bcprov" version="0.0.0"/>
 <unit id="ch.qos.logback.classic" version="0.0.0"/>
 <unit id="com.google.gson" version="0.0.0"/>
-<unit id="com.google.guava" version="33.3.1.jre"/>
+<unit id="com.google.guava" version="33.4.0.jre"/>
 <unit id="jakarta.activation-api" version="1.2.2"/>
 <unit id="jakarta.annotation-api" version="1.3.5"/>
 <unit id="jakarta.el-api" version="5.0.1"/>
@@ -40,7 +40,7 @@
 <unit id="org.osgi.service.component.annotations" version="0.0.0"/>
 <unit id="slf4j.api" version="0.0.0"/>
 <unit id="slf4j.simple" version="0.0.0"/>
-<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.34.0/"/>
+<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/milestone/S202412231158/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.mozilla.javascript" version="0.0.0"/>
@@ -68,7 +68,7 @@
 <unit id="org.eclipse.jdt.junit4.runtime" version="0.0.0"/>
 <unit id="org.eclipse.e4.ui.progress" version="0.0.0"/>
 <unit id="org.eclipse.osgi.services" version="0.0.0"/>
-<repository location="https://download.eclipse.org/eclipse/updates/4.34/R-4.34-202411201800/"/>
+<repository location="https://download.eclipse.org/eclipse/updates/4.35-I-builds/I20250102-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"/>
@@ -78,11 +78,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.36.0/R-3.36.0-20241110095156/repository/"/>
+<repository location="https://download.eclipse.org/webtools/downloads/drops/R3.37.0/S-3.37M1-20250106075715/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.40.0/"/>
+<repository location="https://download.eclipse.org/modeling/emf/emf/builds/milestone/S202412300906/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.swtchart.feature.feature.group" version="0.0.0"/>