From 553eb84cb135674214c7dbb7dfbb53dad10523a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torbj=C3=B6rn=20Svensson?= <torbjorn.svensson@st.com>
Date: Thu, 31 Mar 2022 11:59:07 +0200
Subject: [PATCH] [releng] Update target and baseline for 2022-06 cycle
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Used info from https://projects.eclipse.org/releases/2022-03 to determine
the versions of components.

Contributed by STMicroelectronics

Change-Id: If6c4ccfc18e87ff91cbed8c6236139c01819f77a
Signed-off-by: Torbjörn Svensson <torbjorn.svensson@st.com>
---
 releng/CDT.setup                               | 18 +++++++++---------
 .../org.eclipse.cdt.target/cdt-baseline.target | 16 ++++++++--------
 releng/org.eclipse.cdt.target/cdt.target       |  6 +++---
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/releng/CDT.setup b/releng/CDT.setup
index a1dc8604aa7..4213c85489c 100644
--- a/releng/CDT.setup
+++ b/releng/CDT.setup
@@ -168,21 +168,21 @@
         <repository
             url="https://download.eclipse.org/eclipse/updates/4.23/R-4.23-202203080310"/>
         <repository
-            url="https://download.eclipse.org/egit/updates-6.0/"/>
+            url="https://download.eclipse.org/egit/updates-6.1/"/>
         <repository
-            url="https://download.eclipse.org/linuxtools/update-docker-5.5.0/"/>
+            url="https://download.eclipse.org/linuxtools/update-docker-5.6.0/"/>
         <repository
-            url="https://download.eclipse.org/lsp4e/releases/0.20.1/"/>
+            url="https://download.eclipse.org/lsp4e/releases/0.20.2/"/>
         <repository
             url="https://download.eclipse.org/modeling/emf/emf/builds/release/2.28/"/>
         <repository
-            url="https://download.eclipse.org/mylyn/docs/releases/3.0.41/"/>
+            url="https://download.eclipse.org/mylyn/docs/releases/3.0.42/"/>
         <repository
             url="https://download.eclipse.org/mylyn/drops/3.25.2/v20200831-1956"/>
         <repository
             url="https://download.eclipse.org/tm4e/releases/0.4.3/"/>
         <repository
-            url="https://download.eclipse.org/tools/cdt/releases/10.5/cdt-10.5.0/">
+            url="https://download.eclipse.org/tools/cdt/releases/10.6/cdt-10.6.0/">
           <annotation>
             <detail
                 key="description">
@@ -317,11 +317,11 @@
           <repository
               url="https://download.eclipse.org/linuxtools/updates-docker-nightly/"/>
           <repository
-              url="https://download.eclipse.org/lsp4e/releases/0.20.1/"/>
+              url="https://download.eclipse.org/lsp4e/releases/0.20.2/"/>
           <repository
               url="https://download.eclipse.org/modeling/emf/emf/builds/release/latest/"/>
           <repository
-              url="https://download.eclipse.org/mylyn/docs/releases/3.0.41/"/>
+              url="https://download.eclipse.org/mylyn/docs/releases/3.0.42/"/>
           <repository
               url="https://download.eclipse.org/mylyn/drops/3.25.2/v20200831-1956"/>
           <repository
@@ -329,7 +329,7 @@
           <repository
               url="https://download.eclipse.org/tm4e/releases/0.4.3/"/>
           <repository
-              url="https://download.eclipse.org/tools/cdt/releases/10.5/cdt-10.5.0/">
+              url="https://download.eclipse.org/tools/cdt/releases/10.6/cdt-10.6.0/">
             <annotation>
               <detail
                   key="description">
@@ -338,7 +338,7 @@
             </annotation>
           </repository>
           <repository
-              url="https://download.eclipse.org/tools/orbit/downloads/drops/R20211213173813/repository/"/>
+              url="https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository/"/>
           <repository
               url="https://download.eclipse.org/tools/ptp/builds/remote/3.0/2021-09"/>
           <repository
