diff --git a/eclipse-distribution/common/html/nightly-distributions.html b/eclipse-distribution/common/html/nightly-distributions.html
index 279842e368..8eb98cc5d5 100644
--- a/eclipse-distribution/common/html/nightly-distributions.html
+++ b/eclipse-distribution/common/html/nightly-distributions.html
@@ -23,9 +23,9 @@ <h2>Eclipse p2 repositories</h2>
 
 	<p><b>STS4 Distribution:</b>
 		<ul>
+			<li>for Eclipse 2024-12 (4.35): <a href="https://cdn.spring.io/spring-tools/snapshot/TOOLS/sts4/nightly/e4.35">https://cdn.spring.io/spring-tools/snapshot/TOOLS/sts4/nightly/e4.35</a></li>
 			<li>for Eclipse 2024-12 (4.34): <a href="https://cdn.spring.io/spring-tools/snapshot/TOOLS/sts4/nightly/e4.34">https://cdn.spring.io/spring-tools/snapshot/TOOLS/sts4/nightly/e4.34</a></li>
 			<li>for Eclipse 2024-09 (4.33): <a href="https://cdn.spring.io/spring-tools/snapshot/TOOLS/sts4/nightly/e4.33">https://cdn.spring.io/spring-tools/snapshot/TOOLS/sts4/nightly/e4.33</a></li>
-			<li>for Eclipse 2024-06 (4.32): <a href="https://cdn.spring.io/spring-tools/snapshot/TOOLS/sts4/nightly/e4.32">https://cdn.spring.io/spring-tools/snapshot/TOOLS/sts4/nightly/e4.32</a></li>
 		</ul>
 	</p>
 		
@@ -40,7 +40,13 @@ <h2>Eclipse p2 repositories</h2>
 		
 	<h2>Eclipse-based Distribution Builds</h2>
 
-	<h3>Spring Tool Suite 4 - based on Eclipse 2024-12 Milstone Builds (4.34.0)</h3>
+	<h3>Spring Tool Suite 4 - based on Eclipse 2025-03 Milstone Builds (4.35.0)</h3>
+	<div id="e435"></div>
+	<script type="text/javascript">
+		$('#e435').load('sts4-nightly-e4.35.html');
+	</script>
+	
+	<h3>Spring Tool Suite 4 - based on Eclipse 2024-12 Release (4.34.0)</h3>
 	<div id="e434"></div>
 	<script type="text/javascript">
 		$('#e434').load('sts4-nightly-e4.34.html');
@@ -52,12 +58,6 @@ <h3>Spring Tool Suite 4 - based on Eclipse 2024-09 Release (4.33.0)</h3>
 		$('#e433').load('sts4-nightly-e4.33.html');
 	</script>
 
