From f889da5d115eb934a37a93e5324a271701f884cb Mon Sep 17 00:00:00 2001
From: Hannes Wellmann <wellmann.hannes1@gmx.net>
Date: Tue, 7 Nov 2023 23:34:44 +0100
Subject: [PATCH 1/2] Update to Apache Aries SPI Fly 1.3.7

---
 org.eclipse.m2e.logback.feature/feature.xml |  4 ----
 products/m2e-ide/Eclipse-M2E-IDE.launch     |  2 +-
 target-platform/target-platform.target      | 12 +++++-------
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/org.eclipse.m2e.logback.feature/feature.xml b/org.eclipse.m2e.logback.feature/feature.xml
index d4888e76e6..b1e0f5eff9 100644
--- a/org.eclipse.m2e.logback.feature/feature.xml
+++ b/org.eclipse.m2e.logback.feature/feature.xml
@@ -16,10 +16,6 @@
       %copyright
    </copyright>
 
-   <requires>
-      <import plugin="jakarta.servlet-api" version="5.0.0" match="compatible"/>
-   </requires>
-
    <plugin
          id="org.eclipse.m2e.logback"
          version="0.0.0"/>
diff --git a/products/m2e-ide/Eclipse-M2E-IDE.launch b/products/m2e-ide/Eclipse-M2E-IDE.launch
index 6df8ce657a..571d0a92b6 100644
--- a/products/m2e-ide/Eclipse-M2E-IDE.launch
+++ b/products/m2e-ide/Eclipse-M2E-IDE.launch
@@ -2,7 +2,7 @@
 <launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
     <setAttribute key="additional_plugins">
         <setEntry value="ch.qos.logback.classic:1.4.11:default:true:default:true"/>
-        <setEntry value="org.apache.aries.spifly.dynamic.bundle:1.3.6:default:true:2:true"/>
+        <setEntry value="org.apache.aries.spifly.dynamic.bundle:1.3.7:default:true:2:true"/>
         <setEntry value="org.apache.felix.scr:2.2.6:default:true:2:true"/>
         <setEntry value="org.eclipse.core.runtime:3.29.0.v20230726-0617:default:true:default:true"/>
         <setEntry value="org.eclipse.equinox.common:3.18.100.v20230730-1117:default:true:2:true"/>
diff --git a/target-platform/target-platform.target b/target-platform/target-platform.target
index df72f7e21a..5d30052e2d 100644
--- a/target-platform/target-platform.target
+++ b/target-platform/target-platform.target
@@ -9,7 +9,6 @@
 			<unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="0.0.0"/>
 			<unit id="org.eclipse.ui.tests.harness" version="0.0.0"/>
 			<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
-			<unit id="org.apache.aries.spifly.dynamic.bundle" version="0.0.0"/>
 			<unit id="org.mockito.mockito-core" version="0.0.0"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
@@ -59,7 +58,7 @@
 				</dependency>
 			</dependencies>
 		</location>
-		<location includeDependencyDepth="infinite" includeDependencyScopes="compile" includeSource="true" label="Logging" missingManifest="generate" type="Maven">
+		<location includeDependencyDepth="infinite" includeDependencyScopes="compile" includeSource="true" label="Logging" missingManifest="error" type="Maven">
 			<dependencies>
 				<dependency>
 					<groupId>ch.qos.logback</groupId>
@@ -68,10 +67,9 @@
 					<type>jar</type>
 				</dependency>
 				<dependency>
-					<!-- Logback provides a Servlet Container service which is also loaded and that needs servlet (by default optional) -->
-					<groupId>jakarta.servlet</groupId>
-					<artifactId>jakarta.servlet-api</artifactId>
-					<version>5.0.0</version>
+					<groupId>org.apache.aries.spifly</groupId>
+					<artifactId>org.apache.aries.spifly.dynamic.bundle</artifactId>
+					<version>1.3.7</version>
 					<type>jar</type>
 				</dependency>
 			</dependencies>
@@ -173,4 +171,4 @@ Import-Package:        !*
 		</location>
 		<location type="Target" uri="file:${project_loc:/m2e-core}/target-platform/m2e-runtimes.target"/>
 	</locations>
-</target>
+</target>
\ No newline at end of file

From ee88846591ff1ef3640214f5e53f808c23d20e42 Mon Sep 17 00:00:00 2001
From: Hannes Wellmann <wellmann.hannes1@gmx.net>
Date: Tue, 7 Nov 2023 23:53:05 +0100
Subject: [PATCH 2/2] Update to latest of webtools, lsp4j, lsp4e, commons-cli
 and Guava