diff --git a/releng/org.eclipse.cdt.target/cdt-baseline.target b/releng/org.eclipse.cdt.target/cdt-baseline.target
index 684566c2fc9..788f0be9a84 100644
--- a/releng/org.eclipse.cdt.target/cdt-baseline.target
+++ b/releng/org.eclipse.cdt.target/cdt-baseline.target
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="cdt-baseline" sequenceNumber="32">
+<target name="cdt-baseline" sequenceNumber="33">
 	<locations>
 		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/eclipse/updates/4.22/R-4.22-202111241800/"/>
+			<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">
-			<repository location="https://download.eclipse.org/egit/updates-6.0/"/>
+			<repository location="https://download.eclipse.org/egit/updates-6.1/"/>
 			<unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/linuxtools/update-docker-5.5.0/"/>
+			<repository location="https://download.eclipse.org/linuxtools/update-docker-5.6.0/"/>
 			<unit id="org.eclipse.linuxtools.docker.feature.feature.group" version="0.0.0"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/lsp4e/releases/0.20.1/"/>
+			<repository location="https://download.eclipse.org/lsp4e/releases/0.20.2/"/>
 			<unit id="org.eclipse.lsp4e" version="0.0.0"/>
 			<unit id="org.eclipse.lsp4e.debug" version="0.0.0"/>
 		</location>
@@ -22,7 +22,7 @@
 			<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.28/"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/mylyn/docs/releases/3.0.41/"/>
+			<repository location="https://download.eclipse.org/mylyn/docs/releases/3.0.42/"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<repository location="https://download.eclipse.org/mylyn/drops/3.25.2/v20200831-1956/"/>
@@ -32,7 +32,7 @@
 			<unit id="org.eclipse.tm4e.feature.feature.group" version="0.0.0"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/tools/cdt/releases/10.5/cdt-10.5.0/"/>
+			<repository location="https://download.eclipse.org/tools/cdt/releases/10.6/cdt-10.6.0/"/>
 			<unit id="org.eclipse.cdt.autotools.feature.group" version="0.0.0"/>
 			<unit id="org.eclipse.cdt.build.crossgcc.feature.group" version="0.0.0"/>
 			<unit id="org.eclipse.cdt.cmake.feature.group" version="0.0.0"/>
@@ -74,7 +74,7 @@
 			<unit id="org.eclipse.tm.terminal.view.feature.feature.group" version="0.0.0"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20211213173813/repository/"/>
+			<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository/"/>
 			<unit id="com.google.gson" version="0.0.0"/>
 			<unit id="com.sun.xml.bind" version="2.3.3.v20201118-1818"/>
 			<unit id="javax.activation" version="1.2.2.v20201119-1642"/>
diff --git a/releng/org.eclipse.cdt.target/cdt.target b/releng/org.eclipse.cdt.target/cdt.target
index 85604a858ec..18120545078 100644
--- a/releng/org.eclipse.cdt.target/cdt.target
+++ b/releng/org.eclipse.cdt.target/cdt.target
@@ -23,7 +23,7 @@
 			<unit id="org.eclipse.linuxtools.docker.feature.feature.group" version="0.0.0"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/lsp4e/releases/0.20.1/"/>
+			<repository location="https://download.eclipse.org/lsp4e/releases/0.20.2/"/>
 			<unit id="org.eclipse.lsp4e" version="0.0.0"/>
 			<unit id="org.eclipse.lsp4e.debug" version="0.0.0"/>
 		</location>
@@ -31,7 +31,7 @@
 			<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/latest/"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/mylyn/docs/releases/3.0.41/"/>
+			<repository location="https://download.eclipse.org/mylyn/docs/releases/3.0.42/"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<repository location="https://download.eclipse.org/mylyn/drops/3.25.2/v20200831-1956/"/>
@@ -47,7 +47,7 @@
 			<unit id="org.eclipse.tm4e.feature.feature.group" version="0.0.0"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/tools/cdt/releases/10.5/cdt-10.5.0/"/>
+			<repository location="https://download.eclipse.org/tools/cdt/releases/10.6/cdt-10.6.0/"/>
 			<!-- We explicitly have CDT in target platform so that developers can develop org.eclipse.cdt.core/ui without requiring all the projects from CDT in their workspace. -->
 			<unit id="org.eclipse.cdt.feature.group" version="0.0.0"/>
 		</location>