From 1a249e008aed5fc307067885bd05a25e208dee4b Mon Sep 17 00:00:00 2001
From: Bernd Hufmann <bernd.hufmann@ericsson.com>
Date: Wed, 4 Dec 2024 12:58:16 -0500
Subject: [PATCH 1/4] releng: Update e4.34 and eStaging targets to 2024-12
 release

Signed-off-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
---
 .../tracecompass-e4.34.target                               | 6 +++---
 .../tracecompass-eStaging.target                            | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-e4.34.target b/releng/org.eclipse.tracecompass.target/tracecompass-e4.34.target
index 479542835..01c80bf4f 100644
--- a/releng/org.eclipse.tracecompass.target/tracecompass-e4.34.target
+++ b/releng/org.eclipse.tracecompass.target/tracecompass-e4.34.target
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-e4.34" sequenceNumber="4">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-e4.34" sequenceNumber="5">
 <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"/>
@@ -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-I-builds/I20241120-1800/"/>
+<repository location="https://download.eclipse.org/eclipse/updates/4.34/R-4.34-202411201800/"/>
 </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,7 +78,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.36.0/S-3.36M3-20241110095156/repository/"/>
+<repository location="https://download.eclipse.org/webtools/downloads/drops/R3.36.0/R-3.36.0-20241110095156/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 63805c080..7be07aa15 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="240">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-eStaging" sequenceNumber="241">
 <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"/>
@@ -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-I-builds/I20241120-1800/"/>
+<repository location="https://download.eclipse.org/eclipse/updates/4.34/R-4.34-202411201800/"/>
 </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,7 +78,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.36.0/S-3.36M3-20241110095156/repository/"/>
+<repository location="https://download.eclipse.org/webtools/downloads/drops/R3.36.0/R-3.36.0-20241110095156/repository/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.xsd" version="0.0.0"/>

From 395561205a3a73d7c35537835806afe5cf6c836e Mon Sep 17 00:00:00 2001
From: Bernd Hufmann <bernd.hufmann@ericsson.com>
Date: Wed, 4 Dec 2024 13:01:17 -0500
Subject: [PATCH 2/4] releng: Add Trace Compass 10.2.0 baseline

Signed-off-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
---
 ...ne-10.1.0.target => tracecompass-baseline-10.2.0.target} | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename releng/org.eclipse.tracecompass.target/baseline/{tracecompass-baseline-10.1.0.target => tracecompass-baseline-10.2.0.target} (97%)

diff --git a/releng/org.eclipse.tracecompass.target/baseline/tracecompass-baseline-10.1.0.target b/releng/org.eclipse.tracecompass.target/baseline/tracecompass-baseline-10.2.0.target
similarity index 97%
rename from releng/org.eclipse.tracecompass.target/baseline/tracecompass-baseline-10.1.0.target
rename to releng/org.eclipse.tracecompass.target/baseline/tracecompass-baseline-10.2.0.target
index e4be06656..44ec92e01 100644
--- a/releng/org.eclipse.tracecompass.target/baseline/tracecompass-baseline-10.1.0.target
+++ b/releng/org.eclipse.tracecompass.target/baseline/tracecompass-baseline-10.2.0.target
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="tracecompass-baseline-10.1.0" sequenceNumber="1">
+<?pde version="3.8"?><target name="tracecompass-baseline-10.2.0" sequenceNumber="1">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.tracecompass.analysis.counters.core" version="0.0.0"/>
@@ -46,11 +46,11 @@
 <unit id="org.eclipse.tracecompass.tmf.remote.core" version="0.0.0"/>
 <unit id="org.eclipse.tracecompass.tmf.remote.ui" version="0.0.0"/>
 <unit id="org.eclipse.tracecompass.tmf.ui" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tracecompass/releases/10.1.0/repository/"/>
+<repository location="http://download.eclipse.org/tracecompass/releases/10.2.0/repository/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.core.runtime" version="0.0.0"/>
-<repository location="http://download.eclipse.org/releases/2024-09"/>
+<repository location="http://download.eclipse.org/releases/2024-12"/>
 </location>
 </locations>
 </target>

From fd54d1c0955b6df6f73f33fdf9c62ba6c21b28de Mon Sep 17 00:00:00 2001
From: Bernd Hufmann <bernd.hufmann@ericsson.com>
Date: Wed, 4 Dec 2024 13:05:50 -0500
Subject: [PATCH 3/4] releng: Update OOMPH setup file for 10.2.0

Signed-off-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
---
 TraceCompass.setup | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/TraceCompass.setup b/TraceCompass.setup
index 3ca32155a..725c38deb 100644
--- a/TraceCompass.setup
+++ b/TraceCompass.setup
@@ -75,7 +75,7 @@
   <setupTask
       xsi:type="setup:VariableTask"
       name="eclipse.target.platform"
-      defaultValue="tracecompass-e4.33"
+      defaultValue="tracecompass-e4.34"
       storageURI="scope://Workspace"
       label="Target Platform">
     <choice
@@ -119,7 +119,10 @@
         label="Trace Compass Eclipse 2024-06 - 4.32"/>
     <choice
         value="tracecompass-e4.33"
-        label="Trace Compass Eclipse 2024-09 - 4.32"/>
+        label="Trace Compass Eclipse 2024-09 - 4.33"/>
+    <choice
+        value="tracecompass-e4.34"
+        label="Trace Compass Eclipse 2024-09 - 4.34"/>
     <choice
         value="tracecompass-eStaging"
         label="Trace Compass Eclipse Latest"/>
