Commit 683eca9
committed
TestSuiteHelper: Include felix.scr if osgi.component is required
Some test cases use 'org.eclipse.core.runtime' as dependency.
One of the runtime's dependencies (org.eclipse.core.contenttype)
uses declarative services to provide a service component, but was
missing the Require-Capability: header to require the
osgi.extender=osgi.component.
In eclipse-platform/eclipse.platform#2162
this was corrected.
But as a result, for the resolution of org.eclipse.core.runtime
to succeed, a OSGI extender provider must now strictly be present.
This cannot be auto-resolved by the PDE API tooling tests, as
these tests are quite special and the bundles available in the
resolver state are hand-picked by
TestSuiteHelper.addAllRequired(IApiBaseline, Set<String>, IApiComponent, List<IApiComponent>)
which currently does not support this kind of dependency.
To work around that, we check if we find a dependency on SCR
and if so, add an implementation for it to the baseline fixture:
org.apache.felix.scr and its dependencies.1 parent 9213517 commit 683eca9
1 file changed
Lines changed: 27 additions & 0 deletions
File tree
- apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/model/tests
Lines changed: 27 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
35 | 35 | | |
36 | 36 | | |
37 | 37 | | |
| 38 | + | |
38 | 39 | | |
39 | 40 | | |
40 | 41 | | |
| |||
51 | 52 | | |
52 | 53 | | |
53 | 54 | | |
| 55 | + | |
| 56 | + | |
54 | 57 | | |
55 | 58 | | |
56 | 59 | | |
| |||
412 | 415 | | |
413 | 416 | | |
414 | 417 | | |
| 418 | + | |
| 419 | + | |
| 420 | + | |
| 421 | + | |
| 422 | + | |
| 423 | + | |
| 424 | + | |
| 425 | + | |
| 426 | + | |
| 427 | + | |
| 428 | + | |
| 429 | + | |
| 430 | + | |
| 431 | + | |
| 432 | + | |
| 433 | + | |
| 434 | + | |
| 435 | + | |
| 436 | + | |
| 437 | + | |
| 438 | + | |
| 439 | + | |
| 440 | + | |
| 441 | + | |
415 | 442 | | |
416 | 443 | | |
417 | 444 | | |
| |||
0 commit comments