FELIX-1541 Include official org.osgi.service.cm sources received
from BJ Hargrave with configadmin and ensure these are packaged
instead of the (older) ones from the org.osgi.compendium library.

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@809193 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/configadmin/pom.xml b/configadmin/pom.xml
index 38d6f83..1639ff5 100644
--- a/configadmin/pom.xml
+++ b/configadmin/pom.xml
@@ -96,7 +96,7 @@
                         <Export-Package>
                             org.apache.felix.cm;
                             org.apache.felix.cm.file;version=1.0,
-                            org.osgi.service.cm;version=1.3
+                            org.osgi.service.cm;-split-package:=merge-first
                         </Export-Package>
                         <Private-Package>
                             org.apache.felix.cm.impl,