From 0f1a0d4349f11782c6261f995625c0a4d4f30243 Mon Sep 17 00:00:00 2001
From: Martin Lippert <lippertm@vmware.com>
Date: Thu, 16 Mar 2023 20:17:26 +0100
Subject: [PATCH] added target definitions for e4.28 and removed those for
 e4.25

---
 .../common/html/nightly-distributions.html    |  16 +-
 .../.project                                  |  17 --
 .../category.xml                              |   6 +-
 .../entitlements.plist                        |   0
 .../macos-notarize.sh                         |   0
 .../org.springframework.boot.ide.product      |  22 +-
 .../p2.inf                                    |   0
 .../pom.xml                                   |  57 ++---
 ...ool-suite-4-dmg-config-e4.28-aarch64.json} |   0
 ...ng-tool-suite-4-dmg-config-e4.28-x86.json} |   0
 eclipse-distribution/pom.xml                  | 196 +++++++++---------
 eclipse-language-servers/pom.xml              | 102 ++++-----
 12 files changed, 204 insertions(+), 212 deletions(-)
 delete mode 100644 eclipse-distribution/org.springframework.boot.ide.product.e418/.project
 rename eclipse-distribution/{org.springframework.boot.ide.product.e424 => org.springframework.boot.ide.product.e428}/category.xml (97%)
 rename eclipse-distribution/{org.springframework.boot.ide.product.e424 => org.springframework.boot.ide.product.e428}/entitlements.plist (100%)
 rename eclipse-distribution/{org.springframework.boot.ide.product.e424 => org.springframework.boot.ide.product.e428}/macos-notarize.sh (100%)
 rename eclipse-distribution/{org.springframework.boot.ide.product.e424 => org.springframework.boot.ide.product.e428}/org.springframework.boot.ide.product (85%)
 rename eclipse-distribution/{org.springframework.boot.ide.product.e424 => org.springframework.boot.ide.product.e428}/p2.inf (100%)
 rename eclipse-distribution/{org.springframework.boot.ide.product.e424 => org.springframework.boot.ide.product.e428}/pom.xml (94%)
 rename eclipse-distribution/{org.springframework.boot.ide.product.e424/spring-tool-suite-4-dmg-config-e4.24-aarch64.json => org.springframework.boot.ide.product.e428/spring-tool-suite-4-dmg-config-e4.28-aarch64.json} (100%)
 rename eclipse-distribution/{org.springframework.boot.ide.product.e424/spring-tool-suite-4-dmg-config-e4.24-x86.json => org.springframework.boot.ide.product.e428/spring-tool-suite-4-dmg-config-e4.28-x86.json} (100%)

diff --git a/eclipse-distribution/common/html/nightly-distributions.html b/eclipse-distribution/common/html/nightly-distributions.html
index ce1ee165f..80e422d77 100644
--- a/eclipse-distribution/common/html/nightly-distributions.html
+++ b/eclipse-distribution/common/html/nightly-distributions.html
@@ -23,9 +23,9 @@
 
 	<p><b>STS4 Distribution:</b>
 		<ul>
+			<li>for Eclipse 2023-06 (4.28): <a href="https://dist.springsource.com/snapshot/TOOLS/sts4/nightly/e4.28">https://dist.springsource.com/snapshot/TOOLS/sts4/nightly/e4.28</a></li>
 			<li>for Eclipse 2023-03 (4.27): <a href="https://dist.springsource.com/snapshot/TOOLS/sts4/nightly/e4.27">https://dist.springsource.com/snapshot/TOOLS/sts4/nightly/e4.27</a></li>
 			<li>for Eclipse 2022-12 (4.26): <a href="https://dist.springsource.com/snapshot/TOOLS/sts4/nightly/e4.26">https://dist.springsource.com/snapshot/TOOLS/sts4/nightly/e4.26</a></li>
-			<li>for Eclipse 2022-09 (4.25): <a href="https://dist.springsource.com/snapshot/TOOLS/sts4/nightly/e4.25">https://dist.springsource.com/snapshot/TOOLS/sts4/nightly/e4.25</a></li>
 		</ul>
 	</p>
 		
