From 32486bbf6b6a98a50545421adf17ce63b7c284b3 Mon Sep 17 00:00:00 2001
From: Kondal Kolipaka <kondal.kolipaka@espressif.com>
Date: Sat, 11 Jan 2025 07:07:35 +0530
Subject: [PATCH] Update orbit builds, eclipse plugins, jna plugins etc (#1111)

---
 .../com.espressif.idf.target.target           | 68 +++++--------------
 releng/com.espressif.idf.update/category.xml  |  9 ---
 2 files changed, 18 insertions(+), 59 deletions(-)

diff --git a/releng/com.espressif.idf.target/com.espressif.idf.target.target b/releng/com.espressif.idf.target/com.espressif.idf.target.target
index 7a2c46c0a..91601c82f 100644
--- a/releng/com.espressif.idf.target/com.espressif.idf.target.target
+++ b/releng/com.espressif.idf.target/com.espressif.idf.target.target
@@ -3,7 +3,7 @@
 <target name="com.espressif.idf.target" sequenceNumber="25">
 	<locations>
 		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/eclipse/updates/4.32"/>
+			<repository location="https://download.eclipse.org/eclipse/updates/4.33"/>
 			<unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/>
 			<unit id="org.eclipse.rcp.feature.group" version="0.0.0"/>
 			<unit id="org.eclipse.rcp.source.feature.group" version="0.0.0"/>
@@ -19,7 +19,7 @@
 
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/releases/2024-06"/>
+			<repository location="https://download.eclipse.org/releases/2024-09"/>
 			<unit id="org.eclipse.cdt.autotools.feature.group" version="0.0.0"/>
 			<unit id="org.eclipse.cdt.feature.group" version="0.0.0"/>
 			<unit id="org.eclipse.cdt.sdk.feature.group" version="0.0.0"/>
@@ -32,26 +32,19 @@
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<unit id="com.google.gson" version="0.0.0"/>
-			<unit id="com.sun.xml.bind" version="2.3.3.v20201118-1818"/>
-			<unit id="javax.activation" version="1.2.2.v20201119-1642"/>
-			<unit id="jakarta.xml.bind" version="2.3.3.v20201118-1818"/>
-			<unit id="javax.xml.stream" version="0.0.0"/>
-			<unit id="net.sourceforge.lpg.lpgjavaruntime" version="0.0.0"/>
 			<unit id="org.antlr.runtime" version="0.0.0"/>
-			<unit id="org.apache.commons.compress" version="0.0.0"/>
 			<unit id="org.apache.log4j" version="0.0.0"/>
-			<unit id="org.assertj" version="0.0.0"/>
-			<unit id="org.freemarker" version="0.0.0"/>
 			<unit id="org.hamcrest" version="0.0.0"/>
 			<unit id="org.hamcrest.core" version="0.0.0"/>
 			<unit id="org.junit" version="0.0.0"/>
-			<unit id="org.junit.jupiter.api" version="0.0.0"/>
-			<unit id="org.mockito" version="0.0.0"/>
-			<unit id="org.slf4j.impl.log4j12" version="0.0.0"/>
 			<unit id="org.yaml.snakeyaml" version="0.0.0"/>
-			<unit id="com.sun.jna" version="5.6.0.v20200716-0148"/>
-			<unit id="com.sun.jna.platform" version="5.6.0.v20200722-0209"/>
-			<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210223232630/repository/"/>
+			<unit id="com.sun.jna" version="0.0.0"/>
+			<unit id="com.sun.jna.platform" version="0.0.0"/>
+			<unit id="org.apache.batik.css" version="0.0.0"/>
+			<unit id="org.apache.batik.util" version="0.0.0"/>
+			<unit id="org.apache.batik.i18n" version="0.0.0"/>
+			<unit id="org.apache.batik.constants" version="0.0.0"/>
+			<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-09"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<unit id="com.cthing.cmakeed.feature.feature.group" version="1.17.0"/>
@@ -62,14 +55,7 @@
 			<unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
 			<unit id="slf4j.api" version="0.0.0"/>
 			<unit id="slf4j.simple" version="0.0.0"/>
-			<repository location="https://download.eclipse.org/egit/updates"/>
-		</location>
-		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<unit id="org.apache.batik.css" version="1.16.0.v20221027-0840"/>
-			<unit id="org.apache.batik.util" version="1.16.0.v20221027-0840"/>
-			<unit id="org.apache.batik.i18n" version="1.16.0.v20221027-0840"/>
-			<unit id="org.apache.batik.constants" version="1.16.0.v20221027-0840"/>
-			<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository"/>
+			<repository location="https://download.eclipse.org/egit/updates-7.0/"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/latest/"/>
@@ -95,24 +81,16 @@
 			<unit id="org.eclipse.embedcdt.packs.feature.group" version="6.4.0.202307251916"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/lsp4e/releases/0.26.3/"/>
-			<unit id="com.google.gson" version="2.11.0"/>
-			<unit id="org.eclipse.lsp4j" version="0.23.1.v20240521-1815"/>
-			<unit id="org.eclipse.lsp4j.debug" version="0.23.1.v20240521-1815"/>
-			<unit id="org.eclipse.lsp4j.jsonrpc" version="0.23.1.v20240521-1815"/>
-			<unit id="org.eclipse.lsp4j.jsonrpc.debug" version="0.23.1.v20240521-1815"/>
+			<repository location="https://download.eclipse.org/lsp4e/snapshots/"/>
+			<unit id="org.eclipse.lsp4j" version="0.0.0"/>
+			<unit id="org.eclipse.lsp4j.debug" version="0.0.0"/>
+			<unit id="org.eclipse.lsp4j.jsonrpc" version="0.0.0"/>
+			<unit id="org.eclipse.lsp4j.jsonrpc.debug" version="0.0.0"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/tm4e/releases/0.9.0/"/>
-			<unit id="com.google.gson" version="2.10.1"/>
-			<unit id="org.apache.batik.constants" version="1.16.0.v20221027-0840"/>
-			<unit id="org.apache.batik.css" version="1.16.0.v20221027-0840"/>
-			<unit id="org.apache.batik.util" version="1.16.0.v20221027-0840"/>
-			<unit id="org.eclipse.tm4e.feature.feature.group" version="0.9.0.202401090933"/>
-			<unit id="org.eclipse.tm4e.language_pack.feature.feature.group" version="0.9.0.202401090933"/>
-			<unit id="org.jcodings" version="1.0.58"/>
-			<unit id="org.joni" version="2.2.1"/>
-			<unit id="org.snakeyaml.engine" version="2.7.0"/>
+			<repository location="https://download.eclipse.org/tm4e/releases/0.13.0/" />
+			<unit id="org.eclipse.tm4e.feature.feature.group" version="0.0.0" />
+			<unit id="org.eclipse.tm4e.language_pack.feature.feature.group" version="0.0.0" />
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<repository location="https://download.eclipse.org/swtchart/releases/0.14.0/repository"/>
@@ -122,16 +100,6 @@
 			<repository location="https://download.eclipse.org/justj/jres/17/updates/release/17.0.12"/>
 			<unit id="org.eclipse.justj.openjdk.hotspot.jre.full.feature.group" version="17.0.12.v20240802-1518"/>
 		</location>
-		<location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" label="ASM" missingManifest="error" type="Maven">
-			<dependencies>
-				<dependency>
-					<groupId>org.freemarker</groupId>
-					<artifactId>freemarker</artifactId>
-					<version>2.3.32</version>
-					<type>jar</type>
-				</dependency>
-			</dependencies>
-		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<repository location="https://download.eclipse.org/tools/cdt/releases/cdt-lsp-2.0/"/>
 			<unit id="org.eclipse.cdt.lsp.feature.feature.group" version="2.0.0.202406041551"/>
diff --git a/releng/com.espressif.idf.update/category.xml b/releng/com.espressif.idf.update/category.xml
index b3f2b2bfc..eee98c9f3 100644
--- a/releng/com.espressif.idf.update/category.xml
+++ b/releng/com.espressif.idf.update/category.xml
@@ -69,15 +69,6 @@
    <bundle id="org.eclipse.lsp4j.jsonrpc">
       <category name="com.espressif.idf"/>
    </bundle>
-   <bundle id="org.eclipse.mylyn.wikitext">
-      <category name="com.espressif.idf"/>
-   </bundle>
-   <bundle id="org.eclipse.mylyn.wikitext.markdown">
-      <category name="com.espressif.idf"/>
-   </bundle>
-   <bundle id="org.jsoup">
-      <category name="com.espressif.idf.dependencies"/>
-   </bundle>
    <bundle id="org.eclipse.tm4e.registry">
       <category name="com.espressif.idf"/>
    </bundle>