You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by fm...@apache.org on 2009/09/17 15:11:21 UTC

svn commit: r816176 - in /felix/trunk/configadmin: pom.xml src/main/java/org/osgi/service/cm/ src/main/resources/

Author: fmeschbe
Date: Thu Sep 17 13:11:21 2009
New Revision: 816176

URL: http://svn.apache.org/viewvc?rev=816176&view=rev
Log:
FELIX-1543 Refer to official OSGi core and compendium library
artifacts and remove copy of cm package source

Removed:
    felix/trunk/configadmin/src/main/java/org/osgi/service/cm/
    felix/trunk/configadmin/src/main/resources/
Modified:
    felix/trunk/configadmin/pom.xml

Modified: felix/trunk/configadmin/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/configadmin/pom.xml?rev=816176&r1=816175&r2=816176&view=diff
==============================================================================
--- felix/trunk/configadmin/pom.xml (original)
+++ felix/trunk/configadmin/pom.xml Thu Sep 17 13:11:21 2009
@@ -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,