FELIX-1543 Refer to official OSGi core and compendium library
artifacts and remove copy of cm package source

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@816176 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/configadmin/pom.xml b/configadmin/pom.xml
index 9ec29e1..dc39cc0 100644
--- a/configadmin/pom.xml
+++ b/configadmin/pom.xml
@@ -37,14 +37,14 @@
 
     <dependencies>
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
-            <version>1.0.0</version>
+            <version>4.0.0</version>
         </dependency>
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.compendium</artifactId>
-            <version>1.0.0</version>
+            <version>4.2.0</version>
         </dependency>
         
         <!-- Integration Testing with Pax Exam -->
@@ -96,7 +96,7 @@
                         <Export-Package>
                             org.apache.felix.cm;
                             org.apache.felix.cm.file;version=1.0,
-                            org.osgi.service.cm;-split-package:=merge-first
+                            org.osgi.service.cm
                         </Export-Package>
                         <Private-Package>
                             org.apache.felix.cm.impl,