Add testcase for a signed artifact and remove entries from manifest

(cherry picked from commit e6725a4)
eclipse-tycho · Feb 9, 2025 · 20d1c24 · 20d1c24
1 parent 098ee7d
commit 20d1c24
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 1 deletion.
diff --git a/tycho-core/src/main/java/org/eclipse/m2e/pde/target/shared/MavenBundleWrapper.java b/tycho-core/src/main/java/org/eclipse/m2e/pde/target/shared/MavenBundleWrapper.java
@@ -230,7 +230,12 @@ private static WrappedBundle getWrappedNode(DependencyNode node,
                         analyzer.addClasspath(depJar);
                         analyzer.removeClose(depJar);
                     }
-                    analyzerJar.setManifest(analyzer.calcManifest());
+                    Manifest manifest = analyzer.calcManifest();
+                    Map<String, Attributes> entries = manifest.getEntries();
+                    if (entries != null) {
+                        entries.clear();
+                    }
+                    analyzerJar.setManifest(manifest);
                     analyzerJar.write(wrapArtifactFile);
                     for (String err : analyzer.getErrors()) {
                         if (err.contains("Classes found in the wrong directory")) {

diff --git a/tycho-core/src/test/java/org/eclipse/m2e/pde/target/tests/OSGiMetadataGenerationTest.java b/tycho-core/src/test/java/org/eclipse/m2e/pde/target/tests/OSGiMetadataGenerationTest.java
@@ -105,6 +105,28 @@ public void testSourceWithSignature() throws Exception {
         assertTrue("No source bundle generated!", sourcesFound);
     }
 
+    @Test
+    public void testArtifactWithSignature() throws Exception {
+        ITargetLocation target = resolveMavenTarget(
+                """
+                        <location includeDependencyDepth="none" includeDependencyScopes="compile" label="verapdf" includeSource="true" missingManifest="generate" type="Maven">
+                            <dependencies>
+                                <dependency>
+                                    <groupId>org.verapdf</groupId>
+                                    <artifactId>core</artifactId>
+                                    <version>1.26.5</version>
+                                </dependency>
+                            </dependencies>
+                        </location>
+                        """);
+        assertStatusOk(getTargetStatus(target));
+        TargetBundle[] allBundles = target.getBundles();
+        for (TargetBundle targetBundle : allBundles) {
+            assertValidSignature(targetBundle);
+        }
+        assertTrue("No bundle generated!", allBundles.length > 0);
+    }
+
     @Test
     public void testBadDependencyDirect() throws Exception {
         ITargetLocation target = resolveMavenTarget("""