From ea8902fcdb06317a300ce96c7afd618e392f3216 Mon Sep 17 00:00:00 2001
From: Martin Lippert <martin.lippert@broadcom.com>
Date: Fri, 22 Mar 2024 12:06:20 +0100
Subject: [PATCH] updated build targets, removed e4.29 and added e4.32

---
 .../category.xml                              |   3 +-
 .../org.springframework.boot.ide.product      |   2 +-
 .../p2.inf                                    |   0
 .../pom.xml                                   |   5 +-
 eclipse-distribution/pom.xml                  | 199 +++++++++---------
 5 files changed, 110 insertions(+), 99 deletions(-)
 rename eclipse-distribution/{org.springframework.boot.ide.product.e429 => org.springframework.boot.ide.product.e432}/category.xml (98%)
 rename eclipse-distribution/{org.springframework.boot.ide.product.e429 => org.springframework.boot.ide.product.e432}/org.springframework.boot.ide.product (98%)
 rename eclipse-distribution/{org.springframework.boot.ide.product.e429 => org.springframework.boot.ide.product.e432}/p2.inf (100%)
 rename eclipse-distribution/{org.springframework.boot.ide.product.e429 => org.springframework.boot.ide.product.e432}/pom.xml (99%)

diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e429/category.xml b/eclipse-distribution/org.springframework.boot.ide.product.e432/category.xml
similarity index 98%
rename from eclipse-distribution/org.springframework.boot.ide.product.e429/category.xml
rename to eclipse-distribution/org.springframework.boot.ide.product.e432/category.xml
index 3bbccead8..14fd547bb 100644
--- a/eclipse-distribution/org.springframework.boot.ide.product.e429/category.xml
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e432/category.xml
@@ -131,7 +131,7 @@
 <!--	<bundle id="javassist.source"/> -->
 	<bundle id="javax.activation"/>
 <!--	<bundle id="javax.activation.source"/> -->
-	<bundle id="javax.annotation"/>
+<!--	<bundle id="javax.annotation"/> -->
 <!--	<bundle id="javax.annotation.source"/> -->
 <!--	<bundle id="javax.ws.rs"/> -->
 <!--	<bundle id="javax.xml.bind"/> -->
@@ -140,6 +140,7 @@
 	<bundle id="org.aopalliance"/>
 	<bundle id="org.apache.log4j"/>
 	<bundle id="org.yaml.snakeyaml"/>
+	<bundle id="org.snakeyaml.engine"/>
 	<bundle id="org.eclipse.lsp4e"/>
 	<bundle id="org.eclipse.lsp4e.debug"/>
 	<bundle id="org.eclipse.lsp4e.jdt"/>
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e429/org.springframework.boot.ide.product b/eclipse-distribution/org.springframework.boot.ide.product.e432/org.springframework.boot.ide.product
similarity index 98%
rename from eclipse-distribution/org.springframework.boot.ide.product.e429/org.springframework.boot.ide.product
rename to eclipse-distribution/org.springframework.boot.ide.product.e432/org.springframework.boot.ide.product
index 9a6709aea..629deca7d 100644
--- a/eclipse-distribution/org.springframework.boot.ide.product.e429/org.springframework.boot.ide.product
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e432/org.springframework.boot.ide.product
@@ -69,7 +69,7 @@
 
       <feature id="org.eclipse.m2e.feature" installMode="root"/>
       <feature id="org.eclipse.m2e.lemminx.feature" installMode="root"/>
-      <feature id="org.eclipse.m2e.logback.feature" installMode="root"/>
+<!--      <feature id="org.eclipse.m2e.logback.feature" installMode="root"/> -->
       <feature id="org.eclipse.m2e.wtp.feature" installMode="root"/>
 <!--      <feature id="org.eclipse.m2e.wtp.jaxrs.feature" installMode="root"/> -->
 <!--      <feature id="org.eclipse.m2e.wtp.jsf.feature" installMode="root"/> -->
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e429/p2.inf b/eclipse-distribution/org.springframework.boot.ide.product.e432/p2.inf
similarity index 100%
rename from eclipse-distribution/org.springframework.boot.ide.product.e429/p2.inf
rename to eclipse-distribution/org.springframework.boot.ide.product.e432/p2.inf
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e429/pom.xml b/eclipse-distribution/org.springframework.boot.ide.product.e432/pom.xml
similarity index 99%
rename from eclipse-distribution/org.springframework.boot.ide.product.e429/pom.xml
rename to eclipse-distribution/org.springframework.boot.ide.product.e432/pom.xml
index b50c6c38d..db77a7d46 100644
--- a/eclipse-distribution/org.springframework.boot.ide.product.e429/pom.xml
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e432/pom.xml
@@ -15,7 +15,7 @@
 	<packaging>eclipse-repository</packaging>
 
 	<properties>
