From 4e9ba9210afac02eb573a2f210d11d9d3cdaa3bd Mon Sep 17 00:00:00 2001
From: Martin Lippert <martin.lippert@broadcom.com>
Date: Thu, 12 Sep 2024 21:15:23 +0200
Subject: [PATCH] updated eclipse build targets, added e4.34, removed e4.31

---
 .../category.xml                              |   2 +-
 .../org.springframework.boot.ide.product      |   2 +-
 .../p2.inf                                    |   0
 .../pom.xml                                   |   2 +-
 eclipse-distribution/pom.xml                  | 207 +++++++++---------
 eclipse-language-servers/pom.xml              | 102 ++++-----
 6 files changed, 157 insertions(+), 158 deletions(-)
 rename eclipse-distribution/{org.springframework.boot.ide.product.e431 => org.springframework.boot.ide.product.e434}/category.xml (99%)
 rename eclipse-distribution/{org.springframework.boot.ide.product.e431 => org.springframework.boot.ide.product.e434}/org.springframework.boot.ide.product (99%)
 rename eclipse-distribution/{org.springframework.boot.ide.product.e431 => org.springframework.boot.ide.product.e434}/p2.inf (100%)
 rename eclipse-distribution/{org.springframework.boot.ide.product.e431 => org.springframework.boot.ide.product.e434}/pom.xml (99%)

diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e431/category.xml b/eclipse-distribution/org.springframework.boot.ide.product.e434/category.xml
similarity index 99%
rename from eclipse-distribution/org.springframework.boot.ide.product.e431/category.xml
rename to eclipse-distribution/org.springframework.boot.ide.product.e434/category.xml
index aceee6aba..77000088b 100644
--- a/eclipse-distribution/org.springframework.boot.ide.product.e431/category.xml
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e434/category.xml
@@ -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.e431/org.springframework.boot.ide.product b/eclipse-distribution/org.springframework.boot.ide.product.e434/org.springframework.boot.ide.product
similarity index 99%
rename from eclipse-distribution/org.springframework.boot.ide.product.e431/org.springframework.boot.ide.product
rename to eclipse-distribution/org.springframework.boot.ide.product.e434/org.springframework.boot.ide.product
index 1b2839257..ab95e9517 100644
--- a/eclipse-distribution/org.springframework.boot.ide.product.e431/org.springframework.boot.ide.product
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e434/org.springframework.boot.ide.product
@@ -9,7 +9,7 @@
       <programArgs>-product org.springframework.boot.ide.branding.sts4
 --launcher.defaultAction openFile
 </programArgs>
-      <vmArgs>-Dosgi.requiredJavaVersion=17
+      <vmArgs>-Dosgi.requiredJavaVersion=21
 -Dosgi.dataAreaRequiresExplicitInit=true
 -Dorg.slf4j.simpleLogger.defaultLogLevel=off
 -Dsun.java.command=SpringToolSuite4
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e431/p2.inf b/eclipse-distribution/org.springframework.boot.ide.product.e434/p2.inf
similarity index 100%
rename from eclipse-distribution/org.springframework.boot.ide.product.e431/p2.inf
rename to eclipse-distribution/org.springframework.boot.ide.product.e434/p2.inf
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e431/pom.xml b/eclipse-distribution/org.springframework.boot.ide.product.e434/pom.xml
similarity index 99%
rename from eclipse-distribution/org.springframework.boot.ide.product.e431/pom.xml
rename to eclipse-distribution/org.springframework.boot.ide.product.e434/pom.xml
index eda9eaf20..bcbce50e9 100644
--- a/eclipse-distribution/org.springframework.boot.ide.product.e431/pom.xml
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e434/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>
diff --git a/eclipse-distribution/pom.xml b/eclipse-distribution/pom.xml
index 2b4bf267a..e056eac15 100644
--- a/eclipse-distribution/pom.xml
+++ b/eclipse-distribution/pom.xml
@@ -129,106 +129,6 @@
 			</properties>
 		</profile>
 
