You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2010/10/29 20:46:39 UTC

svn commit: r1028877 - in /karaf/trunk: ./ admin/command/ admin/core/ admin/management/ assembly/ deployer/blueprint/ deployer/features/ deployer/kar/ deployer/spring/ deployer/war/ features/command/ features/core/ features/management/ features/obr/ ja...

Author: gnodet
Date: Fri Oct 29 18:46:38 2010
New Revision: 1028877

URL: http://svn.apache.org/viewvc?rev=1028877&view=rev
Log:
[KARAF-258] Use the org.osgi groupId for core and compendium specs

Modified:
    karaf/trunk/admin/command/pom.xml
    karaf/trunk/admin/core/pom.xml
    karaf/trunk/admin/management/pom.xml
    karaf/trunk/assembly/pom.xml
    karaf/trunk/deployer/blueprint/pom.xml
    karaf/trunk/deployer/features/pom.xml
    karaf/trunk/deployer/kar/pom.xml
    karaf/trunk/deployer/spring/pom.xml
    karaf/trunk/deployer/war/pom.xml
    karaf/trunk/features/command/pom.xml
    karaf/trunk/features/core/pom.xml
    karaf/trunk/features/management/pom.xml
    karaf/trunk/features/obr/pom.xml
    karaf/trunk/jaas/boot/pom.xml
    karaf/trunk/jaas/command/pom.xml
    karaf/trunk/jaas/config/pom.xml
    karaf/trunk/jaas/modules/pom.xml
    karaf/trunk/main/pom.xml
    karaf/trunk/management/pom.xml
    karaf/trunk/pom.xml
    karaf/trunk/shell/config/pom.xml
    karaf/trunk/shell/console/pom.xml
    karaf/trunk/shell/dev/pom.xml
    karaf/trunk/shell/log/pom.xml
    karaf/trunk/shell/obr/pom.xml
    karaf/trunk/shell/osgi/pom.xml
    karaf/trunk/shell/packages/pom.xml
    karaf/trunk/shell/ssh/pom.xml
    karaf/trunk/shell/wrapper/pom.xml
    karaf/trunk/webconsole/admin/pom.xml
    karaf/trunk/webconsole/features/pom.xml
    karaf/trunk/webconsole/gogo/pom.xml

Modified: karaf/trunk/admin/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/admin/command/pom.xml?rev=1028877&r1=1028876&r2=1028877&view=diff
==============================================================================
--- karaf/trunk/admin/command/pom.xml (original)
+++ karaf/trunk/admin/command/pom.xml Fri Oct 29 18:46:38 2010
@@ -37,13 +37,13 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.felix</groupId>
+            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.felix</groupId>
+            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.compendium</artifactId>
             <scope>provided</scope>
         </dependency>

Modified: karaf/trunk/admin/core/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/admin/core/pom.xml?rev=1028877&r1=1028876&r2=1028877&view=diff
==============================================================================
--- karaf/trunk/admin/core/pom.xml (original)
+++ karaf/trunk/admin/core/pom.xml Fri Oct 29 18:46:38 2010
@@ -37,13 +37,13 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.felix</groupId>
+            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.felix</groupId>
+            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.compendium</artifactId>
             <scope>provided</scope>
         </dependency>

Modified: karaf/trunk/admin/management/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/admin/management/pom.xml?rev=1028877&r1=1028876&r2=1028877&view=diff
==============================================================================
--- karaf/trunk/admin/management/pom.xml (original)
+++ karaf/trunk/admin/management/pom.xml Fri Oct 29 18:46:38 2010
@@ -37,13 +37,13 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.felix</groupId>
+            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.felix</groupId>
+            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.compendium</artifactId>
             <scope>provided</scope>
         </dependency>

Modified: karaf/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assembly/pom.xml?rev=1028877&r1=1028876&r2=1028877&view=diff
==============================================================================
--- karaf/trunk/assembly/pom.xml (original)
+++ karaf/trunk/assembly/pom.xml Fri Oct 29 18:46:38 2010
@@ -224,7 +224,7 @@
             <artifactId>mina-core</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.felix</groupId>
+            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.compendium</artifactId>
         </dependency>
         <dependency>

Modified: karaf/trunk/deployer/blueprint/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/deployer/blueprint/pom.xml?rev=1028877&r1=1028876&r2=1028877&view=diff
==============================================================================
--- karaf/trunk/deployer/blueprint/pom.xml (original)
+++ karaf/trunk/deployer/blueprint/pom.xml Fri Oct 29 18:46:38 2010
@@ -39,7 +39,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.felix</groupId>
+            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>