-		<justj.repository>https://download.eclipse.org/justj/jres/17/updates/release/latest/</justj.repository>
+		<justj.repository>https://download.eclipse.org/justj/jres/21/updates/release/latest/</justj.repository>
 	</properties>
 
 	<build>
@@ -97,6 +97,7 @@
 					</formats>
 				</configuration>
 			</plugin>
+
 			<plugin>
 				<groupId>org.eclipse.tycho.extras</groupId>
 				<artifactId>tycho-eclipserun-plugin</artifactId>
@@ -339,6 +340,7 @@
 							<goal>run</goal>
 						</goals>
 					</execution>
+
 					<execution>
 						<id>generate-s3-upload-info</id>
 						<phase>verify</phase>
@@ -383,6 +385,7 @@
 							<goal>run</goal>
 						</goals>
 					</execution>
+
 				</executions>
 			</plugin>
 
diff --git a/eclipse-distribution/pom.xml b/eclipse-distribution/pom.xml
index 6e0cc6ef7..e59f9e08d 100644
--- a/eclipse-distribution/pom.xml
+++ b/eclipse-distribution/pom.xml
@@ -129,99 +129,6 @@
 			</properties>
 		</profile>
 
-		<profile>
-			<id>e429</id>
-			<properties>
-				<dist.target>e4.29.0</dist.target>
-				<dist.target.major>e4.29</dist.target.major>
-				<dist.platform.name>2023-09</dist.platform.name>
-				<dist.platform.name.long>2023-09 (4.29)</dist.platform.name.long>
-				<dist.platform.id>2023-09</dist.platform.id>
-				<dist.platform.version>4.29</dist.platform.version>
-				<package.qualifierPrefix>e429</package.qualifierPrefix>
-			</properties>
-			<repositories>
-				<repository>
-					<id>2023-09</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/releases/2023-09/</url>
-				</repository>
-				<repository>
-					<id>orbit</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-09</url>
-				</repository>
-				<repository>
-					<id>m2e</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/technology/m2e/releases/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>lsp4e</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/lsp4e/releases/0.24.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/0.8.1/</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.e429</module>
-			</modules>
-
-		</profile>
-
 		<profile>
 			<id>e430</id>
 			<properties>
@@ -294,8 +201,8 @@
 				<repository>
 					<id>lsp4e</id>
 					<layout>p2</layout>
-<!--					<url>https://download.eclipse.org/lsp4e/releases/0.25.0/</url>-->
-					<url>https://download.eclipse.org/lsp4e/snapshots/</url>
+					<url>https://download.eclipse.org/lsp4e/releases/0.25.0/</url>
+<!--					<url>https://download.eclipse.org/lsp4e/snapshots/</url> -->
 				</repository>
 				<repository>
 					<id>tm4e-snapshots</id>
@@ -337,7 +244,7 @@
 				<repository>
 					<id>2023-12</id>
 					<layout>p2</layout>
-					<url>https://download.eclipse.org/staging/2024-03/</url>
+					<url>https://download.eclipse.org/releases/2024-03/</url>
 				</repository>
 				<repository>
 					<id>orbit</id>
@@ -422,6 +329,106 @@
 
 		</profile>
 
+		<profile>
+			<id>e432</id>
+			<properties>
+				<dist.target>e4.32.0</dist.target>
+				<dist.target.major>e4.32</dist.target.major>
+				<dist.platform.name>2024-06</dist.platform.name>
+				<dist.platform.name.long>2024-06 (4.32)</dist.platform.name.long>
+				<dist.platform.id>2024-06</dist.platform.id>
+				<dist.platform.version>4.32</dist.platform.version>
+				<package.qualifierPrefix>e432</package.qualifierPrefix>
+			</properties>
+			<repositories>
+				<repository>
+					<id>2023-12</id>
+					<layout>p2</layout>
+					<url>https://download.eclipse.org/staging/2024-06/</url>
+				</repository>
+				<repository>
+					<id>orbit</id>
+					<layout>p2</layout>
+					<url>https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-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>lsp4e</id>
+					<layout>p2</layout>
+<!--					<url>https://download.eclipse.org/lsp4e/releases/0.25.0/</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.e432</module>
+			</modules>
+
+		</profile>
+
 		<profile>
 			<id>bundle-tests</id>
 			<activation>