From 9212eed8af03e2d0270b682dde5b2fe3f4c9c99c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=8A?=
 =?UTF-8?q?=D1=80=20=D0=9A=D1=83=D1=80=D1=82=D0=B0=D0=BA=D0=BE=D0=B2?=
 <akurtakov@gmail.com>
Date: Sat, 15 Jun 2024 12:53:39 +0300
Subject: [PATCH] Switch to 2024-09 stream

Also explicitly use swtbot-latest repo as per
https://www.eclipse.org/lists/swtbot-dev/msg00890.html it might fix
issues seen in master build.
---
 pom.xml                                         |  2 +-
 ...ols-e4.32.target => linuxtools-e4.33.target} | 17 ++++++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)
 rename releng/org.eclipse.linuxtools.target/{linuxtools-e4.32.target => linuxtools-e4.33.target} (96%)

diff --git a/pom.xml b/pom.xml
index 60e4455d12..234133bd8d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -174,7 +174,7 @@
             </environment>
           </environments>
           <target>
-          <file>${maven.multiModuleProjectDirectory}/releng/org.eclipse.linuxtools.target/linuxtools-e4.32.target</file>
+          <file>${maven.multiModuleProjectDirectory}/releng/org.eclipse.linuxtools.target/linuxtools-e4.33.target</file>
           </target>
         </configuration>
       </plugin>
diff --git a/releng/org.eclipse.linuxtools.target/linuxtools-e4.32.target b/releng/org.eclipse.linuxtools.target/linuxtools-e4.33.target
similarity index 96%
rename from releng/org.eclipse.linuxtools.target/linuxtools-e4.32.target
rename to releng/org.eclipse.linuxtools.target/linuxtools-e4.33.target
index bea358af96..8746432dca 100644
--- a/releng/org.eclipse.linuxtools.target/linuxtools-e4.32.target
+++ b/releng/org.eclipse.linuxtools.target/linuxtools-e4.33.target
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="linuxtools-e4.32" sequenceNumber="3">
+<target name="linuxtools-e4.33" sequenceNumber="3">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="com.github.jnr.a64asm" version="1.0.0.v20230715-0746"/>
@@ -11,7 +11,7 @@
 <unit id="org.apache.httpcomponents.httpclient" version="4.5.14"/>
 <unit id="org.codelibs.nekohtml" version="2.1.3.v20240413-0800"/>
 <unit id="org.codelibs.nekohtml.source" version="2.1.3.v20240413-0800"/>
-<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-06"/>
+<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-09"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.jdt.annotation" version="0.0.0"/>
@@ -36,7 +36,7 @@
 <unit id="jakarta.activation-api" version="0.0.0"/>
 <unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>
 <unit id="bcprov" version="0.0.0"/>
-<repository location="https://download.eclipse.org/eclipse/updates/4.32-I-builds/"/>
+<repository location="https://download.eclipse.org/eclipse/updates/4.33-I-builds/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.license.feature.group" version="0.0.0"/>
@@ -55,15 +55,18 @@
 <repository location="https://ci.eclipse.org/cdt/job/cdt/job/main/lastSuccessfulBuild/artifact/releng/org.eclipse.cdt.repo/target/repository/"/>
 </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.dstore.core" version="0.0.0"/>
 <unit id="org.eclipse.jgit.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.ptp.rdt.sync.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.zest.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.lsp4e" version="0.0.0"/>
 <unit id="org.eclipse.tm4e.feature.feature.group" version="0.0.0"/>
-<repository location="https://download.eclipse.org/releases/2024-06/"/>
+<repository location="https://download.eclipse.org/releases/2024-09/"/>
+</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"/>
+<repository location="https://download.eclipse.org/technology/swtbot/releases/latest/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.reddeer.eclipse.feature.feature.group" version="0.0.0"/>
@@ -283,4 +286,4 @@
 <launcherArgs>
 <programArgs>-consolelog</programArgs>
 </launcherArgs>
-</target>
+</target>
\ No newline at end of file