@@ -157,15 +160,15 @@
     <setupTask
         xsi:type="pde:TargetPlatformTask"
         id="tracecompass-baseline-resolve"
-        name="tracecompass-baseline-10.1.0"
+        name="tracecompass-baseline-10.2.0"
         activate="false">
       <description>Trace Compass Baseline</description>
     </setupTask>
     <setupTask
         xsi:type="pde:APIBaselineFromTargetTask"
-        id="tracecompass-baseline-10.1.0"
+        id="tracecompass-baseline-10.2.0"
         name="Trace Compass Baseline"
-        targetName="tracecompass-baseline-10.1.0">
+        targetName="tracecompass-baseline-10.2.0">
       <description>Trace Compass Baseline</description>
     </setupTask>
     <setupTask

From 016cbf924ca93a5d5b2da10fadc3b1022ea4cb4f Mon Sep 17 00:00:00 2001
From: Patrick Tasse <patrick.tasse@gmail.com>
Date: Tue, 22 Oct 2024 10:43:25 -0400
Subject: [PATCH 4/4] releng: Build with tracecompass-e4.34 target by default

Signed-off-by: Patrick Tasse <patrick.tasse@gmail.com>
---
 pom.xml                                                   | 2 +-
 rcp/org.eclipse.tracecompass.rcp/feature.xml              | 8 ++++++--
 rcp/org.eclipse.tracecompass.rcp/legacy-e4.32/feature.xml | 2 +-
 .../{staging => legacy-e4.33}/feature.xml                 | 8 ++------
 4 files changed, 10 insertions(+), 10 deletions(-)
 rename rcp/org.eclipse.tracecompass.rcp/{staging => legacy-e4.33}/feature.xml (98%)

diff --git a/pom.xml b/pom.xml
index 18d0e1ebc..c637ae2af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,7 +57,7 @@
     <tycho-use-project-settings>true</tycho-use-project-settings>
     <tycho.scmUrl>scm:git:https://github.com/eclipse-tracecompass/org.eclipse.tracecompass</tycho.scmUrl>
     <cbi-plugins.version>1.4.2</cbi-plugins.version>
-    <target-platform>tracecompass-e4.33</target-platform>
+    <target-platform>tracecompass-e4.34</target-platform>
     <help-docs-eclipserun-repo>https://download.eclipse.org/eclipse/updates/4.23</help-docs-eclipserun-repo>
 
     <rcptt-version>2.5.4</rcptt-version>
diff --git a/rcp/org.eclipse.tracecompass.rcp/feature.xml b/rcp/org.eclipse.tracecompass.rcp/feature.xml
index d60c6c1e1..138b0e22c 100644
--- a/rcp/org.eclipse.tracecompass.rcp/feature.xml
+++ b/rcp/org.eclipse.tracecompass.rcp/feature.xml
@@ -287,7 +287,7 @@
 
    <plugin
          id="org.mortbay.jasper.apache-jsp"
-         version="9.0.90"/>
+         version="9.0.96"/>
 
    <plugin
          id="com.google.guava.failureaccess"
@@ -407,7 +407,7 @@
 
    <plugin
          id="org.mortbay.jasper.apache-el"
-         version="9.0.90"/>
+         version="9.0.96"/>
 
    <plugin
          id="jakarta.el-api"
@@ -437,4 +437,8 @@
          id="org.tukaani.xz"
          version="0.0.0"/>
 
+   <plugin
+         id="org.apache.xmlgraphics"
+         version="0.0.0"/>
+
 </feature>
diff --git a/rcp/org.eclipse.tracecompass.rcp/legacy-e4.32/feature.xml b/rcp/org.eclipse.tracecompass.rcp/legacy-e4.32/feature.xml
index 8d6d12792..61cb244ab 100644
--- a/rcp/org.eclipse.tracecompass.rcp/legacy-e4.32/feature.xml
+++ b/rcp/org.eclipse.tracecompass.rcp/legacy-e4.32/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.tracecompass.rcp"
       label="%featureName"
-      version="10.0.0.qualifier"
+      version="10.2.0.qualifier"
       provider-name="%featureProvider"
       plugin="org.eclipse.tracecompass.rcp.branding"
       license-feature="org.eclipse.license"
diff --git a/rcp/org.eclipse.tracecompass.rcp/staging/feature.xml b/rcp/org.eclipse.tracecompass.rcp/legacy-e4.33/feature.xml
similarity index 98%
rename from rcp/org.eclipse.tracecompass.rcp/staging/feature.xml
rename to rcp/org.eclipse.tracecompass.rcp/legacy-e4.33/feature.xml
index 138b0e22c..d60c6c1e1 100644
--- a/rcp/org.eclipse.tracecompass.rcp/staging/feature.xml
+++ b/rcp/org.eclipse.tracecompass.rcp/legacy-e4.33/feature.xml
@@ -287,7 +287,7 @@
 
    <plugin
          id="org.mortbay.jasper.apache-jsp"
-         version="9.0.96"/>
+         version="9.0.90"/>
 
    <plugin
          id="com.google.guava.failureaccess"
@@ -407,7 +407,7 @@
 
    <plugin
          id="org.mortbay.jasper.apache-el"
-         version="9.0.96"/>
+         version="9.0.90"/>
 
    <plugin
          id="jakarta.el-api"
@@ -437,8 +437,4 @@
          id="org.tukaani.xz"
          version="0.0.0"/>
 
-   <plugin
-         id="org.apache.xmlgraphics"
-         version="0.0.0"/>
-
 </feature>