493281: Use both dependency resolution methods

Change-Id: Iecf78247183dbec2dfceb38d12d5c48efcdf59c8
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=493281
3 files changed