Modified: karaf/trunk/deployer/features/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/deployer/features/pom.xml?rev=1028877&r1=1028876&r2=1028877&view=diff
==============================================================================
--- karaf/trunk/deployer/features/pom.xml (original)
+++ karaf/trunk/deployer/features/pom.xml Fri Oct 29 18:46:38 2010
@@ -39,7 +39,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.felix</groupId>
+            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>

Modified: karaf/trunk/deployer/kar/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/deployer/kar/pom.xml?rev=1028877&r1=1028876&r2=1028877&view=diff
==============================================================================
--- karaf/trunk/deployer/kar/pom.xml (original)
+++ karaf/trunk/deployer/kar/pom.xml Fri Oct 29 18:46:38 2010
@@ -39,7 +39,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.felix</groupId>
+            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>

Modified: karaf/trunk/deployer/spring/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/deployer/spring/pom.xml?rev=1028877&r1=1028876&r2=1028877&view=diff
==============================================================================
--- karaf/trunk/deployer/spring/pom.xml (original)
+++ karaf/trunk/deployer/spring/pom.xml Fri Oct 29 18:46:38 2010
@@ -39,7 +39,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.felix</groupId>
+            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>

Modified: karaf/trunk/deployer/war/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/deployer/war/pom.xml?rev=1028877&r1=1028876&r2=1028877&view=diff
==============================================================================
--- karaf/trunk/deployer/war/pom.xml (original)
+++ karaf/trunk/deployer/war/pom.xml Fri Oct 29 18:46:38 2010
@@ -39,7 +39,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.felix</groupId>
+            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>

Modified: karaf/trunk/features/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/features/command/pom.xml?rev=1028877&r1=1028876&r2=1028877&view=diff
==============================================================================
--- karaf/trunk/features/command/pom.xml (original)
+++ karaf/trunk/features/command/pom.xml Fri Oct 29 18:46:38 2010
@@ -37,13 +37,13 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.felix</groupId>
+            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.felix</groupId>
+            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.compendium</artifactId>
             <scope>provided</scope>
         </dependency>

Modified: karaf/trunk/features/core/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/features/core/pom.xml?rev=1028877&r1=1028876&r2=1028877&view=diff
==============================================================================
--- karaf/trunk/features/core/pom.xml (original)
+++ karaf/trunk/features/core/pom.xml Fri Oct 29 18:46:38 2010
@@ -37,13 +37,13 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.felix</groupId>
+            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.felix</groupId>
+            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.compendium</artifactId>
             <scope>provided</scope>
         </dependency>

Modified: karaf/trunk/features/management/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/features/management/pom.xml?rev=1028877&r1=1028876&r2=1028877&view=diff
==============================================================================
--- karaf/trunk/features/management/pom.xml (original)
+++ karaf/trunk/features/management/pom.xml Fri Oct 29 18:46:38 2010
@@ -37,13 +37,13 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.felix</groupId>
+            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.felix</groupId>
+            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.compendium</artifactId>
             <scope>provided</scope>
         </dependency>

Modified: karaf/trunk/features/obr/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/features/obr/pom.xml?rev=1028877&r1=1028876&r2=1028877&view=diff
==============================================================================
--- karaf/trunk/features/obr/pom.xml (original)
+++ karaf/trunk/features/obr/pom.xml Fri Oct 29 18:46:38 2010
@@ -37,7 +37,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.felix</groupId>
+            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>

Modified: karaf/trunk/jaas/boot/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/boot/pom.xml?rev=1028877&r1=1028876&r2=1028877&view=diff
==============================================================================
--- karaf/trunk/jaas/boot/pom.xml (original)
+++ karaf/trunk/jaas/boot/pom.xml Fri Oct 29 18:46:38 2010
@@ -41,7 +41,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.felix</groupId>
+            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>

Modified: karaf/trunk/jaas/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/command/pom.xml?rev=1028877&r1=1028876&r2=1028877&view=diff
==============================================================================
--- karaf/trunk/jaas/command/pom.xml (original)
+++ karaf/trunk/jaas/command/pom.xml Fri Oct 29 18:46:38 2010
@@ -53,13 +53,13 @@
             <artifactId>org.apache.karaf.shell.console</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.felix</groupId>
+            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.felix</groupId>
+            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.compendium</artifactId>
             <scope>provided</scope>
         </dependency>

Modified: karaf/trunk/jaas/config/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/config/pom.xml?rev=1028877&r1=1028876&r2=1028877&view=diff
==============================================================================
--- karaf/trunk/jaas/config/pom.xml (original)
+++ karaf/trunk/jaas/config/pom.xml Fri Oct 29 18:46:38 2010
@@ -46,7 +46,7 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.felix</groupId>
+            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>

