From 0ca0e8c4c549bf2861355cca79f76349b296a1f7 Mon Sep 17 00:00:00 2001
From: aboyko <alex.boyko@broadcom.com>
Date: Mon, 17 Mar 2025 14:52:25 -0400
Subject: [PATCH] Revert breaking changes from cherry-picked commits

---
 eclipse-distribution/pom.xml | 226 +++++++++++++++++------------------
 1 file changed, 110 insertions(+), 116 deletions(-)

diff --git a/eclipse-distribution/pom.xml b/eclipse-distribution/pom.xml
index 6365cb6a0..b7f33ead7 100644
--- a/eclipse-distribution/pom.xml
+++ b/eclipse-distribution/pom.xml
@@ -65,9 +65,9 @@
 
 	<properties>
 		<p2.qualifier>${buildQualifier}-SNAPSHOT</p2.qualifier>
-		<p2.repository.name>Spring Tool Suite</p2.repository.name>
+		<p2.repository.name>Spring Tools for Eclipse</p2.repository.name>
 
-		<dist.name>Spring Tool Suite 4</dist.name>
+		<dist.name>Spring Tools for Eclipse</dist.name>
 
 		<dist.key>TOOLS</dist.key>
 
@@ -78,7 +78,7 @@
 
 		<sts4-language-servers-p2-repo>https://cdn.spring.io/spring-tools/${dist.type}/TOOLS/sts4-language-server-integrations/${sts4-language-servers-version}</sts4-language-servers-p2-repo>
 		
-		<tycho-version>4.0.10</tycho-version>
+		<tycho-version>4.0.12</tycho-version>
 		<encoding>UTF-8</encoding>
 
 		<misc.p2.repo.version>3.9.4.202211021051</misc.p2.repo.version>
@@ -129,111 +129,6 @@
 			</properties>
 		</profile>
 
-		<profile>
-			<id>e433</id>
-			<properties>
-				<dist.target>e4.33.0</dist.target>
-				<dist.target.major>e4.33</dist.target.major>
-				<dist.platform.name>2024-09</dist.platform.name>
-				<dist.platform.name.long>2024-09 (4.33)</dist.platform.name.long>
-				<dist.platform.id>2024-09</dist.platform.id>
-				<dist.platform.version>4.33.0</dist.platform.version>
-				<package.qualifierPrefix>e433</package.qualifierPrefix>
-			</properties>
-			<repositories>
-				<repository>
-					<id>2024-09</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/releases/2024-09/</url>
-				</repository>
-				<repository>
-					<id>orbit</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-09</url>
-				</repository>
-				<repository> <!-- temporary p2 repo to grab early snapshot builds for testing fixes -->
-					<id>buildship-snapshots</id>
-					<layout>p2</layout>
-<!--					<url>https://download.eclipse.org/buildship/updates/latest-snapshot/</url>-->
-					<url>https://download.eclipse.org/buildship/updates/latest</url>
-				</repository>
-				<repository>
-					<id>m2e</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/technology/m2e/releases/latest/</url>
-<!--					<url>https://download.eclipse.org/technology/m2e/snapshots/latest/</url>-->
-				</repository>
-				<repository>
-					<id>latest-m2e-wtp-release</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/m2e-wtp/releases/latest/</url>
-				</repository>
-				<repository>
-					<id>maven-extras-mirror</id>
-					<layout>p2</layout>
-					<url>https://cdn.spring.io/spring-tools/release/TOOLS/third-party/m2e-sts310-signed/</url>
-				</repository>
-				<repository>
-					<id>maven-egit</id>
-					<layout>p2</layout>
-					<url>https://github.com/tesla/m2eclipse-egit/releases/download/0.17.0/</url>
-				</repository>
-				<repository>
-					<id>maven-wro4j</id>
-					<layout>p2</layout>
-					<url>https://github.com/jbosstools/m2e-wro4j/releases/download/1.2.1/</url>
-				</repository>
-				<repository>
-					<id>maven-dependency-support</id>
-					<layout>p2</layout>
-					<url>https://ianbrandt.github.io/m2e-maven-dependency-plugin/</url>
-				</repository>
-<!--				<repository>
-					<id>mylyn-markdown</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/mylyn/docs/releases/3.0.45/</url>
-				</repository> -->
-				<repository>
-					<id>wildwebdeveloper</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/wildwebdeveloper/releases/latest/</url>
-				</repository>
-				<repository>
-					<id>cdt-updates</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/tools/cdt/releases/latest/</url>
-				</repository>
-				<repository>
-					<id>lsp4e</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/lsp4e/releases/0.26.7/</url>
-<!--					<url>https://download.eclipse.org/lsp4e/snapshots/</url> -->
-				</repository>
-				<repository>
-					<id>tm4e-snapshots</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/tm4e/releases/latest/</url>
-<!--					<url>https://download.eclipse.org/tm4e/snapshots/</url> -->
-				</repository>
-<!--				<repository>
-					<id>chromium-binaries</id>
-					<layout>p2</layout>
-					<url>https://dl.maketechnology.io/chromium-cef/rls/repository</url>
-				</repository> -->
-			</repositories> 
-			<modules>
-				<!-- Xterm modules -->
-<!--				<module>../eclipse-extensions/org.springframework.ide.eclipse.xterm</module>
-				<module>../eclipse-extensions/org.springframework.ide.eclipse.xterm.feature</module>
-				<module>../eclipse-extensions/org.springframework.ide.eclipse.xterm.linux.x86_64</module>
-				<module>../eclipse-extensions/org.springframework.ide.eclipse.xterm.macosx.x86_64</module>
-				<module>../eclipse-extensions/org.springframework.ide.eclipse.xterm.win32.x86_64</module>
--->
-				<module>org.springframework.boot.ide.product.e433</module>
-			</modules>
-
-		</profile>
-
 		<profile>
 			<id>e434</id>
 			<properties>
