Commit 04e1f4c
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 1f31fb9 commit 04e1f4c
1 file changed
Lines changed: 53 additions & 0 deletions
File tree
- apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/model/tests
Lines changed: 53 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 | | |
| |||
411 | 414 | | |
412 | 415 | | |
413 | 416 | | |
| 417 | + | |
414 | 418 | | |
415 | 419 | | |
416 | 420 | | |
| |||
438 | 442 | | |
439 | 443 | | |
440 | 444 | | |
| 445 | + | |
| 446 | + | |
| 447 | + | |
| 448 | + | |
| 449 | + | |
| 450 | + | |
| 451 | + | |
| 452 | + | |
| 453 | + | |
| 454 | + | |
| 455 | + | |
| 456 | + | |
| 457 | + | |
| 458 | + | |
| 459 | + | |
| 460 | + | |
| 461 | + | |
| 462 | + | |
| 463 | + | |
| 464 | + | |
| 465 | + | |
| 466 | + | |
| 467 | + | |
| 468 | + | |
| 469 | + | |
| 470 | + | |
| 471 | + | |
| 472 | + | |
| 473 | + | |
| 474 | + | |
| 475 | + | |
| 476 | + | |
| 477 | + | |
| 478 | + | |
| 479 | + | |
| 480 | + | |
| 481 | + | |
| 482 | + | |
| 483 | + | |
| 484 | + | |
| 485 | + | |
| 486 | + | |
| 487 | + | |
| 488 | + | |
| 489 | + | |
| 490 | + | |
| 491 | + | |
| 492 | + | |
| 493 | + | |
441 | 494 | | |
442 | 495 | | |
443 | 496 | | |
| |||
0 commit comments