@@ -40,7 +40,13 @@
 		
 	<h2>Eclipse-based Distribution Builds</h2>
 
-	<h3>Spring Tool Suite 4 - based on Eclipse 2023-03 Milestone Builds (4.27.0)</h3>
+	<h3>Spring Tool Suite 4 - based on Eclipse 2023-06 Milestone Builds (4.28.0)</h3>
+	<div id="e428"></div>
+	<script type="text/javascript">
+	$('#e428').load('sts4-nightly-e4.28.html');
+	</script>
+	
+	<h3>Spring Tool Suite 4 - based on Eclipse 2023-03 Release (4.27.0)</h3>
 	<div id="e427"></div>
 	<script type="text/javascript">
 	$('#e427').load('sts4-nightly-e4.27.html');
@@ -52,12 +58,6 @@
 	$('#e426').load('sts4-nightly-e4.26.html');
 	</script>
 	
-	<h3>Spring Tool Suite 4 - based on Eclipse 2022-09 Release (4.25.0)</h3>
-	<div id="e425"></div>
-	<script type="text/javascript">
-	$('#e425').load('sts4-nightly-e4.25.html');
-	</script>
-	
 	<h2>Spring Tools 4 - Visual Studio Code Extensions</h2>
 
 	<div id="vsix"></div>
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e418/.project b/eclipse-distribution/org.springframework.boot.ide.product.e418/.project
deleted file mode 100644
index c44e92d12..000000000
--- a/eclipse-distribution/org.springframework.boot.ide.product.e418/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.springframework.boot.ide.product.e418</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
-</projectDescription>
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e424/category.xml b/eclipse-distribution/org.springframework.boot.ide.product.e428/category.xml
similarity index 97%
rename from eclipse-distribution/org.springframework.boot.ide.product.e424/category.xml
rename to eclipse-distribution/org.springframework.boot.ide.product.e428/category.xml
index c0fae1bc5..25fb21d60 100644
--- a/eclipse-distribution/org.springframework.boot.ide.product.e424/category.xml
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e428/category.xml
@@ -95,7 +95,8 @@
 	</feature>
 
 	<feature id="com.make.chromium.cef.feature"/>
--->	<feature id="org.eclipse.wildwebdeveloper.embedder.node.feature"/>
+-->	
+	<feature id="org.eclipse.wildwebdeveloper.embedder.node.feature"/>
 
 	<bundle id="org.springframework.tooling.ls.eclipse.commons" />
 	<bundle id="org.springframework.tooling.ls.eclipse.commons.source" />
@@ -140,9 +141,12 @@
 	<bundle id="org.apache.log4j"/>
 	<bundle id="org.yaml.snakeyaml"/>
 	<bundle id="org.eclipse.lsp4e"/>
+	<bundle id="org.eclipse.lsp4e.debug"/>
 	<bundle id="org.eclipse.lsp4e.jdt"/>
 	<bundle id="org.eclipse.lsp4j"/>
+	<bundle id="org.eclipse.lsp4j.debug"/>
 	<bundle id="org.eclipse.lsp4j.jsonrpc"/>
+	<bundle id="org.eclipse.lsp4j.jsonrpc.debug"/>
 	<bundle id="org.eclipse.xtext.xbase.lib"/>
 	<bundle id="org.eclipse.zest.core"/>
 	<bundle id="org.eclipse.zest.layouts"/>
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e424/entitlements.plist b/eclipse-distribution/org.springframework.boot.ide.product.e428/entitlements.plist
similarity index 100%
rename from eclipse-distribution/org.springframework.boot.ide.product.e424/entitlements.plist
rename to eclipse-distribution/org.springframework.boot.ide.product.e428/entitlements.plist
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e424/macos-notarize.sh b/eclipse-distribution/org.springframework.boot.ide.product.e428/macos-notarize.sh
similarity index 100%
rename from eclipse-distribution/org.springframework.boot.ide.product.e424/macos-notarize.sh
rename to eclipse-distribution/org.springframework.boot.ide.product.e428/macos-notarize.sh
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e424/org.springframework.boot.ide.product b/eclipse-distribution/org.springframework.boot.ide.product.e428/org.springframework.boot.ide.product
similarity index 85%
rename from eclipse-distribution/org.springframework.boot.ide.product.e424/org.springframework.boot.ide.product
rename to eclipse-distribution/org.springframework.boot.ide.product.e428/org.springframework.boot.ide.product
index 7582425a8..2eb1fe73e 100644
--- a/eclipse-distribution/org.springframework.boot.ide.product.e424/org.springframework.boot.ide.product
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e428/org.springframework.boot.ide.product
@@ -11,6 +11,7 @@
 </programArgs>
       <vmArgs>-Dosgi.requiredJavaVersion=17
 -Dosgi.dataAreaRequiresExplicitInit=true
