You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by cs...@apache.org on 2012/11/20 15:48:14 UTC
svn commit: r1411688 - 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/ deploye...
Author: cschneider
Date: Tue Nov 20 14:48:02 2012
New Revision: 1411688
URL: http://svn.apache.org/viewvc?rev=1411688&view=rev
Log:
KARAF-1977 Upgrade trunk to osgi 4.3.1 to fix jdk 7 issues
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/region/command/pom.xml
karaf/trunk/region/core/pom.xml
karaf/trunk/region/persist/pom.xml
karaf/trunk/region/persist/src/main/resources/org/apache/karaf/region/persist/region.xsd
karaf/trunk/scheduler/core/pom.xml
karaf/trunk/scr/examples/pom.xml
karaf/trunk/scr/management/pom.xml
karaf/trunk/scr/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/karaf-maven-plugin/NOTICE
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=1411688&r1=1411687&r2=1411688&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/pom.xml (original)
+++ karaf/trunk/assemblies/features/framework/pom.xml Tue Nov 20 14:48:02 2012
@@ -289,7 +289,7 @@
<destFileName>karaf.jar</destFileName>
</artifactItem>
<artifactItem>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.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=1411688&r1=1411687&r2=1411688&view=diff
==============================================================================
--- karaf/trunk/bundle/command/pom.xml (original)
+++ karaf/trunk/bundle/command/pom.xml Tue Nov 20 14:48:02 2012
@@ -58,7 +58,7 @@
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.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=1411688&r1=1411687&r2=1411688&view=diff
==============================================================================
--- karaf/trunk/bundle/core/pom.xml (original)
+++ karaf/trunk/bundle/core/pom.xml Tue Nov 20 14:48:02 2012
@@ -46,12 +46,12 @@
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
</dependency>
Modified: karaf/trunk/bundle/springstate/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/bundle/springstate/pom.xml?rev=1411688&r1=1411687&r2=1411688&view=diff
==============================================================================
--- karaf/trunk/bundle/springstate/pom.xml (original)
+++ karaf/trunk/bundle/springstate/pom.xml Tue Nov 20 14:48:02 2012
@@ -47,7 +47,7 @@
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.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=1411688&r1=1411687&r2=1411688&view=diff
==============================================================================
--- karaf/trunk/config/command/pom.xml (original)
+++ karaf/trunk/config/command/pom.xml Tue Nov 20 14:48:02 2012
@@ -54,13 +54,13 @@
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.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=1411688&r1=1411687&r2=1411688&view=diff
==============================================================================
--- karaf/trunk/config/core/pom.xml (original)
+++ karaf/trunk/config/core/pom.xml Tue Nov 20 14:48:02 2012
@@ -39,12 +39,12 @@
<dependencies>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.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=1411688&r1=1411687&r2=1411688&view=diff
==============================================================================
--- karaf/trunk/demos/command/pom.xml (original)
+++ karaf/trunk/demos/command/pom.xml Tue Nov 20 14:48:02 2012
@@ -35,7 +35,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.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=1411688&r1=1411687&r2=1411688&view=diff
==============================================================================
--- karaf/trunk/demos/web/pom.xml (original)
+++ karaf/trunk/demos/web/pom.xml Tue Nov 20 14:48:02 2012
@@ -45,7 +45,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.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=1411688&r1=1411687&r2=1411688&view=diff
==============================================================================
--- karaf/trunk/deployer/blueprint/pom.xml (original)
+++ karaf/trunk/deployer/blueprint/pom.xml Tue Nov 20 14:48:02 2012
@@ -55,7 +55,7 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</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=1411688&r1=1411687&r2=1411688&view=diff
==============================================================================
--- karaf/trunk/deployer/features/pom.xml (original)
+++ karaf/trunk/deployer/features/pom.xml Tue Nov 20 14:48:02 2012
@@ -49,7 +49,7 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</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=1411688&r1=1411687&r2=1411688&view=diff
==============================================================================
--- karaf/trunk/deployer/kar/pom.xml (original)
+++ karaf/trunk/deployer/kar/pom.xml Tue Nov 20 14:48:02 2012
@@ -49,7 +49,7 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</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=1411688&r1=1411687&r2=1411688&view=diff
==============================================================================
--- karaf/trunk/deployer/spring/pom.xml (original)
+++ karaf/trunk/deployer/spring/pom.xml Tue Nov 20 14:48:02 2012
@@ -54,7 +54,7 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.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=1411688&r1=1411687&r2=1411688&view=diff
==============================================================================
--- karaf/trunk/deployer/wrap/pom.xml (original)
+++ karaf/trunk/deployer/wrap/pom.xml Tue Nov 20 14:48:02 2012
@@ -44,7 +44,7 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.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=1411688&r1=1411687&r2=1411688&view=diff
==============================================================================
--- karaf/trunk/diagnostic/command/pom.xml (original)
+++ karaf/trunk/diagnostic/command/pom.xml Tue Nov 20 14:48:02 2012
@@ -39,7 +39,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
@@ -51,7 +51,7 @@
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.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=1411688&r1=1411687&r2=1411688&view=diff
==============================================================================
--- karaf/trunk/diagnostic/core/pom.xml (original)
+++ karaf/trunk/diagnostic/core/pom.xml Tue Nov 20 14:48:02 2012
@@ -39,13 +39,13 @@
<dependencies>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.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=1411688&r1=1411687&r2=1411688&view=diff
==============================================================================
--- karaf/trunk/features/command/pom.xml (original)
+++ karaf/trunk/features/command/pom.xml Tue Nov 20 14:48:02 2012
@@ -39,12 +39,12 @@
<dependencies>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</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=1411688&r1=1411687&r2=1411688&view=diff
==============================================================================
--- karaf/trunk/features/core/pom.xml (original)
+++ karaf/trunk/features/core/pom.xml Tue Nov 20 14:48:02 2012
@@ -39,7 +39,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
@@ -49,7 +49,7 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.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=1411688&r1=1411687&r2=1411688&view=diff
==============================================================================
--- karaf/trunk/features/obr/pom.xml (original)
+++ karaf/trunk/features/obr/pom.xml Tue Nov 20 14:48:02 2012
@@ -39,7 +39,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.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=1411688&r1=1411687&r2=1411688&view=diff
==============================================================================
--- karaf/trunk/http/command/pom.xml (original)
+++ karaf/trunk/http/command/pom.xml Tue Nov 20 14:48:02 2012
@@ -58,7 +58,7 @@
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.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=1411688&r1=1411687&r2=1411688&view=diff
==============================================================================
--- karaf/trunk/http/core/pom.xml (original)
+++ karaf/trunk/http/core/pom.xml Tue Nov 20 14:48:02 2012
@@ -39,7 +39,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.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=1411688&r1=1411687&r2=1411688&view=diff
==============================================================================
--- karaf/trunk/instance/command/pom.xml (original)
+++ karaf/trunk/instance/command/pom.xml Tue Nov 20 14:48:02 2012
@@ -44,7 +44,7 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
@@ -56,7 +56,7 @@
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.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=1411688&r1=1411687&r2=1411688&view=diff
==============================================================================
--- karaf/trunk/instance/core/pom.xml (original)
+++ karaf/trunk/instance/core/pom.xml Tue Nov 20 14:48:02 2012
@@ -40,7 +40,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.karaf.osgi</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=1411688&r1=1411687&r2=1411688&view=diff
==============================================================================
--- karaf/trunk/jaas/boot/pom.xml (original)
+++ karaf/trunk/jaas/boot/pom.xml Tue Nov 20 14:48:02 2012
@@ -39,7 +39,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.karaf.osgi</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=1411688&r1=1411687&r2=1411688&view=diff
==============================================================================
--- karaf/trunk/jaas/command/pom.xml (original)
+++ karaf/trunk/jaas/command/pom.xml Tue Nov 20 14:48:02 2012
@@ -39,7 +39,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.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=1411688&r1=1411687&r2=1411688&view=diff
==============================================================================
--- karaf/trunk/jaas/config/pom.xml (original)
+++ karaf/trunk/jaas/config/pom.xml Tue Nov 20 14:48:02 2012
@@ -54,7 +54,7 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</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=1411688&r1=1411687&r2=1411688&view=diff
==============================================================================
--- karaf/trunk/jaas/modules/pom.xml (original)
+++ karaf/trunk/jaas/modules/pom.xml Tue Nov 20 14:48:02 2012
@@ -61,13 +61,13 @@
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.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=1411688&r1=1411687&r2=1411688&view=diff
==============================================================================
--- karaf/trunk/kar/command/pom.xml (original)
+++ karaf/trunk/kar/command/pom.xml Tue Nov 20 14:48:02 2012
@@ -57,7 +57,7 @@
<artifactId>org.apache.karaf.shell.table</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.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=1411688&r1=1411687&r2=1411688&view=diff
==============================================================================
--- karaf/trunk/kar/core/pom.xml (original)
+++ karaf/trunk/kar/core/pom.xml Tue Nov 20 14:48:02 2012
@@ -43,12 +43,12 @@
<artifactId>org.apache.felix.utils</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.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=1411688&r1=1411687&r2=1411688&view=diff
==============================================================================
--- karaf/trunk/log/command/pom.xml (original)
+++ karaf/trunk/log/command/pom.xml Tue Nov 20 14:48:02 2012
@@ -54,13 +54,13 @@
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.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=1411688&r1=1411687&r2=1411688&view=diff
==============================================================================
--- karaf/trunk/log/core/pom.xml (original)
+++ karaf/trunk/log/core/pom.xml Tue Nov 20 14:48:02 2012
@@ -39,12 +39,12 @@
<dependencies>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</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=1411688&r1=1411687&r2=1411688&view=diff
==============================================================================
--- karaf/trunk/main/pom.xml (original)
+++ karaf/trunk/main/pom.xml Tue Nov 20 14:48:02 2012
@@ -40,7 +40,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.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=1411688&r1=1411687&r2=1411688&view=diff
==============================================================================
--- karaf/trunk/management/server/pom.xml (original)
+++ karaf/trunk/management/server/pom.xml Tue Nov 20 14:48:02 2012
@@ -40,12 +40,12 @@
<dependencies>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.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=1411688&r1=1411687&r2=1411688&view=diff
==============================================================================
--- karaf/trunk/obr/command/pom.xml (original)
+++ karaf/trunk/obr/command/pom.xml Tue Nov 20 14:48:02 2012
@@ -56,7 +56,7 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.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=1411688&r1=1411687&r2=1411688&view=diff
==============================================================================
--- karaf/trunk/obr/core/pom.xml (original)
+++ karaf/trunk/obr/core/pom.xml Tue Nov 20 14:48:02 2012
@@ -39,7 +39,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
Modified: karaf/trunk/package/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/package/command/pom.xml?rev=1411688&r1=1411687&r2=1411688&view=diff
==============================================================================
--- karaf/trunk/package/command/pom.xml (original)
+++ karaf/trunk/package/command/pom.xml Tue Nov 20 14:48:02 2012
@@ -58,7 +58,7 @@
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.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=1411688&r1=1411687&r2=1411688&view=diff
==============================================================================
--- karaf/trunk/package/core/pom.xml (original)
+++ karaf/trunk/package/core/pom.xml Tue Nov 20 14:48:02 2012
@@ -46,7 +46,7 @@
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
Modified: karaf/trunk/region/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/region/command/pom.xml?rev=1411688&r1=1411687&r2=1411688&view=diff
==============================================================================
--- karaf/trunk/region/command/pom.xml (original)
+++ karaf/trunk/region/command/pom.xml Tue Nov 20 14:48:02 2012
@@ -38,7 +38,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.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=1411688&r1=1411687&r2=1411688&view=diff
==============================================================================
--- karaf/trunk/region/core/pom.xml (original)
+++ karaf/trunk/region/core/pom.xml Tue Nov 20 14:48:02 2012
@@ -60,7 +60,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.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=1411688&r1=1411687&r2=1411688&view=diff
==============================================================================
--- karaf/trunk/region/persist/pom.xml (original)
+++ karaf/trunk/region/persist/pom.xml Tue Nov 20 14:48:02 2012
@@ -44,7 +44,7 @@
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
@@ -56,7 +56,7 @@
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
</dependency>
Modified: karaf/trunk/region/persist/src/main/resources/org/apache/karaf/region/persist/region.xsd
URL: http://svn.apache.org/viewvc/karaf/trunk/region/persist/src/main/resources/org/apache/karaf/region/persist/region.xsd?rev=1411688&r1=1411687&r2=1411688&view=diff
==============================================================================
--- karaf/trunk/region/persist/src/main/resources/org/apache/karaf/region/persist/region.xsd (original)
+++ karaf/trunk/region/persist/src/main/resources/org/apache/karaf/region/persist/region.xsd Tue Nov 20 14:48:02 2012
@@ -18,7 +18,7 @@
under the License.
-->
-<!-- $Rev: 699828 $ $Date: 2008-09-28 16:35:27 +0200 (Sun, 28 Sep 2008) $ -->
+<!-- $Rev$ $Date$ -->
<xsd:schema xmlns="http://karaf.apache.org/xmlns/region/v1.0.0"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
Modified: karaf/trunk/scheduler/core/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/scheduler/core/pom.xml?rev=1411688&r1=1411687&r2=1411688&view=diff
==============================================================================
--- karaf/trunk/scheduler/core/pom.xml (original)
+++ karaf/trunk/scheduler/core/pom.xml Tue Nov 20 14:48:02 2012
@@ -68,7 +68,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.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=1411688&r1=1411687&r2=1411688&view=diff
==============================================================================
--- karaf/trunk/scr/examples/pom.xml (original)
+++ karaf/trunk/scr/examples/pom.xml Tue Nov 20 14:48:02 2012
@@ -47,11 +47,11 @@
<artifactId>bndlib</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.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=1411688&r1=1411687&r2=1411688&view=diff
==============================================================================
--- karaf/trunk/scr/management/pom.xml (original)
+++ karaf/trunk/scr/management/pom.xml Tue Nov 20 14:48:02 2012
@@ -44,7 +44,7 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
Modified: karaf/trunk/scr/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/scr/pom.xml?rev=1411688&r1=1411687&r2=1411688&view=diff
==============================================================================
--- karaf/trunk/scr/pom.xml (original)
+++ karaf/trunk/scr/pom.xml Tue Nov 20 14:48:02 2012
@@ -1,42 +1,42 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
- <!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (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
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- 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>
-
- <groupId>org.apache.karaf.scr</groupId>
- <artifactId>scr</artifactId>
- <packaging>pom</packaging>
- <name>Apache Karaf :: Declarative Services (DS)</name>
-
- <modules>
- <module>command</module>
- <module>management</module>
- <module>examples</module>
- </modules>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (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
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ 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>
+
+ <groupId>org.apache.karaf.scr</groupId>
+ <artifactId>scr</artifactId>
+ <packaging>pom</packaging>
+ <name>Apache Karaf :: Declarative Services (DS)</name>
+
+ <modules>
+ <module>command</module>
+ <module>management</module>
+ <module>examples</module>
+ </modules>
+
</project>
\ No newline at end of file
Modified: karaf/trunk/service/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/service/command/pom.xml?rev=1411688&r1=1411687&r2=1411688&view=diff
==============================================================================
--- karaf/trunk/service/command/pom.xml (original)
+++ karaf/trunk/service/command/pom.xml Tue Nov 20 14:48:02 2012
@@ -56,12 +56,12 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.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=1411688&r1=1411687&r2=1411688&view=diff
==============================================================================
--- karaf/trunk/service/core/pom.xml (original)
+++ karaf/trunk/service/core/pom.xml Tue Nov 20 14:48:02 2012
@@ -39,7 +39,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.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=1411688&r1=1411687&r2=1411688&view=diff
==============================================================================
--- karaf/trunk/shell/commands/pom.xml (original)
+++ karaf/trunk/shell/commands/pom.xml Tue Nov 20 14:48:02 2012
@@ -59,12 +59,12 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.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=1411688&r1=1411687&r2=1411688&view=diff
==============================================================================
--- karaf/trunk/shell/console/pom.xml (original)
+++ karaf/trunk/shell/console/pom.xml Tue Nov 20 14:48:02 2012
@@ -48,12 +48,12 @@
<artifactId>jline</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.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=1411688&r1=1411687&r2=1411688&view=diff
==============================================================================
--- karaf/trunk/shell/help/pom.xml (original)
+++ karaf/trunk/shell/help/pom.xml Tue Nov 20 14:48:02 2012
@@ -62,12 +62,12 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.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=1411688&r1=1411687&r2=1411688&view=diff
==============================================================================
--- karaf/trunk/shell/ssh/pom.xml (original)
+++ karaf/trunk/shell/ssh/pom.xml Tue Nov 20 14:48:02 2012
@@ -50,13 +50,13 @@
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.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=1411688&r1=1411687&r2=1411688&view=diff
==============================================================================
--- karaf/trunk/system/command/pom.xml (original)
+++ karaf/trunk/system/command/pom.xml Tue Nov 20 14:48:02 2012
@@ -56,7 +56,7 @@
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.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=1411688&r1=1411687&r2=1411688&view=diff
==============================================================================
--- karaf/trunk/system/core/pom.xml (original)
+++ karaf/trunk/system/core/pom.xml Tue Nov 20 14:48:02 2012
@@ -41,7 +41,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.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=1411688&r1=1411687&r2=1411688&view=diff
==============================================================================
--- karaf/trunk/tooling/exam/container/pom.xml (original)
+++ karaf/trunk/tooling/exam/container/pom.xml Tue Nov 20 14:48:02 2012
@@ -37,11 +37,11 @@
<dependencies>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
</dependency>
Modified: karaf/trunk/tooling/karaf-maven-plugin/NOTICE
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/karaf-maven-plugin/NOTICE?rev=1411688&r1=1411687&r2=1411688&view=diff
==============================================================================
--- karaf/trunk/tooling/karaf-maven-plugin/NOTICE (original)
+++ karaf/trunk/tooling/karaf-maven-plugin/NOTICE Tue Nov 20 14:48:02 2012
@@ -1,48 +1,48 @@
-Apache Karaf
-Copyright 2010-2012 The Apache Software Foundation
-
-
-I. Included Software
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
-This product includes software written by
-Antony Lesuisse.
-Licensed under Public Domain.
-
-
-II. Used Software
-
-This product uses software developed at
-The OSGi Alliance (http://www.osgi.org/).
-Copyright (c) OSGi Alliance (2000, 2010).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-OPS4J (http://www.ops4j.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-FUSE Source (http://www.fusesource.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-Tanuki Software (http://www.tanukisoftware.com/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-JLine (http://jline.sourceforge.net).
-Licensed under the BSD License.
-
-This product uses software developed at
-SLF4J (http://www.slf4j.org/).
-Licensed under the MIT License.
-
-This product includes software from http://www.json.org.
-Copyright (c) 2002 JSON.org
-
-
-III. License Summary
-- Apache License 2.0
+Apache Karaf
+Copyright 2010-2012 The Apache Software Foundation
+
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+This product includes software written by
+Antony Lesuisse.
+Licensed under Public Domain.
+
+
+II. Used Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2010).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+OPS4J (http://www.ops4j.org/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+FUSE Source (http://www.fusesource.org/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+Tanuki Software (http://www.tanukisoftware.com/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+JLine (http://jline.sourceforge.net).
+Licensed under the BSD License.
+
+This product uses software developed at
+SLF4J (http://www.slf4j.org/).
+Licensed under the MIT License.
+
+This product includes software from http://www.json.org.
+Copyright (c) 2002 JSON.org
+
+
+III. License Summary
+- Apache License 2.0
Modified: karaf/trunk/tooling/karaf-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/karaf-maven-plugin/pom.xml?rev=1411688&r1=1411687&r2=1411688&view=diff
==============================================================================
--- karaf/trunk/tooling/karaf-maven-plugin/pom.xml (original)
+++ karaf/trunk/tooling/karaf-maven-plugin/pom.xml Tue Nov 20 14:48:02 2012
@@ -146,8 +146,9 @@
<artifactId>org.apache.karaf.shell.console</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
Modified: karaf/trunk/util/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/util/pom.xml?rev=1411688&r1=1411687&r2=1411688&view=diff
==============================================================================
--- karaf/trunk/util/pom.xml (original)
+++ karaf/trunk/util/pom.xml Tue Nov 20 14:48:02 2012
@@ -35,7 +35,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.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=1411688&r1=1411687&r2=1411688&view=diff
==============================================================================
--- karaf/trunk/web/command/pom.xml (original)
+++ karaf/trunk/web/command/pom.xml Tue Nov 20 14:48:02 2012
@@ -58,12 +58,12 @@
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.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=1411688&r1=1411687&r2=1411688&view=diff
==============================================================================
--- karaf/trunk/web/core/pom.xml (original)
+++ karaf/trunk/web/core/pom.xml Tue Nov 20 14:48:02 2012
@@ -41,7 +41,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.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=1411688&r1=1411687&r2=1411688&view=diff
==============================================================================
--- karaf/trunk/webconsole/console/pom.xml (original)
+++ karaf/trunk/webconsole/console/pom.xml Tue Nov 20 14:48:02 2012
@@ -43,11 +43,11 @@
<artifactId>${servlet.spec.artifactId}</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.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=1411688&r1=1411687&r2=1411688&view=diff
==============================================================================
--- karaf/trunk/webconsole/features/pom.xml (original)
+++ karaf/trunk/webconsole/features/pom.xml Tue Nov 20 14:48:02 2012
@@ -39,12 +39,12 @@
<dependencies>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</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=1411688&r1=1411687&r2=1411688&view=diff
==============================================================================
--- karaf/trunk/webconsole/gogo/pom.xml (original)
+++ karaf/trunk/webconsole/gogo/pom.xml Tue Nov 20 14:48:02 2012
@@ -39,12 +39,12 @@
<dependencies>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.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=1411688&r1=1411687&r2=1411688&view=diff
==============================================================================
--- karaf/trunk/webconsole/http/pom.xml (original)
+++ karaf/trunk/webconsole/http/pom.xml Tue Nov 20 14:48:02 2012
@@ -39,12 +39,12 @@
<dependencies>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.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=1411688&r1=1411687&r2=1411688&view=diff
==============================================================================
--- karaf/trunk/webconsole/instance/pom.xml (original)
+++ karaf/trunk/webconsole/instance/pom.xml Tue Nov 20 14:48:02 2012
@@ -44,12 +44,12 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.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=1411688&r1=1411687&r2=1411688&view=diff
==============================================================================
--- karaf/trunk/wrapper/core/pom.xml (original)
+++ karaf/trunk/wrapper/core/pom.xml Tue Nov 20 14:48:02 2012
@@ -42,7 +42,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</dependency>
<dependency>