Skip to content

Commit 978ce9f

Browse files
merksakurtakov
authored andcommitted
Add implicit requirements in TestSuiteHelper.addAllRequired
- The algorithm only considers bundle requirements so the new Require-Cpability in org.eclipse.core.contenttype misses dependencies causing resolution errors that fail some tests. eclipse-platform/eclipse.platform#2162
1 parent 3347d35 commit 978ce9f

File tree

1 file changed

+21
-0
lines changed
  • apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/model/tests

1 file changed

+21
-0
lines changed

apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/model/tests/TestSuiteHelper.java

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -433,6 +433,27 @@ public static void addAllRequired(IApiBaseline baseline, Set<String> done, IApiC
433433
}
434434
}
435435
}
436+
// The org.eclipse.core.contenttype bundle has new requirement for 4.38.
437+
// Require-Capability: osgi.extender;
438+
// filter:="(&(osgi.extender=osgi.component)(version>=1.2)(!(version>=2.0)))"
439+
// We need to manually add non-bundle requirements as a result.
440+
if (component.getSymbolicName().equals("org.eclipse.core.contenttype")) { //$NON-NLS-1$
441+
@SuppressWarnings("nls")
442+
String[] others = new String[] { "org.apache.felix.scr", "org.osgi.service.component",
443+
"org.osgi.util.promise", "org.osgi.util.function" };
444+
for (String implicit : others) {
445+
if (!done.contains(implicit)) {
446+
File bundle = getBundle(implicit);
447+
if (bundle != null) {
448+
IApiComponent apiComponent = ApiModelFactory.newApiComponent(baseline,
449+
bundle.getAbsolutePath());
450+
collection.add(apiComponent);
451+
done.add(apiComponent.getSymbolicName());
452+
addAllRequired(baseline, done, apiComponent, collection);
453+
}
454+
}
455+
}
456+
}
436457
if (error) {
437458
throw new CoreException(Status.error("Check the property : -DrequiredBundles=...\nMissing required bundle(s): " + String.valueOf(buffer))); //$NON-NLS-1$
438459
}

0 commit comments

Comments
 (0)