+-Dsun.java.command=SpringToolSuite4
 -Xms256m
 -Xmx2048m
 --illegal-access=permit
@@ -58,6 +59,7 @@
       <feature id="org.eclipse.help" installMode="root"/>
 
       <feature id="org.eclipse.jdt" installMode="root"/>
+      <feature id="org.eclipse.jdt.bcoview.feature" installMode="root"/>
       <feature id="org.eclipse.jgit" installMode="root"/>
       <feature id="org.eclipse.jgit.lfs" installMode="root"/>
 
@@ -69,7 +71,7 @@
       <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"/> -->
-      <feature id="org.jboss.tools.maven.apt.feature" installMode="root"/>
+<!--      <feature id="org.jboss.tools.maven.apt.feature" installMode="root"/> -->
 
 <!--      <feature id="org.eclipse.wst.web_ui.feature" installMode="root"/> -->
 <!--      <feature id="org.eclipse.wst.xml_ui.feature" installMode="root"/> -->
@@ -92,14 +94,14 @@
 	  
       <feature id="org.eclipse.epp.mpc" installMode="root"/>
 
-      <feature id="org.sonatype.m2e.buildhelper.feature" installMode="root"/>
-      <feature id="org.sonatype.m2e.mavenarchiver.feature" installMode="root"/>
-<!--      <feature id="org.sonatype.m2e.egit.feature" installMode="root"/> -->
+<!--      <feature id="org.sonatype.m2e.buildhelper.feature" installMode="root"/> -->
+<!--      <feature id="org.sonatype.m2e.mavenarchiver.feature" installMode="root"/> -->
+      <feature id="org.sonatype.m2e.egit.feature" installMode="root"/>
       <feature id="org.jboss.tools.m2e.wro4j.feature" installMode="root"/>
-      <feature id="com.ianbrandt.tools.m2e.mdp.feature" installMode="root"/>
-      <feature id="m2e.chromatic.feature" installMode="root"/>
+<!--      <feature id="com.ianbrandt.tools.m2e.mdp.feature" installMode="root"/> -->
+<!--      <feature id="m2e.chromatic.feature" installMode="root"/> -->
 
-      <feature id="net.mihai-nita.ansicon" installMode="root"/>
+<!--      <feature id="net.mihai-nita.ansicon" installMode="root"/> -->
 
       <feature id="org.eclipse.linuxtools.docker.feature" installMode="root"/>
       <feature id="org.eclipse.linuxtools.jdt.docker.launcher.feature" installMode="root"/>
@@ -111,9 +113,9 @@
       <feature id="org.springframework.ide.eclipse.xml.namespaces.feature" installMode="root"/>
 
       <feature id="org.springframework.tooling.boot.ls.feature" installMode="root"/>
