Add dependency on osgi.util
Added suppliers to optional
preliminary adaptors support
remove deprecated class
readding... should not have been comitted
WIP with adaptors