Use bnd merge directive to make some warnings go away and use version 1.0.0 of the maven bundle plugin.

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@575027 13f79535-47bb-0310-9956-ffa450edef68
1 file changed