-      <feature id="org.springframework.tooling.cloudfoundry.manifest.ls.feature" installMode="root"/>
-      <feature id="org.springframework.tooling.bosh.ls.feature" installMode="root"/>
-      <feature id="org.springframework.tooling.concourse.ls.feature" installMode="root"/>
+<!--      <feature id="org.springframework.tooling.cloudfoundry.manifest.ls.feature" installMode="root"/> -->
+<!--      <feature id="org.springframework.tooling.bosh.ls.feature" installMode="root"/> -->
+<!--      <feature id="org.springframework.tooling.concourse.ls.feature" installMode="root"/> -->
 
 <!--      <feature id="org.eclipse.justj.openjdk.hotspot.jre.full" installMode="root"/> -->
       
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e424/p2.inf b/eclipse-distribution/org.springframework.boot.ide.product.e428/p2.inf
similarity index 100%
rename from eclipse-distribution/org.springframework.boot.ide.product.e424/p2.inf
rename to eclipse-distribution/org.springframework.boot.ide.product.e428/p2.inf
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e424/pom.xml b/eclipse-distribution/org.springframework.boot.ide.product.e428/pom.xml
similarity index 94%
rename from eclipse-distribution/org.springframework.boot.ide.product.e424/pom.xml
rename to eclipse-distribution/org.springframework.boot.ide.product.e428/pom.xml
index fc26eaa3b..a64e30845 100644
--- a/eclipse-distribution/org.springframework.boot.ide.product.e424/pom.xml
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e428/pom.xml
@@ -495,20 +495,23 @@
 							<target>
 
 								<property name="dmgName" value="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.x86_64.dmg" />
-
-								<exec executable="/bin/bash" failonerror="true">
-									<arg value="${project.build.directory}/../macos-notarize.sh"/>
-									<arg value="${dmgName}"/>
-								    <arg value="${env.MACOS_NOTARIZATION_SERVICE_URL}"/>
-								</exec>
-
 								<property name="dmgName-aarch64" value="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.aarch64.dmg" />
 
-								<exec executable="/bin/bash" failonerror="true">
-									<arg value="${project.build.directory}/../macos-notarize.sh"/>
-									<arg value="${dmgName-aarch64}"/>
-								    <arg value="${env.MACOS_NOTARIZATION_SERVICE_URL}"/>
-								</exec>
+								<parallel failonany="true">
+
+									<exec executable="/bin/bash" failonerror="true">
+										<arg value="${project.build.directory}/../macos-notarize.sh" />
+										<arg value="${dmgName}" />
+										<arg value="${env.MACOS_NOTARIZATION_SERVICE_URL}" />
+									</exec>
+
+									<exec executable="/bin/bash" failonerror="true">
+										<arg value="${project.build.directory}/../macos-notarize.sh" />
+										<arg value="${dmgName-aarch64}" />
+										<arg value="${env.MACOS_NOTARIZATION_SERVICE_URL}" />
+									</exec>
+
+								</parallel>
 
 							</target>
 						</configuration>
@@ -526,17 +529,17 @@
 								<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
 								<taskdef resource="org/springframework/build/aws/ant/antlib.xml" />
 
-								<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.x86_64.dmg" algorithm="SHA1" fileext=".sha1" />
+								<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.x86_64.dmg" algorithm="SHA-256" fileext=".sha256" />
 								<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.x86_64.dmg" algorithm="MD5" fileext=".md5" />
-								<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.aarch64.dmg" algorithm="SHA1" fileext=".sha1" />
+								<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.aarch64.dmg" algorithm="SHA-256" fileext=".sha256" />
 								<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.aarch64.dmg" algorithm="MD5" fileext=".md5" />
-								<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-linux.gtk.x86_64.tar.gz" algorithm="SHA1" fileext=".sha1" />
+								<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-linux.gtk.x86_64.tar.gz" algorithm="SHA-256" fileext=".sha256" />
 								<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-linux.gtk.x86_64.tar.gz" algorithm="MD5" fileext=".md5" />
-								<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-linux.gtk.aarch64.tar.gz" algorithm="SHA1" fileext=".sha1" />
+								<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-linux.gtk.aarch64.tar.gz" algorithm="SHA-256" fileext=".sha256" />
 								<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-linux.gtk.aarch64.tar.gz" algorithm="MD5" fileext=".md5" />
-								<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-win32.win32.x86_64.zip" algorithm="SHA1" fileext=".sha1" />
+								<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-win32.win32.x86_64.zip" algorithm="SHA-256" fileext=".sha256" />
 								<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-win32.win32.x86_64.zip" algorithm="MD5" fileext=".md5" />
-								<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-win32.win32.x86_64.self-extracting.jar" algorithm="SHA1" fileext=".sha1" />
+								<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-win32.win32.x86_64.self-extracting.jar" algorithm="SHA-256" fileext=".sha256" />
 								<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-win32.win32.x86_64.self-extracting.jar" algorithm="MD5" fileext=".md5" />
 
 								<s3 accessKey="${dist.accessKey}" secretKey="${dist.secretKey}">
