[KARAF-1903] Refactoring of osgicore and osgicompendium

git-svn-id: https://svn.apache.org/repos/asf/karaf/trunk@1398791 13f79535-47bb-0310-9956-ffa450edef68
arashi01 · Oct 16, 2012 · eded3fb · eded3fb
1 parent ef1f986
commit eded3fb
Show file tree

Hide file tree

Showing 69 changed files with 449 additions and 371 deletions.
diff --git a/assemblies/features/framework/pom.xml b/assemblies/features/framework/pom.xml
@@ -289,7 +289,7 @@
                                     <destFileName>karaf.jar</destFileName>
                                 </artifactItem>
                                 <artifactItem>
-                                    <groupId>org.apache.karaf</groupId>
+                                    <groupId>org.apache.karaf.osgi</groupId>
                                     <artifactId>org.osgi.core</artifactId>
                                     <outputDirectory>target/classes/resources/lib</outputDirectory>
                                     <destFileName>karaf-org.osgi.core.jar</destFileName>

diff --git a/bundle/command/pom.xml b/bundle/command/pom.xml
@@ -58,7 +58,7 @@
         </dependency>
 
 		<dependency>
-            <groupId>org.apache.karaf</groupId>
+            <groupId>org.apache.karaf.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>

diff --git a/bundle/core/pom.xml b/bundle/core/pom.xml
@@ -46,12 +46,12 @@
         </dependency>
 
 		<dependency>
-            <groupId>org.apache.karaf</groupId>
+            <groupId>org.apache.karaf.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.osgi</groupId>
+            <groupId>org.apache.karaf.osgi</groupId>
             <artifactId>org.osgi.compendium</artifactId>
             <scope>provided</scope>
         </dependency>
@@ -60,13 +60,6 @@
             <artifactId>pax-url-aether</artifactId>
             <scope>provided</scope>
         </dependency>
-<!--
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
-            <scope>provided</scope>
-        </dependency>
-		-->
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>

diff --git a/bundle/springstate/pom.xml b/bundle/springstate/pom.xml
@@ -47,7 +47,7 @@
         </dependency>
 
 		<dependency>
-            <groupId>org.apache.karaf</groupId>
+            <groupId>org.apache.karaf.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>

diff --git a/config/command/pom.xml b/config/command/pom.xml
@@ -54,13 +54,13 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.karaf</groupId>
+            <groupId>org.apache.karaf.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.osgi</groupId>
+            <groupId>org.apache.karaf.osgi</groupId>
             <artifactId>org.osgi.compendium</artifactId>
             <scope>provided</scope>
         </dependency>

diff --git a/config/core/pom.xml b/config/core/pom.xml
@@ -39,12 +39,12 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.karaf</groupId>
+            <groupId>org.apache.karaf.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.osgi</groupId>
+            <groupId>org.apache.karaf.osgi</groupId>
             <artifactId>org.osgi.compendium</artifactId>
             <scope>provided</scope>
         </dependency>

diff --git a/demos/command/pom.xml b/demos/command/pom.xml
@@ -35,7 +35,7 @@
     <dependencies>
 
         <dependency>
-            <groupId>org.osgi</groupId>
+            <groupId>org.apache.karaf.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>

diff --git a/demos/web/pom.xml b/demos/web/pom.xml
@@ -45,7 +45,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.karaf</groupId>
+            <groupId>org.apache.karaf.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
         </dependency>
         <dependency>

diff --git a/deployer/blueprint/pom.xml b/deployer/blueprint/pom.xml
@@ -55,7 +55,7 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.karaf</groupId>
+            <groupId>org.apache.karaf.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>

diff --git a/deployer/features/pom.xml b/deployer/features/pom.xml
@@ -49,7 +49,7 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.karaf</groupId>
+            <groupId>org.apache.karaf.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>

diff --git a/deployer/kar/pom.xml b/deployer/kar/pom.xml
@@ -49,7 +49,7 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.karaf</groupId>
+            <groupId>org.apache.karaf.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>

diff --git a/deployer/spring/pom.xml b/deployer/spring/pom.xml
@@ -54,7 +54,7 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.karaf</groupId>
+            <groupId>org.apache.karaf.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>

diff --git a/deployer/wrap/pom.xml b/deployer/wrap/pom.xml
@@ -44,7 +44,7 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.karaf</groupId>
+            <groupId>org.apache.karaf.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>

diff --git a/diagnostic/command/pom.xml b/diagnostic/command/pom.xml
@@ -39,7 +39,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.karaf</groupId>
+            <groupId>org.apache.karaf.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>
@@ -51,7 +51,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.osgi</groupId>
+            <groupId>org.apache.karaf.osgi</groupId>
             <artifactId>org.osgi.compendium</artifactId>
             <scope>provided</scope>
         </dependency>

diff --git a/diagnostic/core/pom.xml b/diagnostic/core/pom.xml
@@ -39,13 +39,13 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.karaf</groupId>
+            <groupId>org.apache.karaf.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.osgi</groupId>
+            <groupId>org.apache.karaf.osgi</groupId>
             <artifactId>org.osgi.compendium</artifactId>
             <scope>provided</scope>
         </dependency>

