tree c80a9e6590bf54e95923ca0cee4e05dcd0a5d0b7
parent 8f7aae58486634ba44d07717b176a7ee1f304cf0
author Karl Pauls <pauls@apache.org> 1189620426 +0000
committer Karl Pauls <pauls@apache.org> 1189620426 +0000

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