@@ -546,15 +549,19 @@
 											<include name="spring-tool-suite-4*.zip" />
 											<include name="spring-tool-suite-4*.zip.md5" />
 											<include name="spring-tool-suite-4*.zip.sha1" />
+											<include name="spring-tool-suite-4*.zip.sha256" />
 											<include name="spring-tool-suite-4*.jar" />
 											<include name="spring-tool-suite-4*.jar.md5" />
 											<include name="spring-tool-suite-4*.jar.sha1" />
+											<include name="spring-tool-suite-4*.jar.sha256" />
 											<include name="spring-tool-suite-4*.tar.gz" />
 											<include name="spring-tool-suite-4*.tar.gz.md5" />
 											<include name="spring-tool-suite-4*.tar.gz.sha1" />
+											<include name="spring-tool-suite-4*.tar.gz.sha256" />
 											<include name="spring-tool-suite-4*.dmg" />
 											<include name="spring-tool-suite-4*.dmg.md5" />
 											<include name="spring-tool-suite-4*.dmg.sha1" />
+											<include name="spring-tool-suite-4*.dmg.sha256" />
 										</fileset>
 									</delete>
 
@@ -563,16 +570,16 @@
 										<fileset dir="${project.build.directory}/products">
 											<include name="spring-tool-suite-4*.zip" />
 											<include name="spring-tool-suite-4*.zip.md5" />
-											<include name="spring-tool-suite-4*.zip.sha1" />
+											<include name="spring-tool-suite-4*.zip.sha256" />
 											<include name="spring-tool-suite-4*.jar" />
 											<include name="spring-tool-suite-4*.jar.md5" />
-											<include name="spring-tool-suite-4*.jar.sha1" />
+											<include name="spring-tool-suite-4*.jar.sha256" />
 											<include name="spring-tool-suite-4*.tar.gz" />
 											<include name="spring-tool-suite-4*.tar.gz.md5" />
-											<include name="spring-tool-suite-4*.tar.gz.sha1" />
+											<include name="spring-tool-suite-4*.tar.gz.sha256" />
 											<include name="spring-tool-suite-4*.dmg" />
 											<include name="spring-tool-suite-4*.dmg.md5" />
-											<include name="spring-tool-suite-4*.dmg.sha1" />
+											<include name="spring-tool-suite-4*.dmg.sha256" />
 										</fileset>
 									</upload>
 
@@ -632,7 +639,7 @@
 									</zipfileset>
 								</zip>
 
-								<checksum file="${project.build.directory}/repository/${dist.file.name}" algorithm="SHA1" fileext=".sha1" />
+								<checksum file="${project.build.directory}/repository/${dist.file.name}" algorithm="SHA-256" fileext=".sha256" />
 								<checksum file="${project.build.directory}/repository/${dist.file.name}" algorithm="MD5" fileext=".md5" />
 
 							</target>
@@ -665,7 +672,7 @@
 											<include name="features/**" />
 											<include name="binary/**" />
 											<include name="*.zip" />
-											<include name="*.sha1" />
+											<include name="*.sha256" />
 											<include name="*.md5" />
 										</fileset>
 									</delete>
@@ -726,4 +733,4 @@
 			</plugins>
 		</pluginManagement> -->
 	</build>
-</project>
+</project>
\ No newline at end of file
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e424/spring-tool-suite-4-dmg-config-e4.24-aarch64.json b/eclipse-distribution/org.springframework.boot.ide.product.e428/spring-tool-suite-4-dmg-config-e4.28-aarch64.json
similarity index 100%
rename from eclipse-distribution/org.springframework.boot.ide.product.e424/spring-tool-suite-4-dmg-config-e4.24-aarch64.json
rename to eclipse-distribution/org.springframework.boot.ide.product.e428/spring-tool-suite-4-dmg-config-e4.28-aarch64.json
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e424/spring-tool-suite-4-dmg-config-e4.24-x86.json b/eclipse-distribution/org.springframework.boot.ide.product.e428/spring-tool-suite-4-dmg-config-e4.28-x86.json
similarity index 100%
rename from eclipse-distribution/org.springframework.boot.ide.product.e424/spring-tool-suite-4-dmg-config-e4.24-x86.json
rename to eclipse-distribution/org.springframework.boot.ide.product.e428/spring-tool-suite-4-dmg-config-e4.28-x86.json
diff --git a/eclipse-distribution/pom.xml b/eclipse-distribution/pom.xml
index 8e7339ad3..2eca4be27 100644
--- a/eclipse-distribution/pom.xml
+++ b/eclipse-distribution/pom.xml
@@ -135,109 +135,6 @@
 			</properties>
 		</profile>
 
