further unification/cleanup of POMs
switched to standard OSGI annotations