diff --git a/features/command/pom.xml b/features/command/pom.xml
@@ -39,12 +39,12 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.karaf</groupId>
+            <groupId>org.apache.karaf.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.osgi</groupId>
+            <groupId>org.apache.karaf.osgi</groupId>
             <artifactId>org.osgi.compendium</artifactId>
             <scope>provided</scope>
         </dependency>

diff --git a/features/core/pom.xml b/features/core/pom.xml
@@ -39,7 +39,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.karaf</groupId>
+            <groupId>org.apache.karaf.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>
@@ -49,7 +49,7 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.karaf</groupId>
+            <groupId>org.apache.karaf.osgi</groupId>
             <artifactId>org.osgi.compendium</artifactId>
             <scope>provided</scope>
             <optional>true</optional>

diff --git a/features/obr/pom.xml b/features/obr/pom.xml
@@ -39,7 +39,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.karaf</groupId>
+            <groupId>org.apache.karaf.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>

diff --git a/http/command/pom.xml b/http/command/pom.xml
@@ -58,7 +58,7 @@
         </dependency>
 
 		<dependency>
-            <groupId>org.apache.karaf</groupId>
+            <groupId>org.apache.karaf.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
 			<scope>provided</scope>
 		</dependency>

diff --git a/http/core/pom.xml b/http/core/pom.xml
@@ -39,7 +39,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.karaf</groupId>
+            <groupId>org.apache.karaf.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>

diff --git a/instance/command/pom.xml b/instance/command/pom.xml
@@ -44,7 +44,7 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.karaf</groupId>
+            <groupId>org.apache.karaf.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>
@@ -56,7 +56,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.osgi</groupId>
+            <groupId>org.apache.karaf.osgi</groupId>
             <artifactId>org.osgi.compendium</artifactId>
             <scope>provided</scope>
         </dependency>

diff --git a/instance/core/pom.xml b/instance/core/pom.xml
@@ -40,7 +40,7 @@
     <dependencies>
 
         <dependency>
-            <groupId>org.apache.karaf</groupId>
+            <groupId>org.apache.karaf.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>

diff --git a/jaas/boot/pom.xml b/jaas/boot/pom.xml
@@ -39,7 +39,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.karaf</groupId>
+            <groupId>org.apache.karaf.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>

diff --git a/jaas/command/pom.xml b/jaas/command/pom.xml
@@ -39,7 +39,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.karaf</groupId>
+            <groupId>org.apache.karaf.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>

diff --git a/jaas/config/pom.xml b/jaas/config/pom.xml
@@ -54,7 +54,7 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.karaf</groupId>
+            <groupId>org.apache.karaf.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>

diff --git a/jaas/modules/pom.xml b/jaas/modules/pom.xml
@@ -61,13 +61,13 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.karaf</groupId>
+            <groupId>org.apache.karaf.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.osgi</groupId>
+            <groupId>org.apache.karaf.osgi</groupId>
             <artifactId>org.osgi.compendium</artifactId>
             <scope>provided</scope>
         </dependency>

diff --git a/kar/command/pom.xml b/kar/command/pom.xml
@@ -57,7 +57,7 @@
             <artifactId>org.apache.karaf.shell.table</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.karaf</groupId>
+            <groupId>org.apache.karaf.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
         </dependency>
     </dependencies>

diff --git a/kar/core/pom.xml b/kar/core/pom.xml
@@ -43,12 +43,12 @@
             <artifactId>org.apache.felix.utils</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.karaf</groupId>
+            <groupId>org.apache.karaf.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.osgi</groupId>
+            <groupId>org.apache.karaf.osgi</groupId>
             <artifactId>org.osgi.compendium</artifactId>
             <scope>provided</scope>
         </dependency>

diff --git a/log/command/pom.xml b/log/command/pom.xml
@@ -54,13 +54,13 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.karaf</groupId>
+            <groupId>org.apache.karaf.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.osgi</groupId>
+            <groupId>org.apache.karaf.osgi</groupId>
             <artifactId>org.osgi.compendium</artifactId>
             <scope>provided</scope>
         </dependency>

diff --git a/log/core/pom.xml b/log/core/pom.xml
@@ -39,12 +39,12 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.karaf</groupId>
+            <groupId>org.apache.karaf.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.osgi</groupId>
+            <groupId>org.apache.karaf.osgi</groupId>
             <artifactId>org.osgi.compendium</artifactId>
             <scope>provided</scope>
         </dependency>

diff --git a/main/pom.xml b/main/pom.xml
@@ -40,7 +40,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.karaf</groupId>
+            <groupId>org.apache.karaf.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>    

diff --git a/management/server/pom.xml b/management/server/pom.xml
@@ -40,12 +40,12 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.karaf</groupId>
+            <groupId>org.apache.karaf.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.osgi</groupId>
+            <groupId>org.apache.karaf.osgi</groupId>
             <artifactId>org.osgi.compendium</artifactId>
             <scope>provided</scope>
         </dependency>