-		<profile>
-			<id>e424</id>
-			<properties>
-				<dist.target>e4.24.0</dist.target>
-				<dist.target.major>e4.24</dist.target.major>
-				<dist.platform.name>2022-06</dist.platform.name>
-				<dist.platform.name.long>2022-06 (4.24)</dist.platform.name.long>
-				<dist.platform.id>2022-06</dist.platform.id>
-				<dist.platform.version>4.24</dist.platform.version>
-				<package.qualifierPrefix>e424</package.qualifierPrefix>
-			</properties>
-			<repositories>
-				<repository>
-					<id>2022-06</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/releases/2022-06/</url>
-				</repository>
-				<repository>
-					<id>orbit</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/tools/orbit/downloads/drops/R20220531185310/repository</url>
-				</repository>
-				<repository>
-					<id>m2e</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/technology/m2e/releases/1.20.1/</url>
-				</repository>
-				<repository>
-					<id>latest-m2e-wtp-release</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/m2e-wtp/releases/1.4/</url>
-				</repository>
-				<repository>
-					<id>maven-extras-mirror</id>
-					<layout>p2</layout>
-					<url>https://download.springsource.com/release/TOOLS/third-party/m2e-sts310-signed/</url>
-				</repository>
-				<repository>
-					<id>maven-egit</id>
-					<layout>p2</layout>
-					<url>https://repo1.maven.org/maven2/.m2e/connectors/m2eclipse-egit/0.15.1/N/LATEST</url>
-				</repository>
-				<repository>
-					<id>maven-wro4j</id>
-					<layout>p2</layout>
-					<url>https://download.jboss.org/jbosstools/updates/m2e-extensions/m2e-wro4j/1.1.0-2014-06-25_06-16-31-H26/</url>
-				</repository>
-				<repository>
-					<id>m2e-chromatic</id>
-					<layout>p2</layout>
-					<url>https://sidespin.github.io/m2e-chromatic/update/</url>
-				</repository>
-				<repository>
-					<id>maven-dependency-support</id>
-					<layout>p2</layout>
-					<url>https://ianbrandt.github.io/m2e-maven-dependency-plugin/</url>
-				</repository>
-				<repository>
-					<id>ansi-console</id>
-					<layout>p2</layout>
-					<url>https://www.mihai-nita.net/eclipse</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/0.13.6/</url>
-				</repository>
-				<repository>
-					<id>lsp4e</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/lsp4e/releases/0.21.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/0.6.2/</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.e424</module>
-			</modules>
-
-		</profile>
-
 		<profile>
 			<id>e425</id>
 			<properties>
@@ -517,6 +414,99 @@
 
 		</profile>
 
+		<profile>
+			<id>e428</id>
+			<properties>
+				<dist.target>e4.28.0</dist.target>
+				<dist.target.major>e4.28</dist.target.major>
+				<dist.platform.name>2023-06</dist.platform.name>
+				<dist.platform.name.long>2023-06 (4.28)</dist.platform.name.long>
+				<dist.platform.id>2023-06</dist.platform.id>
+				<dist.platform.version>4.28</dist.platform.version>
+				<package.qualifierPrefix>e428</package.qualifierPrefix>
+			</properties>
+			<repositories>
+				<repository>
+					<id>2023-06</id>
+					<layout>p2</layout>
+					<url>https://download.eclipse.org/staging/2023-06/</url>
+				</repository>
+				<repository>
+					<id>orbit</id>
+					<layout>p2</layout>
+					<url>https://download.eclipse.org/tools/orbit/downloads/drops/R20230302014618/repository</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://download.springsource.com/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.21.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/0.6.2/</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.e428</module>
+			</modules>
+
+		</profile>
+
 		<profile>
 			<id>bamboo-signing</id>
 			<properties>
