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/04/30 15:38:26 UTC
svn commit: r1332195 - in /karaf/trunk: bundle/command/ bundle/core/
bundle/springstate/ config/command/
demos/web/src/main/resources/resources/demos/web/ deployer/blueprint/
deployer/features/ deployer/kar/ deployer/spring/ deployer/wrap/
dev/command/...
Author: cschneider
Date: Mon Apr 30 13:38:24 2012
New Revision: 1332195
URL: http://svn.apache.org/viewvc?rev=1332195&view=rev
Log:
KARAF-1282 Moving modules to the new osgi core dependency
Modified:
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/demos/web/src/main/resources/resources/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/dev/command/pom.xml
karaf/trunk/dev/core/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/jaas/boot/pom.xml
karaf/trunk/jaas/config/pom.xml
karaf/trunk/jaas/modules/pom.xml
karaf/trunk/kar/command/pom.xml
karaf/trunk/log/command/pom.xml
karaf/trunk/log/core/pom.xml
karaf/trunk/management/server/pom.xml
karaf/trunk/obr/command/pom.xml
karaf/trunk/obr/core/pom.xml
karaf/trunk/region/command/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/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/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/bundle/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/bundle/command/pom.xml?rev=1332195&r1=1332194&r2=1332195&view=diff
==============================================================================
--- karaf/trunk/bundle/command/pom.xml (original)
+++ karaf/trunk/bundle/command/pom.xml Mon Apr 30 13:38:24 2012
@@ -49,7 +49,7 @@
<dependency>
<groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.main</artifactId>
+ <artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: karaf/trunk/bundle/core/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/bundle/core/pom.xml?rev=1332195&r1=1332194&r2=1332195&view=diff
==============================================================================
--- karaf/trunk/bundle/core/pom.xml (original)
+++ karaf/trunk/bundle/core/pom.xml Mon Apr 30 13:38:24 2012
@@ -47,7 +47,7 @@
<dependency>
<groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.main</artifactId>
+ <artifactId>org.osgi.core</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=1332195&r1=1332194&r2=1332195&view=diff
==============================================================================
--- karaf/trunk/bundle/springstate/pom.xml (original)
+++ karaf/trunk/bundle/springstate/pom.xml Mon Apr 30 13:38:24 2012
@@ -48,7 +48,7 @@
<dependency>
<groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.main</artifactId>
+ <artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: karaf/trunk/config/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/config/command/pom.xml?rev=1332195&r1=1332194&r2=1332195&view=diff
==============================================================================
--- karaf/trunk/config/command/pom.xml (original)
+++ karaf/trunk/config/command/pom.xml Mon Apr 30 13:38:24 2012
@@ -49,7 +49,7 @@
<dependency>
<groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.main</artifactId>
+ <artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
Modified: karaf/trunk/demos/web/src/main/resources/resources/demos/web/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/demos/web/src/main/resources/resources/demos/web/pom.xml?rev=1332195&r1=1332194&r2=1332195&view=diff
==============================================================================
--- karaf/trunk/demos/web/src/main/resources/resources/demos/web/pom.xml (original)
+++ karaf/trunk/demos/web/src/main/resources/resources/demos/web/pom.xml Mon Apr 30 13:38:24 2012
@@ -46,7 +46,7 @@
<dependencies>
<dependency>
<groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.main</artifactId>
+ <artifactId>org.osgi.core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.karaf.jaas</groupId>
Modified: karaf/trunk/deployer/blueprint/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/deployer/blueprint/pom.xml?rev=1332195&r1=1332194&r2=1332195&view=diff
==============================================================================
--- karaf/trunk/deployer/blueprint/pom.xml (original)
+++ karaf/trunk/deployer/blueprint/pom.xml Mon Apr 30 13:38:24 2012
@@ -56,7 +56,7 @@
</dependency>
<dependency>
<groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.main</artifactId>
+ <artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: karaf/trunk/deployer/features/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/deployer/features/pom.xml?rev=1332195&r1=1332194&r2=1332195&view=diff
==============================================================================
--- karaf/trunk/deployer/features/pom.xml (original)
+++ karaf/trunk/deployer/features/pom.xml Mon Apr 30 13:38:24 2012
@@ -50,7 +50,7 @@
</dependency>
<dependency>
<groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.main</artifactId>
+ <artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: karaf/trunk/deployer/kar/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/deployer/kar/pom.xml?rev=1332195&r1=1332194&r2=1332195&view=diff
==============================================================================
--- karaf/trunk/deployer/kar/pom.xml (original)
+++ karaf/trunk/deployer/kar/pom.xml Mon Apr 30 13:38:24 2012
@@ -50,7 +50,7 @@
</dependency>
<dependency>
<groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.main</artifactId>
+ <artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: karaf/trunk/deployer/spring/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/deployer/spring/pom.xml?rev=1332195&r1=1332194&r2=1332195&view=diff
==============================================================================
--- karaf/trunk/deployer/spring/pom.xml (original)
+++ karaf/trunk/deployer/spring/pom.xml Mon Apr 30 13:38:24 2012
@@ -55,7 +55,7 @@
</dependency>
<dependency>
<groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.main</artifactId>
+ <artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: karaf/trunk/deployer/wrap/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/deployer/wrap/pom.xml?rev=1332195&r1=1332194&r2=1332195&view=diff
==============================================================================
--- karaf/trunk/deployer/wrap/pom.xml (original)
+++ karaf/trunk/deployer/wrap/pom.xml Mon Apr 30 13:38:24 2012
@@ -45,7 +45,7 @@
</dependency>
<dependency>
<groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.main</artifactId>
+ <artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: karaf/trunk/dev/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/dev/command/pom.xml?rev=1332195&r1=1332194&r2=1332195&view=diff
==============================================================================
--- karaf/trunk/dev/command/pom.xml (original)
+++ karaf/trunk/dev/command/pom.xml Mon Apr 30 13:38:24 2012
@@ -46,7 +46,7 @@
<dependency>
<groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.main</artifactId>
+ <artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
Modified: karaf/trunk/dev/core/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/dev/core/pom.xml?rev=1332195&r1=1332194&r2=1332195&view=diff
==============================================================================
--- karaf/trunk/dev/core/pom.xml (original)
+++ karaf/trunk/dev/core/pom.xml Mon Apr 30 13:38:24 2012
@@ -43,7 +43,7 @@
<dependency>
<groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.main</artifactId>
+ <artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: karaf/trunk/diagnostic/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/diagnostic/command/pom.xml?rev=1332195&r1=1332194&r2=1332195&view=diff
==============================================================================
--- karaf/trunk/diagnostic/command/pom.xml (original)
+++ karaf/trunk/diagnostic/command/pom.xml Mon Apr 30 13:38:24 2012
@@ -40,7 +40,7 @@
<dependencies>
<dependency>
<groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.main</artifactId>
+ <artifactId>org.osgi.core</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=1332195&r1=1332194&r2=1332195&view=diff
==============================================================================
--- karaf/trunk/diagnostic/core/pom.xml (original)
+++ karaf/trunk/diagnostic/core/pom.xml Mon Apr 30 13:38:24 2012
@@ -40,7 +40,7 @@
<dependencies>
<dependency>
<groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.main</artifactId>
+ <artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
Modified: karaf/trunk/features/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/features/command/pom.xml?rev=1332195&r1=1332194&r2=1332195&view=diff
==============================================================================
--- karaf/trunk/features/command/pom.xml (original)
+++ karaf/trunk/features/command/pom.xml Mon Apr 30 13:38:24 2012
@@ -40,7 +40,7 @@
<dependencies>
<dependency>
<groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.main</artifactId>
+ <artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: karaf/trunk/features/core/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/features/core/pom.xml?rev=1332195&r1=1332194&r2=1332195&view=diff
==============================================================================
--- karaf/trunk/features/core/pom.xml (original)
+++ karaf/trunk/features/core/pom.xml Mon Apr 30 13:38:24 2012
@@ -40,7 +40,7 @@
<dependencies>
<dependency>
<groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.main</artifactId>
+ <artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: karaf/trunk/features/obr/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/features/obr/pom.xml?rev=1332195&r1=1332194&r2=1332195&view=diff
==============================================================================
--- karaf/trunk/features/obr/pom.xml (original)
+++ karaf/trunk/features/obr/pom.xml Mon Apr 30 13:38:24 2012
@@ -40,7 +40,7 @@
<dependencies>
<dependency>
<groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.main</artifactId>
+ <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=1332195&r1=1332194&r2=1332195&view=diff
==============================================================================
--- karaf/trunk/http/command/pom.xml (original)
+++ karaf/trunk/http/command/pom.xml Mon Apr 30 13:38:24 2012
@@ -49,7 +49,7 @@
<dependency>
<groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.main</artifactId>
+ <artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: karaf/trunk/http/core/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/http/core/pom.xml?rev=1332195&r1=1332194&r2=1332195&view=diff
==============================================================================
--- karaf/trunk/http/core/pom.xml (original)
+++ karaf/trunk/http/core/pom.xml Mon Apr 30 13:38:24 2012
@@ -40,7 +40,7 @@
<dependencies>
<dependency>
<groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.main</artifactId>
+ <artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: karaf/trunk/instance/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/command/pom.xml?rev=1332195&r1=1332194&r2=1332195&view=diff
==============================================================================
--- karaf/trunk/instance/command/pom.xml (original)
+++ karaf/trunk/instance/command/pom.xml Mon Apr 30 13:38:24 2012
@@ -40,7 +40,7 @@
<dependencies>
<dependency>
<groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.main</artifactId>
+ <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=1332195&r1=1332194&r2=1332195&view=diff
==============================================================================
--- karaf/trunk/jaas/boot/pom.xml (original)
+++ karaf/trunk/jaas/boot/pom.xml Mon Apr 30 13:38:24 2012
@@ -40,7 +40,7 @@
<dependencies>
<dependency>
<groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.main</artifactId>
+ <artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: karaf/trunk/jaas/config/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/config/pom.xml?rev=1332195&r1=1332194&r2=1332195&view=diff
==============================================================================
--- karaf/trunk/jaas/config/pom.xml (original)
+++ karaf/trunk/jaas/config/pom.xml Mon Apr 30 13:38:24 2012
@@ -50,7 +50,7 @@
</dependency>
<dependency>
<groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.main</artifactId>
+ <artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: karaf/trunk/jaas/modules/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/modules/pom.xml?rev=1332195&r1=1332194&r2=1332195&view=diff
==============================================================================
--- karaf/trunk/jaas/modules/pom.xml (original)
+++ karaf/trunk/jaas/modules/pom.xml Mon Apr 30 13:38:24 2012
@@ -62,7 +62,7 @@
<dependency>
<groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.main</artifactId>
+ <artifactId>org.osgi.core</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=1332195&r1=1332194&r2=1332195&view=diff
==============================================================================
--- karaf/trunk/kar/command/pom.xml (original)
+++ karaf/trunk/kar/command/pom.xml Mon Apr 30 13:38:24 2012
@@ -48,7 +48,7 @@
</dependency>
<dependency>
<groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.main</artifactId>
+ <artifactId>org.osgi.core</artifactId>
</dependency>
</dependencies>
Modified: karaf/trunk/log/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/log/command/pom.xml?rev=1332195&r1=1332194&r2=1332195&view=diff
==============================================================================
--- karaf/trunk/log/command/pom.xml (original)
+++ karaf/trunk/log/command/pom.xml Mon Apr 30 13:38:24 2012
@@ -49,7 +49,7 @@
<dependency>
<groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.main</artifactId>
+ <artifactId>org.osgi.core</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=1332195&r1=1332194&r2=1332195&view=diff
==============================================================================
--- karaf/trunk/log/core/pom.xml (original)
+++ karaf/trunk/log/core/pom.xml Mon Apr 30 13:38:24 2012
@@ -40,7 +40,7 @@
<dependencies>
<dependency>
<groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.main</artifactId>
+ <artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: karaf/trunk/management/server/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/management/server/pom.xml?rev=1332195&r1=1332194&r2=1332195&view=diff
==============================================================================
--- karaf/trunk/management/server/pom.xml (original)
+++ karaf/trunk/management/server/pom.xml Mon Apr 30 13:38:24 2012
@@ -41,7 +41,7 @@
<dependencies>
<dependency>
<groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.main</artifactId>
+ <artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: karaf/trunk/obr/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/obr/command/pom.xml?rev=1332195&r1=1332194&r2=1332195&view=diff
==============================================================================
--- karaf/trunk/obr/command/pom.xml (original)
+++ karaf/trunk/obr/command/pom.xml Mon Apr 30 13:38:24 2012
@@ -50,7 +50,7 @@
</dependency>
<dependency>
<groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.main</artifactId>
+ <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=1332195&r1=1332194&r2=1332195&view=diff
==============================================================================
--- karaf/trunk/obr/core/pom.xml (original)
+++ karaf/trunk/obr/core/pom.xml Mon Apr 30 13:38:24 2012
@@ -40,7 +40,7 @@
<dependencies>
<dependency>
<groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.main</artifactId>
+ <artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: karaf/trunk/region/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/region/command/pom.xml?rev=1332195&r1=1332194&r2=1332195&view=diff
==============================================================================
--- karaf/trunk/region/command/pom.xml (original)
+++ karaf/trunk/region/command/pom.xml Mon Apr 30 13:38:24 2012
@@ -39,7 +39,7 @@
<dependencies>
<dependency>
<groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.main</artifactId>
+ <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=1332195&r1=1332194&r2=1332195&view=diff
==============================================================================
--- karaf/trunk/region/persist/pom.xml (original)
+++ karaf/trunk/region/persist/pom.xml Mon Apr 30 13:38:24 2012
@@ -45,7 +45,7 @@
<dependency>
<groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.main</artifactId>
+ <artifactId>org.osgi.core</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=1332195&r1=1332194&r2=1332195&view=diff
==============================================================================
--- karaf/trunk/scheduler/core/pom.xml (original)
+++ karaf/trunk/scheduler/core/pom.xml Mon Apr 30 13:38:24 2012
@@ -69,7 +69,7 @@
<dependencies>
<dependency>
<groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.main</artifactId>
+ <artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: karaf/trunk/scr/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/scr/command/pom.xml?rev=1332195&r1=1332194&r2=1332195&view=diff
==============================================================================
--- karaf/trunk/scr/command/pom.xml (original)
+++ karaf/trunk/scr/command/pom.xml Mon Apr 30 13:38:24 2012
@@ -1,96 +1,96 @@
-<?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.scr</groupId>
- <artifactId>scr</artifactId>
- <version>3.0.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>org.apache.karaf.scr.command</artifactId>
- <packaging>bundle</packaging>
- <name>Apache Karaf :: SCR :: Shell Commands</name>
- <description>Provides the OSGi SCR commands</description>
-
- <properties>
- <appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.karaf.shell</groupId>
- <artifactId>org.apache.karaf.shell.console</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.main</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr</artifactId>
- </dependency>
- <dependency>
- <groupId>biz.aQute</groupId>
- <artifactId>bndlib</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <build>
- <resources>
- <resource>
- <directory>${project.basedir}/src/main/resources</directory>
- <includes>
- <include>**/*</include>
- </includes>
- </resource>
- <resource>
- <directory>${project.basedir}/src/main/resources</directory>
- <filtering>true</filtering>
- <includes>
- <include>**/*.info</include>
- </includes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Service-Component>*</Service-Component>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
+<?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.scr</groupId>
+ <artifactId>scr</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>org.apache.karaf.scr.command</artifactId>
+ <packaging>bundle</packaging>
+ <name>Apache Karaf :: SCR :: Shell Commands</name>
+ <description>Provides the OSGi SCR commands</description>
+
+ <properties>
+ <appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf.shell</groupId>
+ <artifactId>org.apache.karaf.shell.console</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>biz.aQute</groupId>
+ <artifactId>bndlib</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>${project.basedir}/src/main/resources</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>${project.basedir}/src/main/resources</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>**/*.info</include>
+ </includes>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Service-Component>*</Service-Component>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Modified: karaf/trunk/scr/examples/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/scr/examples/pom.xml?rev=1332195&r1=1332194&r2=1332195&view=diff
==============================================================================
--- karaf/trunk/scr/examples/pom.xml (original)
+++ karaf/trunk/scr/examples/pom.xml Mon Apr 30 13:38:24 2012
@@ -52,7 +52,7 @@
</dependency>
<dependency>
<groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.main</artifactId>
+ <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=1332195&r1=1332194&r2=1332195&view=diff
==============================================================================
--- karaf/trunk/scr/management/pom.xml (original)
+++ karaf/trunk/scr/management/pom.xml Mon Apr 30 13:38:24 2012
@@ -45,7 +45,7 @@
</dependency>
<dependency>
<groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.main</artifactId>
+ <artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: karaf/trunk/service/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/service/command/pom.xml?rev=1332195&r1=1332194&r2=1332195&view=diff
==============================================================================
--- karaf/trunk/service/command/pom.xml (original)
+++ karaf/trunk/service/command/pom.xml Mon Apr 30 13:38:24 2012
@@ -50,7 +50,7 @@
</dependency>
<dependency>
<groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.main</artifactId>
+ <artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: karaf/trunk/service/core/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/service/core/pom.xml?rev=1332195&r1=1332194&r2=1332195&view=diff
==============================================================================
--- karaf/trunk/service/core/pom.xml (original)
+++ karaf/trunk/service/core/pom.xml Mon Apr 30 13:38:24 2012
@@ -40,7 +40,7 @@
<dependencies>
<dependency>
<groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.main</artifactId>
+ <artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: karaf/trunk/shell/commands/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/commands/pom.xml?rev=1332195&r1=1332194&r2=1332195&view=diff
==============================================================================
--- karaf/trunk/shell/commands/pom.xml (original)
+++ karaf/trunk/shell/commands/pom.xml Mon Apr 30 13:38:24 2012
@@ -59,7 +59,7 @@
</dependency>
<dependency>
<groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.main</artifactId>
+ <artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: karaf/trunk/shell/console/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/pom.xml?rev=1332195&r1=1332194&r2=1332195&view=diff
==============================================================================
--- karaf/trunk/shell/console/pom.xml (original)
+++ karaf/trunk/shell/console/pom.xml Mon Apr 30 13:38:24 2012
@@ -61,7 +61,7 @@
</dependency>
<dependency>
<groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.main</artifactId>
+ <artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: karaf/trunk/shell/ssh/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/ssh/pom.xml?rev=1332195&r1=1332194&r2=1332195&view=diff
==============================================================================
--- karaf/trunk/shell/ssh/pom.xml (original)
+++ karaf/trunk/shell/ssh/pom.xml Mon Apr 30 13:38:24 2012
@@ -45,7 +45,7 @@
<dependency>
<groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.main</artifactId>
+ <artifactId>org.osgi.core</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=1332195&r1=1332194&r2=1332195&view=diff
==============================================================================
--- karaf/trunk/system/command/pom.xml (original)
+++ karaf/trunk/system/command/pom.xml Mon Apr 30 13:38:24 2012
@@ -50,7 +50,7 @@
</dependency>
<dependency>
<groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.main</artifactId>
+ <artifactId>org.osgi.core</artifactId>
</dependency>
</dependencies>
Modified: karaf/trunk/system/core/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/system/core/pom.xml?rev=1332195&r1=1332194&r2=1332195&view=diff
==============================================================================
--- karaf/trunk/system/core/pom.xml (original)
+++ karaf/trunk/system/core/pom.xml Mon Apr 30 13:38:24 2012
@@ -42,7 +42,7 @@
<dependencies>
<dependency>
<groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.main</artifactId>
+ <artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: karaf/trunk/tooling/exam/container/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/exam/container/pom.xml?rev=1332195&r1=1332194&r2=1332195&view=diff
==============================================================================
--- karaf/trunk/tooling/exam/container/pom.xml (original)
+++ karaf/trunk/tooling/exam/container/pom.xml Mon Apr 30 13:38:24 2012
@@ -46,7 +46,7 @@
<dependencies>
<dependency>
<groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.main</artifactId>
+ <artifactId>org.osgi.core</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
Modified: karaf/trunk/tooling/karaf-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/karaf-maven-plugin/pom.xml?rev=1332195&r1=1332194&r2=1332195&view=diff
==============================================================================
--- karaf/trunk/tooling/karaf-maven-plugin/pom.xml (original)
+++ karaf/trunk/tooling/karaf-maven-plugin/pom.xml Mon Apr 30 13:38:24 2012
@@ -141,7 +141,7 @@
</dependency>
<dependency>
<groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.main</artifactId>
+ <artifactId>org.osgi.core</artifactId>
</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=1332195&r1=1332194&r2=1332195&view=diff
==============================================================================
--- karaf/trunk/util/pom.xml (original)
+++ karaf/trunk/util/pom.xml Mon Apr 30 13:38:24 2012
@@ -36,7 +36,7 @@
<dependencies>
<dependency>
<groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.main</artifactId>
+ <artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: karaf/trunk/web/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/web/command/pom.xml?rev=1332195&r1=1332194&r2=1332195&view=diff
==============================================================================
--- karaf/trunk/web/command/pom.xml (original)
+++ karaf/trunk/web/command/pom.xml Mon Apr 30 13:38:24 2012
@@ -52,7 +52,7 @@
</dependency>
<dependency>
<groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.main</artifactId>
+ <artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: karaf/trunk/web/core/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/web/core/pom.xml?rev=1332195&r1=1332194&r2=1332195&view=diff
==============================================================================
--- karaf/trunk/web/core/pom.xml (original)
+++ karaf/trunk/web/core/pom.xml Mon Apr 30 13:38:24 2012
@@ -42,7 +42,7 @@
<dependencies>
<dependency>
<groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.main</artifactId>
+ <artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: karaf/trunk/webconsole/console/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/console/pom.xml?rev=1332195&r1=1332194&r2=1332195&view=diff
==============================================================================
--- karaf/trunk/webconsole/console/pom.xml (original)
+++ karaf/trunk/webconsole/console/pom.xml Mon Apr 30 13:38:24 2012
@@ -44,7 +44,7 @@
</dependency>
<dependency>
<groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.main</artifactId>
+ <artifactId>org.osgi.core</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
Modified: karaf/trunk/webconsole/features/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/features/pom.xml?rev=1332195&r1=1332194&r2=1332195&view=diff
==============================================================================
--- karaf/trunk/webconsole/features/pom.xml (original)
+++ karaf/trunk/webconsole/features/pom.xml Mon Apr 30 13:38:24 2012
@@ -40,7 +40,7 @@
<dependencies>
<dependency>
<groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.main</artifactId>
+ <artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: karaf/trunk/webconsole/gogo/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/gogo/pom.xml?rev=1332195&r1=1332194&r2=1332195&view=diff
==============================================================================
--- karaf/trunk/webconsole/gogo/pom.xml (original)
+++ karaf/trunk/webconsole/gogo/pom.xml Mon Apr 30 13:38:24 2012
@@ -40,7 +40,7 @@
<dependencies>
<dependency>
<groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.main</artifactId>
+ <artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: karaf/trunk/webconsole/http/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/http/pom.xml?rev=1332195&r1=1332194&r2=1332195&view=diff
==============================================================================
--- karaf/trunk/webconsole/http/pom.xml (original)
+++ karaf/trunk/webconsole/http/pom.xml Mon Apr 30 13:38:24 2012
@@ -40,7 +40,7 @@
<dependencies>
<dependency>
<groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.main</artifactId>
+ <artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: karaf/trunk/webconsole/instance/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/instance/pom.xml?rev=1332195&r1=1332194&r2=1332195&view=diff
==============================================================================
--- karaf/trunk/webconsole/instance/pom.xml (original)
+++ karaf/trunk/webconsole/instance/pom.xml Mon Apr 30 13:38:24 2012
@@ -45,7 +45,7 @@
</dependency>
<dependency>
<groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.main</artifactId>
+ <artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: karaf/trunk/wrapper/core/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/wrapper/core/pom.xml?rev=1332195&r1=1332194&r2=1332195&view=diff
==============================================================================
--- karaf/trunk/wrapper/core/pom.xml (original)
+++ karaf/trunk/wrapper/core/pom.xml Mon Apr 30 13:38:24 2012
@@ -43,6 +43,10 @@
<dependencies>
<dependency>
<groupId>org.apache.karaf</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf</groupId>
<artifactId>org.apache.karaf.main</artifactId>
</dependency>
<dependency>