-		<profile>
-			<id>e431</id>
-			<properties>
-				<dist.target>e4.31.0</dist.target>
-				<dist.target.major>e4.31</dist.target.major>
-				<dist.platform.name>2024-03</dist.platform.name>
-				<dist.platform.name.long>2024-03 (4.31)</dist.platform.name.long>
-				<dist.platform.id>2024-03</dist.platform.id>
-				<dist.platform.version>4.31</dist.platform.version>
-				<package.qualifierPrefix>e431</package.qualifierPrefix>
-			</properties>
-			<repositories>
-				<repository>
-					<id>2024-03</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/releases/2024-03/</url>
-				</repository>
-				<repository>
-					<id>orbit</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-03</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/1.3.3</url>
-				</repository>
-				<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> -->
-				</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.e431</module>
-			</modules>
-
-		</profile>
-
 		<profile>
 			<id>e432</id>
 			<properties>
@@ -349,7 +249,7 @@
 				<repository>
 					<id>2024-09</id>
 					<layout>p2</layout>
-					<url>https://download.eclipse.org/staging/2024-09/</url>
+					<url>https://download.eclipse.org/releases/2024-09/</url>
 				</repository>
 				<repository>
 					<id>orbit</id>
@@ -439,6 +339,111 @@
 
 		</profile>
 
+		<profile>
+			<id>e434</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>
+			</properties>
+			<repositories>
+				<repository>
+					<id>2024-12</id>
+					<layout>p2</layout>
+					<url>https://download.eclipse.org/staging/2024-12/</url>
+				</repository>
+				<repository>
+					<id>orbit</id>
+					<layout>p2</layout>
+					<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>
+					<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.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.e434</module>
+			</modules>
+
+		</profile>
+
 		<profile>
 			<id>bundle-tests</id>
 			<activation>
diff --git a/eclipse-language-servers/pom.xml b/eclipse-language-servers/pom.xml
index 24c4435b4..d0770dd34 100644
--- a/eclipse-language-servers/pom.xml
+++ b/eclipse-language-servers/pom.xml
@@ -138,59 +138,6 @@
 			</properties>
 		</profile>
 
-		<profile>
-			<id>e431</id>
-			<properties>
-				<dist.target>e4.31.0</dist.target>
-				<dist.target.major>e4.31</dist.target.major>
-				<dist.platform.name>2024-03</dist.platform.name>
-				<dist.platform.name.long>2024-03 (4.31)</dist.platform.name.long>
-				<dist.platform.id>2024-03</dist.platform.id>
-				<dist.platform.version>4.31</dist.platform.version>
-				<package.qualifierPrefix>e431</package.qualifierPrefix>
-			</properties>
-			<repositories>
-				<repository>
-					<id>2023-12</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/releases/2024-03/</url>
-				</repository>
-				<repository>
-					<id>orbit</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-03</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.24.1/</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.8.1/</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>e432</id>
 			<properties>
@@ -254,7 +201,7 @@
 				<repository>
 					<id>2024-09</id>
 					<layout>p2</layout>
-					<url>https://download.eclipse.org/staging/2024-09/</url>
+					<url>https://download.eclipse.org/releases/2024-09/</url>
 				</repository>
 				<repository>
 					<id>orbit</id>
@@ -287,6 +234,53 @@
 			</repositories>
 		</profile>
 
+		<profile>
+			<id>e434</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>
+			</properties>
+			<repositories>
+				<repository>
+					<id>2024-12</id>
+					<layout>p2</layout>
+					<url>https://download.eclipse.org/staging/2024-12/</url>
+				</repository>
+				<repository>
+					<id>orbit</id>
+					<layout>p2</layout>
+					<url>https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-12</url>
+				</repository>
+<!--				<repository>
+					<id>mylyn-markdown</id>
+					<layout>p2</layout>
+					<url>https://download.eclipse.org/mylyn/docs/releases/3.0.48/</url>
+				</repository> -->
+				<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> -->
+				</repository>
+				<repository>
+					<id>tm4e</id>
+					<layout>p2</layout>
+					<url>https://download.eclipse.org/tm4e/releases/latest/</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>
 	</profiles>
 
 	<repositories>