diff --git a/eclipse-language-servers/pom.xml b/eclipse-language-servers/pom.xml
index 4508a73eb..d6841670a 100644
--- a/eclipse-language-servers/pom.xml
+++ b/eclipse-language-servers/pom.xml
@@ -126,53 +126,6 @@
 			</properties>
 		</profile>
 
-		<profile>
-			<id>e424</id>
-			<properties>
-				<dist.target>e4.24.0</dist.target>
-				<dist.target.major>e4.24</dist.target.major>
-				<dist.platform.name>2022-06</dist.platform.name>
-				<dist.platform.name.long>2022-06 (4.24)</dist.platform.name.long>
-				<dist.platform.id>2022-06</dist.platform.id>
-				<dist.platform.version>4.24</dist.platform.version>
-				<package.qualifierPrefix>e424</package.qualifierPrefix>
-			</properties>
-			<repositories>
-				<repository>
-					<id>2022-06</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/releases/2022-06/</url>
-				</repository>
-				<repository>
-					<id>orbit</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/tools/orbit/downloads/drops/R20220531185310/repository</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>lsp4e</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/lsp4e/releases/0.21.0/</url>
-<!--					<url>https://download.eclipse.org/lsp4e/snapshots</url> -->
-				</repository>
-				<repository>
-					<id>tm4e</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/tm4e/releases/0.6.2/</url>
-<!--					<url>https://download.eclipse.org/tm4e/snapshots</url> -->
-				</repository>
-				<repository>
-					<id>wwd</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/wildwebdeveloper/releases/0.13.6/</url>
-				</repository>
-			</repositories>
-		</profile>
-
 		<profile>
 			<id>e425</id>
 			<properties>
@@ -282,7 +235,60 @@
 				<repository>
 					<id>2023-03</id>
 					<layout>p2</layout>
-					<url>https://download.eclipse.org/staging/2023-03/</url>
+					<url>https://download.eclipse.org/releases/2023-03/</url>
+				</repository>
+				<repository>
+					<id>orbit</id>
+					<layout>p2</layout>
+					<url>https://download.eclipse.org/tools/orbit/downloads/drops/R20230302014618/repository</url>
+				</repository>
+<!--				<repository>
+					<id>m2e</id>
+					<layout>p2</layout>
+					<url>https://download.eclipse.org/technology/m2e/snapshots/latest/</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>lsp4e</id>
+					<layout>p2</layout>
+					<url>https://download.eclipse.org/lsp4e/releases/0.21.0/</url>
+<!--					<url>https://download.eclipse.org/lsp4e/snapshots</url> -->
+				</repository>
+				<repository>
+					<id>tm4e</id>
+					<layout>p2</layout>
+					<url>https://download.eclipse.org/tm4e/releases/0.6.2/</url>
+<!--					<url>https://download.eclipse.org/tm4e/snapshots</url> -->
+				</repository>
+				<repository>
+					<id>wwd</id>
+					<layout>p2</layout>
+					<url>https://download.eclipse.org/wildwebdeveloper/releases/latest/</url>
+<!--					<url>https://download.eclipse.org/wildwebdeveloper/snapshots/</url> -->
+				</repository>
+			</repositories>
+		</profile>
+
+		<profile>
+			<id>e428</id>
+			<properties>
+				<dist.target>e4.28.0</dist.target>
+				<dist.target.major>e4.28</dist.target.major>
+				<dist.platform.name>2023-06</dist.platform.name>
+				<dist.platform.name.long>2023-06 (4.28)</dist.platform.name.long>
+				<dist.platform.id>2023-06</dist.platform.id>
+				<dist.platform.version>4.28</dist.platform.version>
+				<package.qualifierPrefix>e428</package.qualifierPrefix>
+			</properties>
+			<repositories>
+				<repository>
+					<id>2023-06</id>
+					<layout>p2</layout>
+					<url>https://download.eclipse.org/staging/2023-06/</url>
 				</repository>
 				<repository>
 					<id>orbit</id>