Clean up MavenRuntimeClasspathProvider and m2e.editor.lemminx metadata

Author: HannesWell

org.eclipse.m2e.editor.lemminx/META-INF/MANIFEST.MF

@@ -4,14 +4,15 @@ Bundle-Name: M2E Maven POM File Editor using Wild Web Developer, LemMinX and Mav
 Bundle-SymbolicName: org.eclipse.m2e.editor.lemminx;singleton:=true
 Bundle-Version: 2.0.4.qualifier
 Automatic-Module-Name: org.eclipse.m2e.xmlls.extension
-Import-Package: org.eclipse.core.runtime;version="3.5.0",
+Import-Package: javax.inject;version="[1.0.0,2.0.0)",
+ org.eclipse.core.runtime;version="3.5.0",
  org.osgi.framework;version="1.10.0",
  org.slf4j;version="[1.7.0,3.0.0)"
-Require-Bundle: javax.inject,
- org.eclipse.wildwebdeveloper.xml;bundle-version="[1.1,1.2)",
+Require-Bundle: org.eclipse.wildwebdeveloper.xml;bundle-version="[1.1,1.2)",
  org.eclipse.lsp4e;bundle-version="0.16.0",
  org.eclipse.lsp4j;bundle-version="0.9.0",
  org.eclipse.m2e.core,
- org.eclipse.m2e.maven.runtime;bundle-version="[3.8.6,4.0.0)"
+ org.eclipse.m2e.maven.runtime;bundle-version="[3.8.6,4.0.0)",
+ org.eclipse.core.resources
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-Vendor: Eclipse.org - m2e

org.eclipse.m2e.editor.lemminx/src/org/eclipse/m2e/editor/lemminx/MavenRuntimeClasspathProvider.java

@@ -19,6 +19,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Stream;
 
@@ -54,8 +55,8 @@ public MavenRuntimeClasspathProvider() {
 					DidChangeConfigurationParams params = new DidChangeConfigurationParams(Map.of("xml", options));
 
 					LanguageServers.forProject(null).withPreferredServer(definition).excludeInactive()
-					.collectAll((w, ls) -> CompletableFuture.completedFuture(ls)).thenAccept(
-							lss -> lss.stream().forEach(ls -> ls.getWorkspaceService().didChangeConfiguration(params)));
+							.collectAll((w, ls) -> CompletableFuture.completedFuture(ls)).thenAccept(lss -> lss.stream()
+									.forEach(ls -> ls.getWorkspaceService().didChangeConfiguration(params)));
 
 				};
 				MavenPlugin.getMavenConfiguration().addConfigurationChangeListener(mavenConfigurationlistener);
@@ -70,12 +71,9 @@ public List<File> get() {
 		addJarsFromBundle(FrameworkUtil.getBundle(org.apache.maven.Maven.class), "/jars/", mavenRuntimeJars);
 		// Libraries that are also required and not included in
 		// org.eclipse.m2e.maven.runtime
-		try {
-			mavenRuntimeJars.add(FileLocator.getBundleFile(FrameworkUtil.getBundle(javax.inject.Inject.class)));
-			mavenRuntimeJars.add(FileLocator.getBundleFile(FrameworkUtil.getBundle(org.slf4j.Logger.class)));
-		} catch (IOException e) {
-			LOG.error(e.getMessage(), e);
-		}
+		Stream.of(javax.inject.Inject.class, org.slf4j.Logger.class)//
+				.map(FrameworkUtil::getBundle).map(FileLocator::getBundleFileLocation)//
+				.flatMap(Optional::stream).forEach(mavenRuntimeJars::add);
 		return mavenRuntimeJars;
 	}