---
 m2e-core-tests                                     |  2 +-
 .../META-INF/MANIFEST.MF                           |  4 ++--
 target-platform/target-platform.target             | 14 +++++++-------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/m2e-core-tests b/m2e-core-tests
index 34ea2b6a54..a129b55566 160000
--- a/m2e-core-tests
+++ b/m2e-core-tests
@@ -1 +1 @@
-Subproject commit 34ea2b6a54ea1df7cf10bbd037f055bbe929977c
+Subproject commit a129b55566fa7fdea9f25f695a6ada4885689d60
diff --git a/org.eclipse.m2e.editor.lemminx/META-INF/MANIFEST.MF b/org.eclipse.m2e.editor.lemminx/META-INF/MANIFEST.MF
index 54ad7f0ae5..f55e082469 100644
--- a/org.eclipse.m2e.editor.lemminx/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.editor.lemminx/META-INF/MANIFEST.MF
@@ -9,8 +9,8 @@ Import-Package: javax.inject;version="[1.0.0,2.0.0)",
  org.osgi.framework;version="1.10.0",
  org.slf4j;version="[1.7.0,3.0.0)"
 Require-Bundle: org.eclipse.wildwebdeveloper.xml;bundle-version="[1.3,1.4)",
- org.eclipse.lsp4e;bundle-version="0.16.0",
- org.eclipse.lsp4j;bundle-version="0.9.0",
+ org.eclipse.lsp4e;bundle-version="0.18.0",
+ org.eclipse.lsp4j;bundle-version="0.21.0",
  org.eclipse.m2e.core,
  org.eclipse.m2e.maven.runtime;bundle-version="[3.8.6,4.0.0)",
  org.eclipse.core.resources
diff --git a/target-platform/target-platform.target b/target-platform/target-platform.target
index 5d30052e2d..c979d0ef0f 100644
--- a/target-platform/target-platform.target
+++ b/target-platform/target-platform.target
@@ -12,7 +12,7 @@
 			<unit id="org.mockito.mockito-core" version="0.0.0"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-09/"/>
+			<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12/"/>
 			<unit id="org.jdom2" version="0.0.0"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
@@ -25,7 +25,7 @@
 			<unit id="org.eclipse.emf.ecore.edit.feature.group" version="0.0.0"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/webtools/downloads/drops/R3.30.0/R-3.30.0-20230603084739/repository/"/>
+			<repository location="https://download.eclipse.org/webtools/downloads/drops/R3.31.0/R-3.31.0-20230903090456/repository/"/>
 			<unit id="org.eclipse.wst.common.uriresolver" version="0.0.0"/>
 			<unit id="org.eclipse.wst.common.emf" version="0.0.0"/>
 			<unit id="org.eclipse.wst.xsd.core" version="0.0.0"/>
@@ -33,8 +33,8 @@
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<repository location="https://download.eclipse.org/wildwebdeveloper/releases/1.3.0/"/>
 			<repository location="https://download.eclipse.org/tm4e/releases/0.8.1/"/>
-			<repository location="https://download.eclipse.org/lsp4e/releases/0.23.0/"/>
-			<repository location="https://download.eclipse.org/lsp4j/updates/releases/0.21.0/"/>
+			<repository location="https://download.eclipse.org/lsp4e/releases/0.24.3/"/>
+			<repository location="https://download.eclipse.org/lsp4j/updates/releases/0.21.1/"/>
 			<unit id="org.eclipse.wildwebdeveloper.xml.feature.feature.group" version="0.0.0"/>
 			<unit id="org.eclipse.lsp4e" version="0.0.0"/>
 		</location>
@@ -85,19 +85,19 @@
 				<dependency>
 					<groupId>com.google.guava</groupId>
 					<artifactId>failureaccess</artifactId>
-					<version>1.0.1</version>
+					<version>1.0.2</version>
 					<type>jar</type>
 				</dependency>
 				<dependency>
 					<groupId>com.google.guava</groupId>
 					<artifactId>guava</artifactId>
-					<version>32.1.2-jre</version>
+					<version>32.1.3-jre</version>
 					<type>jar</type>
 				</dependency>
 				<dependency>
 					<groupId>commons-cli</groupId>
 					<artifactId>commons-cli</artifactId>
-					<version>1.5.0</version>
+					<version>1.6.0</version>
 					<type>jar</type>
 				</dependency>
 			</dependencies>