Adjust to BNDlib7 changes

eclipse-tycho · Oct 22, 2023 · 3894460 · 3894460
1 parent c165f56
commit 3894460
Showing 1 changed file with 3 additions and 2 deletions.
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
@@ -168,7 +168,7 @@ public void testNonOSGiArtifact_missingArtifactGenerate_defaultInstructions() th
         assertEquals("Bundle derived from maven artifact com.google.errorprone:error_prone_annotations:2.18.0",
                 attributes.getValue(Constants.BUNDLE_NAME));
         assertEqualManifestHeaders(Constants.IMPORT_PACKAGE, attributes,
-                "javax.lang.model.element;resolution:=optional");
+                "javax.lang.model.element;resolution:=\"optional\", java.lang.annotation;resolution:=\"optional\", java.lang;resolution:=\"optional\"");
         assertEqualManifestHeaders(Constants.EXPORT_PACKAGE, attributes,
                 "com.google.errorprone.annotations;version=\"2.18.0\";uses:=\"javax.lang.model.element\"",
                 "com.google.errorprone.annotations.concurrent;version=\"2.18.0\"");
@@ -223,7 +223,8 @@ public void testNonOSGiArtifact_missingArtifactGenerate_customInstructions() thr
                 attributes.getValue(Constants.BUNDLE_SYMBOLICNAME));
         assertEquals("Bundle in Test from artifact com.google.errorprone:error_prone_annotations:2.18.0:",
                 attributes.getValue(Constants.BUNDLE_NAME));
-        assertEqualManifestHeaders(Constants.IMPORT_PACKAGE, attributes, "javax.lang.model.element");
+        assertEqualManifestHeaders(Constants.IMPORT_PACKAGE, attributes,
+                "java.lang.annotation, javax.lang.model.element, java.lang");
         assertEqualManifestHeaders(Constants.EXPORT_PACKAGE, attributes,
                 "com.google.errorprone.annotations;version=\"2.18.0\";uses:=\"javax.lang.model.element\"",
                 "com.google.errorprone.annotations.concurrent;version=\"2.18.0\"");