Modified: karaf/trunk/jaas/modules/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/modules/pom.xml?rev=1028877&r1=1028876&r2=1028877&view=diff
==============================================================================
--- karaf/trunk/jaas/modules/pom.xml (original)
+++ karaf/trunk/jaas/modules/pom.xml Fri Oct 29 18:46:38 2010
@@ -61,13 +61,13 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.felix</groupId>
+            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.felix</groupId>
+            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.compendium</artifactId>
             <scope>provided</scope>
         </dependency>

Modified: karaf/trunk/main/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/main/pom.xml?rev=1028877&r1=1028876&r2=1028877&view=diff
==============================================================================
--- karaf/trunk/main/pom.xml (original)
+++ karaf/trunk/main/pom.xml Fri Oct 29 18:46:38 2010
@@ -159,12 +159,12 @@
                                             <classifier>sources</classifier>
                                         </artifactItem>
                                         <artifactItem>
-                                            <groupId>org.apache.felix</groupId>
+                                            <groupId>org.osgi</groupId>
                                             <artifactId>org.osgi.core</artifactId>
                                             <classifier>sources</classifier>
                                         </artifactItem>
                                         <artifactItem>
-                                            <groupId>org.apache.felix</groupId>
+                                            <groupId>org.osgi</groupId>
                                             <artifactId>org.apache.felix.framework</artifactId>
                                             <classifier>sources</classifier>
                                         </artifactItem>

Modified: karaf/trunk/management/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/management/pom.xml?rev=1028877&r1=1028876&r2=1028877&view=diff
==============================================================================
--- karaf/trunk/management/pom.xml (original)
+++ karaf/trunk/management/pom.xml Fri Oct 29 18:46:38 2010
@@ -37,12 +37,12 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.felix</groupId>
+            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.felix</groupId>
+            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.compendium</artifactId>
             <scope>provided</scope>
         </dependency>

Modified: karaf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1028877&r1=1028876&r2=1028877&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Fri Oct 29 18:46:38 2010
@@ -116,12 +116,10 @@
         <easymock.version>2.4</easymock.version>
         <equinox.version>3.6.0.v20100517</equinox.version>
         <felix.bundlerepository.version>1.6.4</felix.bundlerepository.version>
-        <felix.compendium.version>1.2.0</felix.compendium.version>
         <felix.configadmin.version>1.2.4</felix.configadmin.version>
         <felix.fileinstall.version>3.0.2</felix.fileinstall.version>
         <felix.framework.version>3.0.4</felix.framework.version>
         <felix.gogo.version>0.6.1</felix.gogo.version>
-        <felix.osgi.version>1.4.0</felix.osgi.version>
         <felix.plugin.version>2.1.0</felix.plugin.version>
         <felix.utils.version>1.0.0</felix.utils.version>
         <felix.webconsole.version>3.1.2</felix.webconsole.version>
@@ -436,26 +434,6 @@
                 </exclusions>
             </dependency>
             <dependency>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>org.osgi.compendium</artifactId>