@@ -354,13 +249,8 @@
 				<repository>
 					<id>2025-03</id>
 					<layout>p2</layout>
-					<url>https://download.eclipse.org/staging/2025-03/</url>
+					<url>https://download.eclipse.org/releases/2025-03/</url>
 				</repository>
-<!--				<repository>
-					<id>2025-03-i-builds</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/eclipse/updates/4.35-I-builds/</url>
-				</repository> -->
 				<repository>
 					<id>orbit</id>
 					<layout>p2</layout>
@@ -426,8 +316,8 @@
 				<repository>
 					<id>lsp4e</id>
 					<layout>p2</layout>
-					<url>https://download.eclipse.org/lsp4e/releases/0.27.1/</url>
-<!--					<url>https://download.eclipse.org/lsp4e/snapshots/</url> -->
+<!--					<url>https://download.eclipse.org/lsp4e/releases/0.27.1/</url>-->
+					<url>https://download.eclipse.org/lsp4e/snapshots/</url>
 				</repository>
 				<repository>
 					<id>tm4e-snapshots</id>
@@ -452,6 +342,110 @@
 				<module>org.springframework.boot.ide.product.e435</module>
 			</modules>
 
+		</profile>
+		<profile>
+			<id>e436</id>
+			<properties>
+				<dist.target>e4.36.0</dist.target>
+				<dist.target.major>e4.36</dist.target.major>
+				<dist.platform.name>2025-06</dist.platform.name>
+				<dist.platform.name.long>2025-06 (4.36)</dist.platform.name.long>
+				<dist.platform.id>2025-06</dist.platform.id>
+				<dist.platform.version>4.36.0</dist.platform.version>
+				<package.qualifierPrefix>e436</package.qualifierPrefix>
+			</properties>
+			<repositories>
+				<repository>
+					<id>2025-06</id>
+					<layout>p2</layout>
+					<url>https://download.eclipse.org/staging/2025-06/</url>
+				</repository>
+				<repository>
+					<id>orbit</id>
+					<layout>p2</layout>
+					<url>https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025-06</url>
+				</repository>
+				<repository> <!-- temporary p2 repo to grab early snapshot builds for testing fixes -->
+					<id>buildship-snapshots</id>
+					<layout>p2</layout>
+					<!--					<url>https://download.eclipse.org/buildship/updates/latest-snapshot/</url>-->
+					<url>https://download.eclipse.org/buildship/updates/latest</url>
+				</repository>
+				<repository>
+					<id>m2e</id>
+					<layout>p2</layout>
+					<url>https://download.eclipse.org/technology/m2e/releases/latest/</url>
+					<!--					<url>https://download.eclipse.org/technology/m2e/snapshots/latest/</url>-->
+				</repository>
+				<repository>
+					<id>latest-m2e-wtp-release</id>
+					<layout>p2</layout>
+					<url>https://download.eclipse.org/m2e-wtp/releases/latest/</url>
+				</repository>
+				<repository>
+					<id>maven-extras-mirror</id>
+					<layout>p2</layout>
+					<url>https://cdn.spring.io/spring-tools/release/TOOLS/third-party/m2e-sts310-signed/</url>
+				</repository>
+				<repository>
+					<id>maven-egit</id>
+					<layout>p2</layout>
+					<url>https://github.com/tesla/m2eclipse-egit/releases/download/0.17.0/</url>
+				</repository>
+				<repository>
+					<id>maven-wro4j</id>
+					<layout>p2</layout>
+					<url>https://github.com/jbosstools/m2e-wro4j/releases/download/1.2.1/</url>
+				</repository>
+				<repository>
+					<id>maven-dependency-support</id>
+					<layout>p2</layout>
+					<url>https://ianbrandt.github.io/m2e-maven-dependency-plugin/</url>
+				</repository>
+				<!--				<repository>
+                                    <id>mylyn-markdown</id>
+                                    <layout>p2</layout>
+                                    <url>https://download.eclipse.org/mylyn/docs/releases/3.0.45/</url>
+                                </repository> -->
+				<repository>
+					<id>wildwebdeveloper</id>
+					<layout>p2</layout>
+					<url>https://download.eclipse.org/wildwebdeveloper/releases/latest/</url>
+				</repository>
+				<repository>
+					<id>cdt-updates</id>
+					<layout>p2</layout>
+					<url>https://download.eclipse.org/tools/cdt/releases/latest/</url>
+				</repository>
+				<repository>
+					<id>lsp4e</id>
+					<layout>p2</layout>
+					<!--<url>https://download.eclipse.org/lsp4e/releases/0.27.1/</url>-->
+					<url>https://download.eclipse.org/lsp4e/snapshots/</url>
+				</repository>
+				<repository>
+					<id>tm4e-snapshots</id>
+					<layout>p2</layout>
+					<url>https://download.eclipse.org/tm4e/releases/latest/</url>
+					<!--					<url>https://download.eclipse.org/tm4e/snapshots/</url> -->
+				</repository>
+				<!--				<repository>
+                                    <id>chromium-binaries</id>
+                                    <layout>p2</layout>
+                                    <url>https://dl.maketechnology.io/chromium-cef/rls/repository</url>
+                                </repository> -->
+			</repositories>
+			<modules>
+				<!-- Xterm modules -->
+				<!--				<module>../eclipse-extensions/org.springframework.ide.eclipse.xterm</module>
+                                <module>../eclipse-extensions/org.springframework.ide.eclipse.xterm.feature</module>
+                                <module>../eclipse-extensions/org.springframework.ide.eclipse.xterm.linux.x86_64</module>
+                                <module>../eclipse-extensions/org.springframework.ide.eclipse.xterm.macosx.x86_64</module>
+                                <module>../eclipse-extensions/org.springframework.ide.eclipse.xterm.win32.x86_64</module>
+                -->
+				<module>org.springframework.boot.ide.product.e436</module>
+			</modules>
+
 		</profile>
 
 		<profile>