You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2012/10/16 15:45:34 UTC
svn commit: r1398791 - in /karaf/trunk: ./ assemblies/features/framework/
bundle/command/ bundle/core/ bundle/springstate/ config/command/
config/core/ demos/command/ demos/web/ deployer/blueprint/
deployer/features/ deployer/kar/ deployer/spring/ depl...
Author: jbonofre
Date: Tue Oct 16 13:45:32 2012
New Revision: 1398791
URL: http://svn.apache.org/viewvc?rev=1398791&view=rev
Log:
[KARAF-1903] Refactoring of osgicore and osgicompendium
Added:
karaf/trunk/osgi/
karaf/trunk/osgi/compendium/
karaf/trunk/osgi/compendium/pom.xml
- copied, changed from r1398671, karaf/trunk/main/pom.xml
karaf/trunk/osgi/core/
karaf/trunk/osgi/core/pom.xml
- copied, changed from r1398671, karaf/trunk/main/pom.xml
karaf/trunk/osgi/pom.xml
- copied, changed from r1398671, karaf/trunk/util/pom.xml
Removed:
karaf/trunk/osgicompendium/pom.xml
karaf/trunk/osgicore/pom.xml
Modified:
karaf/trunk/assemblies/features/framework/pom.xml
karaf/trunk/bundle/command/pom.xml
karaf/trunk/bundle/core/pom.xml
karaf/trunk/bundle/springstate/pom.xml
karaf/trunk/config/command/pom.xml
karaf/trunk/config/core/pom.xml
karaf/trunk/demos/command/pom.xml
karaf/trunk/demos/web/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/wrap/pom.xml
karaf/trunk/diagnostic/command/pom.xml
karaf/trunk/diagnostic/core/pom.xml
karaf/trunk/features/command/pom.xml
karaf/trunk/features/core/pom.xml
karaf/trunk/features/obr/pom.xml
karaf/trunk/http/command/pom.xml
karaf/trunk/http/core/pom.xml
karaf/trunk/instance/command/pom.xml
karaf/trunk/instance/core/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/kar/command/pom.xml
karaf/trunk/kar/core/pom.xml
karaf/trunk/log/command/pom.xml
karaf/trunk/log/core/pom.xml
karaf/trunk/main/pom.xml
karaf/trunk/management/server/pom.xml
karaf/trunk/obr/command/pom.xml
karaf/trunk/obr/core/pom.xml
karaf/trunk/package/command/pom.xml
karaf/trunk/package/core/pom.xml
karaf/trunk/pom.xml
karaf/trunk/region/command/pom.xml
karaf/trunk/region/core/pom.xml
karaf/trunk/region/persist/pom.xml
karaf/trunk/scheduler/core/pom.xml
karaf/trunk/scr/command/pom.xml
karaf/trunk/scr/examples/pom.xml
karaf/trunk/scr/management/pom.xml
karaf/trunk/service/command/pom.xml
karaf/trunk/service/core/pom.xml
karaf/trunk/shell/commands/pom.xml
karaf/trunk/shell/console/pom.xml
karaf/trunk/shell/help/pom.xml
karaf/trunk/shell/ssh/pom.xml
karaf/trunk/system/command/pom.xml
karaf/trunk/system/core/pom.xml
karaf/trunk/tooling/exam/container/pom.xml
karaf/trunk/tooling/exam/regression/pom.xml
karaf/trunk/tooling/karaf-maven-plugin/pom.xml
karaf/trunk/util/pom.xml
karaf/trunk/web/command/pom.xml
karaf/trunk/web/core/pom.xml
karaf/trunk/webconsole/console/pom.xml
karaf/trunk/webconsole/features/pom.xml
karaf/trunk/webconsole/gogo/pom.xml
karaf/trunk/webconsole/http/pom.xml
karaf/trunk/webconsole/instance/pom.xml
karaf/trunk/wrapper/core/pom.xml
Modified: karaf/trunk/assemblies/features/framework/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/pom.xml?rev=1398791&r1=1398790&r2=1398791&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/pom.xml (original)
+++ karaf/trunk/assemblies/features/framework/pom.xml Tue Oct 16 13:45:32 2012
@@ -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>
Modified: karaf/trunk/bundle/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/bundle/command/pom.xml?rev=1398791&r1=1398790&r2=1398791&view=diff
==============================================================================
--- karaf/trunk/bundle/command/pom.xml (original)
+++ karaf/trunk/bundle/command/pom.xml Tue Oct 16 13:45:32 2012
@@ -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>
Modified: karaf/trunk/bundle/core/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/bundle/core/pom.xml?rev=1398791&r1=1398790&r2=1398791&view=diff
==============================================================================
--- karaf/trunk/bundle/core/pom.xml (original)
+++ karaf/trunk/bundle/core/pom.xml Tue Oct 16 13:45:32 2012
@@ -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>
Modified: karaf/trunk/bundle/springstate/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/bundle/springstate/pom.xml?rev=1398791&r1=1398790&r2=1398791&view=diff
==============================================================================
--- karaf/trunk/bundle/springstate/pom.xml (original)
+++ karaf/trunk/bundle/springstate/pom.xml Tue Oct 16 13:45:32 2012
@@ -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>
Modified: karaf/trunk/config/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/config/command/pom.xml?rev=1398791&r1=1398790&r2=1398791&view=diff
==============================================================================
--- karaf/trunk/config/command/pom.xml (original)
+++ karaf/trunk/config/command/pom.xml Tue Oct 16 13:45:32 2012
@@ -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>
Modified: karaf/trunk/config/core/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/config/core/pom.xml?rev=1398791&r1=1398790&r2=1398791&view=diff
==============================================================================
--- karaf/trunk/config/core/pom.xml (original)
+++ karaf/trunk/config/core/pom.xml Tue Oct 16 13:45:32 2012
@@ -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>
Modified: karaf/trunk/demos/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/demos/command/pom.xml?rev=1398791&r1=1398790&r2=1398791&view=diff
==============================================================================
--- karaf/trunk/demos/command/pom.xml (original)
+++ karaf/trunk/demos/command/pom.xml Tue Oct 16 13:45:32 2012
@@ -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>
Modified: karaf/trunk/demos/web/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/demos/web/pom.xml?rev=1398791&r1=1398790&r2=1398791&view=diff
==============================================================================
--- karaf/trunk/demos/web/pom.xml (original)
+++ karaf/trunk/demos/web/pom.xml Tue Oct 16 13:45:32 2012
@@ -45,7 +45,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.karaf</groupId>
+ <groupId>org.apache.karaf.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</dependency>
<dependency>
Modified: karaf/trunk/deployer/blueprint/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/deployer/blueprint/pom.xml?rev=1398791&r1=1398790&r2=1398791&view=diff
==============================================================================
--- karaf/trunk/deployer/blueprint/pom.xml (original)
+++ karaf/trunk/deployer/blueprint/pom.xml Tue Oct 16 13:45:32 2012
@@ -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>
Modified: karaf/trunk/deployer/features/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/deployer/features/pom.xml?rev=1398791&r1=1398790&r2=1398791&view=diff
==============================================================================
--- karaf/trunk/deployer/features/pom.xml (original)
+++ karaf/trunk/deployer/features/pom.xml Tue Oct 16 13:45:32 2012
@@ -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>
Modified: karaf/trunk/deployer/kar/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/deployer/kar/pom.xml?rev=1398791&r1=1398790&r2=1398791&view=diff
==============================================================================
--- karaf/trunk/deployer/kar/pom.xml (original)
+++ karaf/trunk/deployer/kar/pom.xml Tue Oct 16 13:45:32 2012
@@ -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>
Modified: karaf/trunk/deployer/spring/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/deployer/spring/pom.xml?rev=1398791&r1=1398790&r2=1398791&view=diff
==============================================================================
--- karaf/trunk/deployer/spring/pom.xml (original)
+++ karaf/trunk/deployer/spring/pom.xml Tue Oct 16 13:45:32 2012
@@ -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>
Modified: karaf/trunk/deployer/wrap/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/deployer/wrap/pom.xml?rev=1398791&r1=1398790&r2=1398791&view=diff
==============================================================================
--- karaf/trunk/deployer/wrap/pom.xml (original)
+++ karaf/trunk/deployer/wrap/pom.xml Tue Oct 16 13:45:32 2012
@@ -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>
Modified: karaf/trunk/diagnostic/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/diagnostic/command/pom.xml?rev=1398791&r1=1398790&r2=1398791&view=diff
==============================================================================
--- karaf/trunk/diagnostic/command/pom.xml (original)
+++ karaf/trunk/diagnostic/command/pom.xml Tue Oct 16 13:45:32 2012
@@ -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>
Modified: karaf/trunk/diagnostic/core/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/diagnostic/core/pom.xml?rev=1398791&r1=1398790&r2=1398791&view=diff
==============================================================================
--- karaf/trunk/diagnostic/core/pom.xml (original)
+++ karaf/trunk/diagnostic/core/pom.xml Tue Oct 16 13:45:32 2012
@@ -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>
Modified: karaf/trunk/features/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/features/command/pom.xml?rev=1398791&r1=1398790&r2=1398791&view=diff
==============================================================================
--- karaf/trunk/features/command/pom.xml (original)
+++ karaf/trunk/features/command/pom.xml Tue Oct 16 13:45:32 2012
@@ -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>
Modified: karaf/trunk/features/core/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/features/core/pom.xml?rev=1398791&r1=1398790&r2=1398791&view=diff
==============================================================================
--- karaf/trunk/features/core/pom.xml (original)
+++ karaf/trunk/features/core/pom.xml Tue Oct 16 13:45:32 2012
@@ -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>
Modified: karaf/trunk/features/obr/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/features/obr/pom.xml?rev=1398791&r1=1398790&r2=1398791&view=diff
==============================================================================
--- karaf/trunk/features/obr/pom.xml (original)
+++ karaf/trunk/features/obr/pom.xml Tue Oct 16 13:45:32 2012
@@ -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>
Modified: karaf/trunk/http/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/http/command/pom.xml?rev=1398791&r1=1398790&r2=1398791&view=diff
==============================================================================
--- karaf/trunk/http/command/pom.xml (original)
+++ karaf/trunk/http/command/pom.xml Tue Oct 16 13:45:32 2012
@@ -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>
Modified: karaf/trunk/http/core/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/http/core/pom.xml?rev=1398791&r1=1398790&r2=1398791&view=diff
==============================================================================
--- karaf/trunk/http/core/pom.xml (original)
+++ karaf/trunk/http/core/pom.xml Tue Oct 16 13:45:32 2012
@@ -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>
Modified: karaf/trunk/instance/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/command/pom.xml?rev=1398791&r1=1398790&r2=1398791&view=diff
==============================================================================
--- karaf/trunk/instance/command/pom.xml (original)
+++ karaf/trunk/instance/command/pom.xml Tue Oct 16 13:45:32 2012
@@ -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>
Modified: karaf/trunk/instance/core/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/core/pom.xml?rev=1398791&r1=1398790&r2=1398791&view=diff
==============================================================================
--- karaf/trunk/instance/core/pom.xml (original)
+++ karaf/trunk/instance/core/pom.xml Tue Oct 16 13:45:32 2012
@@ -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>
Modified: karaf/trunk/jaas/boot/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/boot/pom.xml?rev=1398791&r1=1398790&r2=1398791&view=diff
==============================================================================
--- karaf/trunk/jaas/boot/pom.xml (original)
+++ karaf/trunk/jaas/boot/pom.xml Tue Oct 16 13:45:32 2012
@@ -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>
Modified: karaf/trunk/jaas/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/command/pom.xml?rev=1398791&r1=1398790&r2=1398791&view=diff
==============================================================================
--- karaf/trunk/jaas/command/pom.xml (original)
+++ karaf/trunk/jaas/command/pom.xml Tue Oct 16 13:45:32 2012
@@ -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>
Modified: karaf/trunk/jaas/config/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/config/pom.xml?rev=1398791&r1=1398790&r2=1398791&view=diff
==============================================================================
--- karaf/trunk/jaas/config/pom.xml (original)
+++ karaf/trunk/jaas/config/pom.xml Tue Oct 16 13:45:32 2012
@@ -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>
Modified: karaf/trunk/jaas/modules/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/modules/pom.xml?rev=1398791&r1=1398790&r2=1398791&view=diff
==============================================================================
--- karaf/trunk/jaas/modules/pom.xml (original)
+++ karaf/trunk/jaas/modules/pom.xml Tue Oct 16 13:45:32 2012
@@ -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>
Modified: karaf/trunk/kar/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/kar/command/pom.xml?rev=1398791&r1=1398790&r2=1398791&view=diff
==============================================================================
--- karaf/trunk/kar/command/pom.xml (original)
+++ karaf/trunk/kar/command/pom.xml Tue Oct 16 13:45:32 2012
@@ -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>
Modified: karaf/trunk/kar/core/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/kar/core/pom.xml?rev=1398791&r1=1398790&r2=1398791&view=diff
==============================================================================
--- karaf/trunk/kar/core/pom.xml (original)
+++ karaf/trunk/kar/core/pom.xml Tue Oct 16 13:45:32 2012
@@ -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>
Modified: karaf/trunk/log/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/log/command/pom.xml?rev=1398791&r1=1398790&r2=1398791&view=diff
==============================================================================
--- karaf/trunk/log/command/pom.xml (original)
+++ karaf/trunk/log/command/pom.xml Tue Oct 16 13:45:32 2012
@@ -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>
Modified: karaf/trunk/log/core/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/log/core/pom.xml?rev=1398791&r1=1398790&r2=1398791&view=diff
==============================================================================
--- karaf/trunk/log/core/pom.xml (original)
+++ karaf/trunk/log/core/pom.xml Tue Oct 16 13:45:32 2012
@@ -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>
Modified: karaf/trunk/main/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/main/pom.xml?rev=1398791&r1=1398790&r2=1398791&view=diff
==============================================================================
--- karaf/trunk/main/pom.xml (original)
+++ karaf/trunk/main/pom.xml Tue Oct 16 13:45:32 2012
@@ -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>
Modified: karaf/trunk/management/server/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/management/server/pom.xml?rev=1398791&r1=1398790&r2=1398791&view=diff
==============================================================================
--- karaf/trunk/management/server/pom.xml (original)
+++ karaf/trunk/management/server/pom.xml Tue Oct 16 13:45:32 2012
@@ -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>
Modified: karaf/trunk/obr/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/obr/command/pom.xml?rev=1398791&r1=1398790&r2=1398791&view=diff
==============================================================================
--- karaf/trunk/obr/command/pom.xml (original)
+++ karaf/trunk/obr/command/pom.xml Tue Oct 16 13:45:32 2012
@@ -56,7 +56,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>
Modified: karaf/trunk/obr/core/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/obr/core/pom.xml?rev=1398791&r1=1398790&r2=1398791&view=diff
==============================================================================
--- karaf/trunk/obr/core/pom.xml (original)
+++ karaf/trunk/obr/core/pom.xml Tue Oct 16 13:45:32 2012
@@ -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>
Copied: karaf/trunk/osgi/compendium/pom.xml (from r1398671, karaf/trunk/main/pom.xml)
URL: http://svn.apache.org/viewvc/karaf/trunk/osgi/compendium/pom.xml?p2=karaf/trunk/osgi/compendium/pom.xml&p1=karaf/trunk/main/pom.xml&r1=1398671&r2=1398791&rev=1398791&view=diff
==============================================================================
--- karaf/trunk/main/pom.xml (original)
+++ karaf/trunk/osgi/compendium/pom.xml Tue Oct 16 13:45:32 2012
@@ -10,7 +10,7 @@
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
@@ -22,87 +22,93 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.karaf</groupId>
- <artifactId>karaf</artifactId>
+ <groupId>org.apache.karaf.osgi</groupId>
+ <artifactId>osgi</artifactId>
<version>3.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>org.apache.karaf.main</artifactId>
+ <artifactId>org.osgi.compendium</artifactId>
<packaging>bundle</packaging>
- <name>Apache Karaf :: Main</name>
- <description>This bundle is the main Karaf launcher. It's responsible of the Karaf startup including
- the console, branding, etc bootstrap.</description>
+ <name>Apache Karaf :: OSGi :: Compendium (for Java 7)</name>
+ <description>
+ The original OSGi Compendium specification can not be used to compile other code with Java 7. So we recompile
+ the specification for Java 5+ so it can be used as a Maven dependency in projects that are compiled with Java 7.
+ </description>
<properties>
- <appendedResourcesDirectory>${basedir}/../etc/appended-resources</appendedResourcesDirectory>
+ <appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
</properties>
<dependencies>
<dependency>
- <groupId>org.apache.karaf</groupId>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <classifier>sources</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
- </dependency>
-
+ </dependency>
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.junit</artifactId>
- <scope>test</scope>
+ <groupId>${servlet.spec.groupId}</groupId>
+ <artifactId>${servlet.spec.artifactId}</artifactId>
+ <scope>provided</scope>
+ <optional>true</optional>
</dependency>
<dependency>
- <groupId>org.ops4j.pax.tinybundles</groupId>
- <artifactId>tinybundles</artifactId>
- <scope>test</scope>
+ <groupId>javax.persistence</groupId>
+ <artifactId>persistence-api</artifactId>
+ <version>1.0.2</version>
+ <scope>provided</scope>
+ <optional>true</optional>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
- <scope>test</scope>
+ <groupId>org.microemu</groupId>
+ <artifactId>microemu-cldc</artifactId>
+ <version>2.0.4</version>
+ <optional>true</optional>
</dependency>
</dependencies>
<build>
- <resources>
- <resource>
- <directory>${project.basedir}/src/main/resources</directory>
- <filtering>true</filtering>
- <includes>
- <include>**/*</include>
- </includes>
- </resource>
- </resources>
+ <sourceDirectory>${project.build.directory}/generated-sources/src/main/java</sourceDirectory>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
- </manifest>
- </archive>
- </configuration>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack-sources</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <classifier>sources</classifier>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/generated-sources/src/main/java</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <_donotcopy>(CVS|.svn|config.properties)</_donotcopy>
- <Main-Class>org.apache.karaf.main.Main</Main-Class>
- <Bundle-Name>Apache Karaf</Bundle-Name>
- <Bundle-Description>OSGi R4 framework.</Bundle-Description>
- <Export-Package>
- org.apache.karaf.info
- </Export-Package>
- <Private-Package>
- org.apache.karaf.main*
- </Private-Package>
+ <Export-Package>org.osgi.*;-split-package:=merge-first</Export-Package>
</instructions>
- <unpackBundle>true</unpackBundle>
</configuration>
</plugin>
</plugins>
@@ -152,4 +158,4 @@
</profile>
</profiles>
-</project>
+</project>
\ No newline at end of file
Copied: karaf/trunk/osgi/core/pom.xml (from r1398671, karaf/trunk/main/pom.xml)
URL: http://svn.apache.org/viewvc/karaf/trunk/osgi/core/pom.xml?p2=karaf/trunk/osgi/core/pom.xml&p1=karaf/trunk/main/pom.xml&r1=1398671&r2=1398791&rev=1398791&view=diff
==============================================================================
--- karaf/trunk/main/pom.xml (original)
+++ karaf/trunk/osgi/core/pom.xml Tue Oct 16 13:45:32 2012
@@ -10,7 +10,7 @@
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
@@ -22,87 +22,70 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.karaf</groupId>
- <artifactId>karaf</artifactId>
+ <groupId>org.apache.karaf.osgi</groupId>
+ <artifactId>osgi</artifactId>
<version>3.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>org.apache.karaf.main</artifactId>
+ <artifactId>org.osgi.core</artifactId>
<packaging>bundle</packaging>
- <name>Apache Karaf :: Main</name>
- <description>This bundle is the main Karaf launcher. It's responsible of the Karaf startup including
- the console, branding, etc bootstrap.</description>
+ <name>Apache Karaf :: OSGi :: Core (for Java 7)</name>
+ <description>
+ The original OSGi core specification can not be used to compile other code with Java 7. So we recompile the
+ specification for Java 5+ so it can be used as a maven dependency in projects that are compiled with Java 7.
+ </description>
<properties>
- <appendedResourcesDirectory>${basedir}/../etc/appended-resources</appendedResourcesDirectory>
+ <appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
</properties>
<dependencies>
<dependency>
- <groupId>org.apache.karaf</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.junit</artifactId>
- <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.ops4j.pax.tinybundles</groupId>
- <artifactId>tinybundles</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
- <scope>test</scope>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <classifier>sources</classifier>
</dependency>
</dependencies>
<build>
- <resources>
- <resource>
- <directory>${project.basedir}/src/main/resources</directory>
- <filtering>true</filtering>
- <includes>
- <include>**/*</include>
- </includes>
- </resource>
- </resources>
+ <sourceDirectory>${project.build.directory}/generated-sources/src/main/java
+ </sourceDirectory>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
- </manifest>
- </archive>
- </configuration>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack-sources</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <classifier>sources</classifier>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/generated-sources/src/main/java</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <_donotcopy>(CVS|.svn|config.properties)</_donotcopy>
- <Main-Class>org.apache.karaf.main.Main</Main-Class>
- <Bundle-Name>Apache Karaf</Bundle-Name>
- <Bundle-Description>OSGi R4 framework.</Bundle-Description>
- <Export-Package>
- org.apache.karaf.info
- </Export-Package>
- <Private-Package>
- org.apache.karaf.main*
- </Private-Package>
+ <Export-Package>org.osgi.*;-split-package:=merge-first</Export-Package>
</instructions>
- <unpackBundle>true</unpackBundle>
</configuration>
</plugin>
</plugins>
@@ -152,4 +135,4 @@
</profile>
</profiles>
-</project>
+</project>
\ No newline at end of file
Copied: karaf/trunk/osgi/pom.xml (from r1398671, karaf/trunk/util/pom.xml)
URL: http://svn.apache.org/viewvc/karaf/trunk/osgi/pom.xml?p2=karaf/trunk/osgi/pom.xml&p1=karaf/trunk/util/pom.xml&r1=1398671&r2=1398791&rev=1398791&view=diff
==============================================================================
--- karaf/trunk/util/pom.xml (original)
+++ karaf/trunk/osgi/pom.xml Tue Oct 16 13:45:32 2012
@@ -10,7 +10,7 @@
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
@@ -18,36 +18,24 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
+
<modelVersion>4.0.0</modelVersion>
-
+
<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>karaf</artifactId>
<version>3.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
-
- <artifactId>org.apache.karaf.util</artifactId>
- <packaging>jar</packaging>
- <name>Apache Karaf :: Util</name>
- <description>Karaf Util contains utility classes used in different Karaf modules.</description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.karaf</groupId>
- <artifactId>org.osgi.core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <properties>
- <appendedResourcesDirectory>${basedir}/../etc/appended-resources</appendedResourcesDirectory>
- </properties>
-</project>
+ <groupId>org.apache.karaf.osgi</groupId>
+ <artifactId>osgi</artifactId>
+ <packaging>pom</packaging>
+ <name>Apache Karaf :: OSGi</name>
+
+ <modules>
+ <module>core</module>
+ <module>compendium</module>
+ </modules>
+
+</project>
\ No newline at end of file
Modified: karaf/trunk/package/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/package/command/pom.xml?rev=1398791&r1=1398790&r2=1398791&view=diff
==============================================================================
--- karaf/trunk/package/command/pom.xml (original)
+++ karaf/trunk/package/command/pom.xml Tue Oct 16 13:45:32 2012
@@ -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>
Modified: karaf/trunk/package/core/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/package/core/pom.xml?rev=1398791&r1=1398790&r2=1398791&view=diff
==============================================================================
--- karaf/trunk/package/core/pom.xml (original)
+++ karaf/trunk/package/core/pom.xml Tue Oct 16 13:45:32 2012
@@ -46,7 +46,7 @@
</dependency>
<dependency>
- <groupId>org.apache.karaf</groupId>
+ <groupId>org.apache.karaf.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
Modified: karaf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1398791&r1=1398790&r2=1398791&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Tue Oct 16 13:45:32 2012
@@ -35,8 +35,7 @@
<inceptionYear>2007</inceptionYear>
<modules>
- <module>osgicore</module>
- <module>osgicompendium</module>
+ <module>osgi</module>
<module>util</module>
<module>main</module>
<module>features</module>
@@ -321,14 +320,16 @@
<dependencyManagement>
<dependencies>
+ <!-- It will be removed with new OSGi spec artifacts -->
<dependency>
- <groupId>org.apache.karaf</groupId>
+ <groupId>org.apache.karaf.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>${project.version}</version>
</dependency>
+ <!-- It will be removed with new OSGi spec artifacts -->
<dependency>
- <groupId>org.apache.karaf</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <groupId>org.apache.karaf.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -338,6 +339,12 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>${osgi.version}</version>
+ <classifier>sources</classifier>
+ </dependency>
+ <dependency>
<groupId>org.apache.karaf</groupId>
<artifactId>manual</artifactId>
<type>pdf</type>
@@ -796,6 +803,12 @@
<version>${osgi.compendium.version}</version>
</dependency>
<dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>${osgi.compendium.version}</version>
+ <classifier>sources</classifier>
+ </dependency>
+ <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.configadmin</artifactId>
<version>${felix.configadmin.version}</version>
Modified: karaf/trunk/region/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/region/command/pom.xml?rev=1398791&r1=1398790&r2=1398791&view=diff
==============================================================================
--- karaf/trunk/region/command/pom.xml (original)
+++ karaf/trunk/region/command/pom.xml Tue Oct 16 13:45:32 2012
@@ -38,7 +38,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.karaf</groupId>
+ <groupId>org.apache.karaf.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
Modified: karaf/trunk/region/core/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/region/core/pom.xml?rev=1398791&r1=1398790&r2=1398791&view=diff
==============================================================================
--- karaf/trunk/region/core/pom.xml (original)
+++ karaf/trunk/region/core/pom.xml Tue Oct 16 13:45:32 2012
@@ -60,7 +60,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.karaf</groupId>
+ <groupId>org.apache.karaf.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
Modified: karaf/trunk/region/persist/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/region/persist/pom.xml?rev=1398791&r1=1398790&r2=1398791&view=diff
==============================================================================
--- karaf/trunk/region/persist/pom.xml (original)
+++ karaf/trunk/region/persist/pom.xml Tue Oct 16 13:45:32 2012
@@ -44,7 +44,7 @@
</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>
Modified: karaf/trunk/scheduler/core/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/scheduler/core/pom.xml?rev=1398791&r1=1398790&r2=1398791&view=diff
==============================================================================
--- karaf/trunk/scheduler/core/pom.xml (original)
+++ karaf/trunk/scheduler/core/pom.xml Tue Oct 16 13:45:32 2012
@@ -68,7 +68,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.karaf</groupId>
+ <groupId>org.apache.karaf.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
Modified: karaf/trunk/scr/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/scr/command/pom.xml?rev=1398791&r1=1398790&r2=1398791&view=diff
==============================================================================
--- karaf/trunk/scr/command/pom.xml (original)
+++ karaf/trunk/scr/command/pom.xml Tue Oct 16 13:45:32 2012
@@ -56,7 +56,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>
Modified: karaf/trunk/scr/examples/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/scr/examples/pom.xml?rev=1398791&r1=1398790&r2=1398791&view=diff
==============================================================================
--- karaf/trunk/scr/examples/pom.xml (original)
+++ karaf/trunk/scr/examples/pom.xml Tue Oct 16 13:45:32 2012
@@ -47,11 +47,11 @@
<artifactId>bndlib</artifactId>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
+ <groupId>org.apache.karaf.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.karaf</groupId>
+ <groupId>org.apache.karaf.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</dependency>
</dependencies>
Modified: karaf/trunk/scr/management/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/scr/management/pom.xml?rev=1398791&r1=1398790&r2=1398791&view=diff
==============================================================================
--- karaf/trunk/scr/management/pom.xml (original)
+++ karaf/trunk/scr/management/pom.xml Tue Oct 16 13:45:32 2012
@@ -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>
Modified: karaf/trunk/service/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/service/command/pom.xml?rev=1398791&r1=1398790&r2=1398791&view=diff
==============================================================================
--- karaf/trunk/service/command/pom.xml (original)
+++ karaf/trunk/service/command/pom.xml Tue Oct 16 13:45:32 2012
@@ -56,12 +56,12 @@
<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>
<dependency>
- <groupId>org.osgi</groupId>
+ <groupId>org.apache.karaf.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
</dependency>
Modified: karaf/trunk/service/core/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/service/core/pom.xml?rev=1398791&r1=1398790&r2=1398791&view=diff
==============================================================================
--- karaf/trunk/service/core/pom.xml (original)
+++ karaf/trunk/service/core/pom.xml Tue Oct 16 13:45:32 2012
@@ -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>
Modified: karaf/trunk/shell/commands/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/commands/pom.xml?rev=1398791&r1=1398790&r2=1398791&view=diff
==============================================================================
--- karaf/trunk/shell/commands/pom.xml (original)
+++ karaf/trunk/shell/commands/pom.xml Tue Oct 16 13:45:32 2012
@@ -59,12 +59,12 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
+ <groupId>org.apache.karaf.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<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>
Modified: karaf/trunk/shell/console/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/pom.xml?rev=1398791&r1=1398790&r2=1398791&view=diff
==============================================================================
--- karaf/trunk/shell/console/pom.xml (original)
+++ karaf/trunk/shell/console/pom.xml Tue Oct 16 13:45:32 2012
@@ -48,12 +48,12 @@
<artifactId>jline</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>
Modified: karaf/trunk/shell/help/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/help/pom.xml?rev=1398791&r1=1398790&r2=1398791&view=diff
==============================================================================
--- karaf/trunk/shell/help/pom.xml (original)
+++ karaf/trunk/shell/help/pom.xml Tue Oct 16 13:45:32 2012
@@ -62,12 +62,12 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
+ <groupId>org.apache.karaf.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<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>
Modified: karaf/trunk/shell/ssh/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/ssh/pom.xml?rev=1398791&r1=1398790&r2=1398791&view=diff
==============================================================================
--- karaf/trunk/shell/ssh/pom.xml (original)
+++ karaf/trunk/shell/ssh/pom.xml Tue Oct 16 13:45:32 2012
@@ -50,13 +50,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>
Modified: karaf/trunk/system/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/system/command/pom.xml?rev=1398791&r1=1398790&r2=1398791&view=diff
==============================================================================
--- karaf/trunk/system/command/pom.xml (original)
+++ karaf/trunk/system/command/pom.xml Tue Oct 16 13:45:32 2012
@@ -56,7 +56,7 @@
</dependency>
<dependency>
- <groupId>org.apache.karaf</groupId>
+ <groupId>org.apache.karaf.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
Modified: karaf/trunk/system/core/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/system/core/pom.xml?rev=1398791&r1=1398790&r2=1398791&view=diff
==============================================================================
--- karaf/trunk/system/core/pom.xml (original)
+++ karaf/trunk/system/core/pom.xml Tue Oct 16 13:45:32 2012
@@ -41,7 +41,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.karaf</groupId>
+ <groupId>org.apache.karaf.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
Modified: karaf/trunk/tooling/exam/container/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/exam/container/pom.xml?rev=1398791&r1=1398790&r2=1398791&view=diff
==============================================================================
--- karaf/trunk/tooling/exam/container/pom.xml (original)
+++ karaf/trunk/tooling/exam/container/pom.xml Tue Oct 16 13:45:32 2012
@@ -37,11 +37,11 @@
<dependencies>
<dependency>
- <groupId>org.apache.karaf</groupId>
+ <groupId>org.apache.karaf.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.karaf</groupId>
+ <groupId>org.apache.karaf.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
</dependency>
Modified: karaf/trunk/tooling/exam/regression/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/exam/regression/pom.xml?rev=1398791&r1=1398790&r2=1398791&view=diff
==============================================================================
--- karaf/trunk/tooling/exam/regression/pom.xml (original)
+++ karaf/trunk/tooling/exam/regression/pom.xml Tue Oct 16 13:45:32 2012
@@ -90,13 +90,13 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.karaf</groupId>
+ <groupId>org.apache.karaf.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<scope>test</scope>
<optional>true</optional>
</dependency>
<dependency>
- <groupId>org.apache.karaf</groupId>
+ <groupId>org.apache.karaf.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>${project.version}</version>
<scope>test</scope>
Modified: karaf/trunk/tooling/karaf-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/karaf-maven-plugin/pom.xml?rev=1398791&r1=1398790&r2=1398791&view=diff
==============================================================================
--- karaf/trunk/tooling/karaf-maven-plugin/pom.xml (original)
+++ karaf/trunk/tooling/karaf-maven-plugin/pom.xml Tue Oct 16 13:45:32 2012
@@ -146,7 +146,7 @@
<artifactId>org.apache.karaf.shell.console</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.karaf</groupId>
+ <groupId>org.apache.karaf.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</dependency>
<dependency>
Modified: karaf/trunk/util/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/util/pom.xml?rev=1398791&r1=1398790&r2=1398791&view=diff
==============================================================================
--- karaf/trunk/util/pom.xml (original)
+++ karaf/trunk/util/pom.xml Tue Oct 16 13:45:32 2012
@@ -35,7 +35,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.karaf</groupId>
+ <groupId>org.apache.karaf.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
Modified: karaf/trunk/web/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/web/command/pom.xml?rev=1398791&r1=1398790&r2=1398791&view=diff
==============================================================================
--- karaf/trunk/web/command/pom.xml (original)
+++ karaf/trunk/web/command/pom.xml Tue Oct 16 13:45:32 2012
@@ -58,12 +58,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>
Modified: karaf/trunk/web/core/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/web/core/pom.xml?rev=1398791&r1=1398790&r2=1398791&view=diff
==============================================================================
--- karaf/trunk/web/core/pom.xml (original)
+++ karaf/trunk/web/core/pom.xml Tue Oct 16 13:45:32 2012
@@ -41,7 +41,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.karaf</groupId>
+ <groupId>org.apache.karaf.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
Modified: karaf/trunk/webconsole/console/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/console/pom.xml?rev=1398791&r1=1398790&r2=1398791&view=diff
==============================================================================
--- karaf/trunk/webconsole/console/pom.xml (original)
+++ karaf/trunk/webconsole/console/pom.xml Tue Oct 16 13:45:32 2012
@@ -43,11 +43,11 @@
<artifactId>${servlet.spec.artifactId}</artifactId>
</dependency>
<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>
</dependency>
<dependency>
Modified: karaf/trunk/webconsole/features/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/features/pom.xml?rev=1398791&r1=1398790&r2=1398791&view=diff
==============================================================================
--- karaf/trunk/webconsole/features/pom.xml (original)
+++ karaf/trunk/webconsole/features/pom.xml Tue Oct 16 13:45:32 2012
@@ -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>
Modified: karaf/trunk/webconsole/gogo/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/gogo/pom.xml?rev=1398791&r1=1398790&r2=1398791&view=diff
==============================================================================
--- karaf/trunk/webconsole/gogo/pom.xml (original)
+++ karaf/trunk/webconsole/gogo/pom.xml Tue Oct 16 13:45:32 2012
@@ -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>
Modified: karaf/trunk/webconsole/http/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/http/pom.xml?rev=1398791&r1=1398790&r2=1398791&view=diff
==============================================================================
--- karaf/trunk/webconsole/http/pom.xml (original)
+++ karaf/trunk/webconsole/http/pom.xml Tue Oct 16 13:45:32 2012
@@ -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>
Modified: karaf/trunk/webconsole/instance/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/instance/pom.xml?rev=1398791&r1=1398790&r2=1398791&view=diff
==============================================================================
--- karaf/trunk/webconsole/instance/pom.xml (original)
+++ karaf/trunk/webconsole/instance/pom.xml Tue Oct 16 13:45:32 2012
@@ -44,12 +44,12 @@
<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>
<dependency>
- <groupId>org.osgi</groupId>
+ <groupId>org.apache.karaf.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
</dependency>
Modified: karaf/trunk/wrapper/core/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/wrapper/core/pom.xml?rev=1398791&r1=1398790&r2=1398791&view=diff
==============================================================================
--- karaf/trunk/wrapper/core/pom.xml (original)
+++ karaf/trunk/wrapper/core/pom.xml Tue Oct 16 13:45:32 2012
@@ -42,7 +42,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.karaf</groupId>
+ <groupId>org.apache.karaf.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</dependency>
<dependency>