-                <version>${felix.compendium.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.apache.felix</groupId>
-                        <artifactId>org.osgi.foundation</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.apache.felix</groupId>
-                        <artifactId>javax.servlet</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>org.osgi.core</artifactId>
-                <version>${felix.osgi.version}</version>
-            </dependency>
-            <dependency>
                 <groupId>org.osgi</groupId>
                 <artifactId>org.osgi.core</artifactId>
                 <version>4.2.0</version>

Modified: karaf/trunk/shell/config/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/config/pom.xml?rev=1028877&r1=1028876&r2=1028877&view=diff
==============================================================================
--- karaf/trunk/shell/config/pom.xml (original)
+++ karaf/trunk/shell/config/pom.xml Fri Oct 29 18:46:38 2010
@@ -49,13 +49,13 @@
             <artifactId>org.apache.karaf.util</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.felix</groupId>
+            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.felix</groupId>
+            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.compendium</artifactId>
             <scope>provided</scope>
         </dependency>

Modified: karaf/trunk/shell/console/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/pom.xml?rev=1028877&r1=1028876&r2=1028877&view=diff
==============================================================================
--- karaf/trunk/shell/console/pom.xml (original)
+++ karaf/trunk/shell/console/pom.xml Fri Oct 29 18:46:38 2010
@@ -56,12 +56,12 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.felix</groupId>
+            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.felix</groupId>
+            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.compendium</artifactId>
             <scope>provided</scope>
         </dependency>

Modified: karaf/trunk/shell/dev/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/dev/pom.xml?rev=1028877&r1=1028876&r2=1028877&view=diff
==============================================================================
--- karaf/trunk/shell/dev/pom.xml (original)
+++ karaf/trunk/shell/dev/pom.xml Fri Oct 29 18:46:38 2010
@@ -48,13 +48,13 @@
     </dependency>
 
     <dependency>
-        <groupId>org.apache.felix</groupId>
+        <groupId>org.osgi</groupId>
         <artifactId>org.osgi.core</artifactId>
         <scope>provided</scope>
     </dependency>
 
     <dependency>
-        <groupId>org.apache.felix</groupId>
+        <groupId>org.osgi</groupId>
         <artifactId>org.osgi.compendium</artifactId>
         <scope>provided</scope>
     </dependency>

Modified: karaf/trunk/shell/log/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/log/pom.xml?rev=1028877&r1=1028876&r2=1028877&view=diff
==============================================================================
--- karaf/trunk/shell/log/pom.xml (original)
+++ karaf/trunk/shell/log/pom.xml Fri Oct 29 18:46:38 2010
@@ -46,13 +46,13 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.felix</groupId>
+            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.felix</groupId>
+            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.compendium</artifactId>
             <scope>provided</scope>
         </dependency>

Modified: karaf/trunk/shell/obr/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/obr/pom.xml?rev=1028877&r1=1028876&r2=1028877&view=diff
==============================================================================
--- karaf/trunk/shell/obr/pom.xml (original)
+++ karaf/trunk/shell/obr/pom.xml Fri Oct 29 18:46:38 2010
@@ -56,7 +56,7 @@
             <version>2.5</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.felix</groupId>
+            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>

Modified: karaf/trunk/shell/osgi/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/osgi/pom.xml?rev=1028877&r1=1028876&r2=1028877&view=diff
==============================================================================
--- karaf/trunk/shell/osgi/pom.xml (original)
+++ karaf/trunk/shell/osgi/pom.xml Fri Oct 29 18:46:38 2010
@@ -46,7 +46,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.felix</groupId>
+            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>

Modified: karaf/trunk/shell/packages/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/packages/pom.xml?rev=1028877&r1=1028876&r2=1028877&view=diff
==============================================================================
--- karaf/trunk/shell/packages/pom.xml (original)
+++ karaf/trunk/shell/packages/pom.xml Fri Oct 29 18:46:38 2010
@@ -46,13 +46,13 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.felix</groupId>
+            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.felix</groupId>
+            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.compendium</artifactId>
             <scope>provided</scope>
         </dependency>

Modified: karaf/trunk/shell/ssh/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/ssh/pom.xml?rev=1028877&r1=1028876&r2=1028877&view=diff
==============================================================================
--- karaf/trunk/shell/ssh/pom.xml (original)
+++ karaf/trunk/shell/ssh/pom.xml Fri Oct 29 18:46:38 2010
@@ -46,13 +46,13 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.felix</groupId>
+            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.felix</groupId>
+            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.compendium</artifactId>
             <scope>provided</scope>
         </dependency>

Modified: karaf/trunk/shell/wrapper/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/wrapper/pom.xml?rev=1028877&r1=1028876&r2=1028877&view=diff
==============================================================================
--- karaf/trunk/shell/wrapper/pom.xml (original)
+++ karaf/trunk/shell/wrapper/pom.xml Fri Oct 29 18:46:38 2010
@@ -53,7 +53,7 @@
             <artifactId>wrapper</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.felix</groupId>
+            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>

Modified: karaf/trunk/webconsole/admin/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/admin/pom.xml?rev=1028877&r1=1028876&r2=1028877&view=diff
==============================================================================
--- karaf/trunk/webconsole/admin/pom.xml (original)
+++ karaf/trunk/webconsole/admin/pom.xml Fri Oct 29 18:46:38 2010
@@ -37,12 +37,12 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.felix</groupId>
+            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.felix</groupId>
+            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.compendium</artifactId>
             <scope>provided</scope>
         </dependency>

Modified: karaf/trunk/webconsole/features/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/features/pom.xml?rev=1028877&r1=1028876&r2=1028877&view=diff
==============================================================================
--- karaf/trunk/webconsole/features/pom.xml (original)
+++ karaf/trunk/webconsole/features/pom.xml Fri Oct 29 18:46:38 2010
@@ -37,12 +37,12 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.felix</groupId>
+        <groupId>org.osgi</groupId>
       <artifactId>org.osgi.core</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.felix</groupId>
+        <groupId>org.osgi</groupId>
       <artifactId>org.osgi.compendium</artifactId>
       <scope>provided</scope>
     </dependency>

Modified: karaf/trunk/webconsole/gogo/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/gogo/pom.xml?rev=1028877&r1=1028876&r2=1028877&view=diff
==============================================================================
--- karaf/trunk/webconsole/gogo/pom.xml (original)
+++ karaf/trunk/webconsole/gogo/pom.xml Fri Oct 29 18:46:38 2010
@@ -37,12 +37,12 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.felix</groupId>
+        <groupId>org.osgi</groupId>
       <artifactId>org.osgi.core</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.felix</groupId>
+        <groupId>org.osgi</groupId>
       <artifactId>org.osgi.compendium</artifactId>
       <scope>provided</scope>
     </dependency>