-	<h3>Spring Tool Suite 4 - based on Eclipse 2024-06 Release (4.32.0)</h3>
-	<div id="e432"></div>
-	<script type="text/javascript">
-		$('#e432').load('sts4-nightly-e4.32.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.e432/category.xml b/eclipse-distribution/org.springframework.boot.ide.product.e435/category.xml
similarity index 99%
rename from eclipse-distribution/org.springframework.boot.ide.product.e432/category.xml
rename to eclipse-distribution/org.springframework.boot.ide.product.e435/category.xml
index aceee6abae..dd77aab7d5 100644
--- a/eclipse-distribution/org.springframework.boot.ide.product.e432/category.xml
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e435/category.xml
@@ -137,7 +137,7 @@
 <!--	<bundle id="javax.ws.rs"/> -->
 <!--	<bundle id="javax.xml.bind"/> -->
 <!--	<bundle id="javax.xml.bind.source"/> -->
-	<bundle id="javax.xml.stream"/>
+<!--	<bundle id="javax.xml.stream"/> -->
 	<bundle id="org.aopalliance"/>
 	<bundle id="org.apache.log4j"/>
 	<bundle id="org.yaml.snakeyaml"/>
@@ -155,7 +155,7 @@
 	<bundle id="com.google.gson"/>
 	<bundle id="org.jcodings"/>
 	<bundle id="org.joni"/>
-	<bundle id="org.json"/>
+	<bundle id="json"/>
 	<bundle id="org.jsoup"/>
 	<bundle id="org.apache.commons.lang3"/>
 	<bundle id="org.apache.commons.collections"/>
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e432/org.springframework.boot.ide.product b/eclipse-distribution/org.springframework.boot.ide.product.e435/org.springframework.boot.ide.product
similarity index 100%
rename from eclipse-distribution/org.springframework.boot.ide.product.e432/org.springframework.boot.ide.product
rename to eclipse-distribution/org.springframework.boot.ide.product.e435/org.springframework.boot.ide.product
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e432/p2.inf b/eclipse-distribution/org.springframework.boot.ide.product.e435/p2.inf
similarity index 100%
rename from eclipse-distribution/org.springframework.boot.ide.product.e432/p2.inf
rename to eclipse-distribution/org.springframework.boot.ide.product.e435/p2.inf
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e432/pom.xml b/eclipse-distribution/org.springframework.boot.ide.product.e435/pom.xml
similarity index 100%
rename from eclipse-distribution/org.springframework.boot.ide.product.e432/pom.xml
rename to eclipse-distribution/org.springframework.boot.ide.product.e435/pom.xml
diff --git a/eclipse-distribution/pom.xml b/eclipse-distribution/pom.xml
index 7bdc11b6e5..e79ba1fe37 100644
--- a/eclipse-distribution/pom.xml
+++ b/eclipse-distribution/pom.xml
@@ -130,26 +130,26 @@
 		</profile>
 
 		<profile>
-			<id>e432</id>
+			<id>e433</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.0</dist.platform.version>
-				<package.qualifierPrefix>e432</package.qualifierPrefix>
+				<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-06</id>
+					<id>2024-09</id>
 					<layout>p2</layout>
-					<url>https://download.eclipse.org/releases/2024-06/</url>
+					<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-06</url>
+					<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>
@@ -206,8 +206,8 @@
 				<repository>
 					<id>lsp4e</id>
 					<layout>p2</layout>
-<!--					<url>https://download.eclipse.org/lsp4e/releases/0.26.0/</url> -->
-					<url>https://download.eclipse.org/lsp4e/snapshots/</url>
+					<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>
@@ -229,32 +229,32 @@
 				<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>
+				<module>org.springframework.boot.ide.product.e433</module>
 			</modules>
 
 		</profile>
 
 		<profile>
-			<id>e433</id>
+			<id>e434</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>
+				<dist.target>e4.34.0</dist.target>
+				<dist.target.major>e4.34</dist.target.major>
+				<dist.platform.name>2024-12</dist.platform.name>
+				<dist.platform.name.long>2024-12 (4.34)</dist.platform.name.long>
+				<dist.platform.id>2024-12</dist.platform.id>
+				<dist.platform.version>4.34.0</dist.platform.version>
+				<package.qualifierPrefix>e434</package.qualifierPrefix>
 			</properties>
 			<repositories>
 				<repository>
-					<id>2024-09</id>
+					<id>2024-12</id>
 					<layout>p2</layout>
-					<url>https://download.eclipse.org/releases/2024-09/</url>
+					<url>https://download.eclipse.org/releases/2024-12/</url>
 				</repository>
 				<repository>
 					<id>orbit</id>
 					<layout>p2</layout>
-					<url>https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-09</url>
+					<url>https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-12</url>
 				</repository>
 				<repository> <!-- temporary p2 repo to grab early snapshot builds for testing fixes -->
 					<id>buildship-snapshots</id>
@@ -311,7 +311,7 @@
 				<repository>
 					<id>lsp4e</id>
 					<layout>p2</layout>
-<!--					<url>https://download.eclipse.org/lsp4e/releases/0.26.0/</url> -->
+<!--					<url>https://download.eclipse.org/lsp4e/releases/0.26.7/</url> -->
 					<url>https://download.eclipse.org/lsp4e/snapshots/</url>
 				</repository>
 				<repository>
@@ -334,32 +334,37 @@
 				<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>
+				<module>org.springframework.boot.ide.product.e434</module>
 			</modules>
 
 		</profile>
 
 		<profile>
-			<id>e434</id>
+			<id>e435</id>
 			<properties>
-				<dist.target>e4.34.0</dist.target>
-				<dist.target.major>e4.34</dist.target.major>
-				<dist.platform.name>2024-12</dist.platform.name>
-				<dist.platform.name.long>2024-12 (4.34)</dist.platform.name.long>
-				<dist.platform.id>2024-12</dist.platform.id>
-				<dist.platform.version>4.34.0</dist.platform.version>
-				<package.qualifierPrefix>e434</package.qualifierPrefix>
+				<dist.target>e4.35.0</dist.target>
+				<dist.target.major>e4.35</dist.target.major>
+				<dist.platform.name>2025-03</dist.platform.name>
+				<dist.platform.name.long>2025-03 (4.35)</dist.platform.name.long>
+				<dist.platform.id>2025-03</dist.platform.id>
+				<dist.platform.version>4.35.0</dist.platform.version>
+				<package.qualifierPrefix>e435</package.qualifierPrefix>
 			</properties>
 			<repositories>
 				<repository>
-					<id>2024-12</id>
+					<id>2025-03</id>
+					<layout>p2</layout>
+					<url>https://download.eclipse.org/staging/2025-03/</url>
+				</repository>
+				<repository>
+					<id>2025-03-i-builds</id>
 					<layout>p2</layout>
-					<url>https://download.eclipse.org/staging/2024-12/</url>
+					<url>https://download.eclipse.org/eclipse/updates/4.35-I-builds/</url>
 				</repository>
 				<repository>
 					<id>orbit</id>
 					<layout>p2</layout>
-					<url>https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-12</url>
+					<url>https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025-03</url>
 				</repository>
 				<repository> <!-- temporary p2 repo to grab early snapshot builds for testing fixes -->
 					<id>buildship-snapshots</id>
@@ -439,7 +444,7 @@
 				<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.e434</module>
+				<module>org.springframework.boot.ide.product.e435</module>
 			</modules>
 
 		</profile>
diff --git a/eclipse-language-servers/pom.xml b/eclipse-language-servers/pom.xml
index 676af10e2f..180b0fd88b 100644
--- a/eclipse-language-servers/pom.xml
+++ b/eclipse-language-servers/pom.xml
@@ -139,26 +139,26 @@
 		</profile>
 
 		<profile>
-			<id>e432</id>
+			<id>e433</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>
+				<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</dist.platform.version>
+				<package.qualifierPrefix>e433</package.qualifierPrefix>
 			</properties>
 			<repositories>
 				<repository>
-					<id>2024-06</id>
+					<id>2024-09</id>
 					<layout>p2</layout>
-					<url>https://download.eclipse.org/releases/2024-06/</url>
+					<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-06</url>
+					<url>https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-09</url>
 				</repository>
 <!--				<repository>
 					<id>mylyn-markdown</id>
@@ -187,26 +187,26 @@
 		</profile>
 
 		<profile>
-			<id>e433</id>
+			<id>e434</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</dist.platform.version>
-				<package.qualifierPrefix>e433</package.qualifierPrefix>
+				<dist.target>e4.34.0</dist.target>
+				<dist.target.major>e4.34</dist.target.major>
+				<dist.platform.name>2024-12</dist.platform.name>
+				<dist.platform.name.long>2024-12 (4.34)</dist.platform.name.long>
+				<dist.platform.id>2024-12</dist.platform.id>
+				<dist.platform.version>4.34</dist.platform.version>
+				<package.qualifierPrefix>e434</package.qualifierPrefix>
 			</properties>
 			<repositories>
 				<repository>
-					<id>2024-09</id>
+					<id>2024-12</id>
 					<layout>p2</layout>
-					<url>https://download.eclipse.org/releases/2024-09/</url>
+					<url>https://download.eclipse.org/releases/2024-12/</url>
 				</repository>
 				<repository>
 					<id>orbit</id>
 					<layout>p2</layout>
-					<url>https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-09</url>
+					<url>https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-12</url>
 				</repository>
 <!--				<repository>
 					<id>mylyn-markdown</id>
@@ -216,7 +216,7 @@
 				<repository>
 					<id>lsp4e</id>
 					<layout>p2</layout>
-					<url>https://download.eclipse.org/lsp4e/releases/0.26.0/</url>
+					<url>https://download.eclipse.org/lsp4e/releases/0.26.7/</url>
 <!--					<url>https://download.eclipse.org/lsp4e/snapshots</url> -->
 				</repository>
 				<repository>
@@ -235,26 +235,26 @@
 		</profile>
 
 		<profile>
-			<id>e434</id>
+			<id>e435</id>
 			<properties>
-				<dist.target>e4.34.0</dist.target>
-				<dist.target.major>e4.34</dist.target.major>
-				<dist.platform.name>2024-12</dist.platform.name>
-				<dist.platform.name.long>2024-12 (4.34)</dist.platform.name.long>
-				<dist.platform.id>2024-12</dist.platform.id>
-				<dist.platform.version>4.34</dist.platform.version>
-				<package.qualifierPrefix>e434</package.qualifierPrefix>
+				<dist.target>e4.35.0</dist.target>
+				<dist.target.major>e4.35</dist.target.major>
+				<dist.platform.name>2025-03</dist.platform.name>
+				<dist.platform.name.long>2025-03 (4.35)</dist.platform.name.long>
+				<dist.platform.id>2025-03</dist.platform.id>
+				<dist.platform.version>4.35</dist.platform.version>
+				<package.qualifierPrefix>e435</package.qualifierPrefix>
 			</properties>
 			<repositories>
 				<repository>
-					<id>2024-12</id>
+					<id>2025-03</id>
 					<layout>p2</layout>
-					<url>https://download.eclipse.org/staging/2024-12/</url>
+					<url>https://download.eclipse.org/staging/2025-03/</url>
 				</repository>
 				<repository>
 					<id>orbit</id>
 					<layout>p2</layout>
-					<url>https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-12</url>
+					<url>https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025-03</url>
 				</repository>
 <!--				<repository>
 					<id>mylyn-markdown</id>
@@ -264,7 +264,7 @@
 				<repository>
 					<id>lsp4e</id>
 					<layout>p2</layout>
-					<url>https://download.eclipse.org/lsp4e/releases/0.26.0/</url>
+					<url>https://download.eclipse.org/lsp4e/releases/0.26.7/</url>
 <!--					<url>https://download.eclipse.org/lsp4e/snapshots</url> -->
 				</repository>
 				<repository>
@@ -281,6 +281,7 @@
 				</repository>
 			</repositories>
 		</profile>
+
 	</profiles>
 
 	<repositories>
diff --git a/headless-services/jdt-ls-extension/pom.xml b/headless-services/jdt-ls-extension/pom.xml
index 446406903a..107dd394f7 100644
--- a/headless-services/jdt-ls-extension/pom.xml
+++ b/headless-services/jdt-ls-extension/pom.xml
@@ -96,16 +96,16 @@
 	<repositories>
 		<!-- composite update site contains http references, using exact https urls instead -->
 		<repository>
-			<id>eclipse-2023-09</id>
+			<id>eclipse-2024-09</id>
 			<layout>p2</layout>
-			<url>https://download.eclipse.org/releases/2023-12</url>
+			<url>https://download.eclipse.org/releases/2024-09</url>
 		</repository>
 
 		<repository>
 			<id>JDT.LS</id>
 			<layout>p2</layout>
 			<!-- <url>${jdt.ls.updatesite}</url> -->
-			<url>https://download.eclipse.org/jdtls/milestones/1.30.1/repository/</url>
+			<url>https://download.eclipse.org/jdtls/milestones/1.40.0/repository/</url>
 <!--			<url>https://download.eclipse.org/jdtls/snapshots/repository/latest/</url> -->
 <!-- The latest JDT LS requires a JDK 17, so we need to run builds on a JDK 17 and raise the minimum level to JDK 17 -->
 <!-- In order to avoid this for the 2022-06-based release, I set the JDK LS version here to the latest milestone that does NOT require JDK 17 yet -->