Workaround for bnd-lib bug

Author: laeubi

org.eclipse.m2e.pde.feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.m2e.pde.feature"
       label="%featureName"
-      version="2.3.400.qualifier"
+      version="2.3.500.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.m2e.core"
       license-feature="org.eclipse.license"

org.eclipse.m2e.pde.target.tests/src/org/eclipse/m2e/pde/target/tests/OSGiMetadataGenerationTest.java

@@ -44,6 +44,24 @@
 
 public class OSGiMetadataGenerationTest extends AbstractMavenTargetTest {
 
+	@Test
+	public void testWithEmptyMetaInfServices() throws Exception {
+		ITargetLocation target = resolveMavenTarget(
+				"""
+						<location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="generate" type="Maven">
+						    <dependencies>
+						        <dependency>
+						            <groupId>org.apache.qpid</groupId>
+						            <artifactId>qpid-jms-discovery</artifactId>
+						            <version>2.7.0</version>
+						            <type>jar</type>
+						        </dependency>
+						    </dependencies>
+						</location>
+						""");
+		assertStatusOk(getTargetStatus(target));
+	}
+
 	@Test
 	public void testNonJarArtifactInDependencies() throws Exception {
 		ITargetLocation target = resolveMavenTarget(

org.eclipse.m2e.pde.target/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: M2E PDE Integration
 Bundle-SymbolicName: org.eclipse.m2e.pde.target;singleton:=true
-Bundle-Version: 2.1.2.qualifier
+Bundle-Version: 2.1.3.qualifier
 Automatic-Module-Name: org.eclipse.m2e.pde.target
 Bundle-RequiredExecutionEnvironment: JavaSE-21
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.27.0,4.0.0)",

org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/shared/MavenBundleWrapper.java

@@ -20,13 +20,15 @@
 import java.nio.file.Path;
 import java.nio.file.attribute.FileTime;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Properties;
 import java.util.Set;
+import java.util.TreeMap;
 import java.util.function.Function;
 import java.util.jar.Attributes;
 import java.util.jar.Attributes.Name;
@@ -185,6 +187,10 @@ private static WrappedBundle getWrappedNode(DependencyNode node,
 		Jar jar;
 		try {
 			jar = new Jar(originalFile);
+			// Workaround for https://github.com/bndtools/bnd/pull/6388
+			if (jar.getDirectories().getOrDefault("META-INF/services", Collections.emptyMap()) == null) {
+				jar.getDirectories().put("META-INF/services", new TreeMap<>());
+			}
 		} catch (IOException e) {
 			visited.put(node,
 					wrappedNode = new WrappedBundle(node, List.of(), null, null, null,