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/05/04 16:48:08 UTC

svn commit: r1334002 - in /karaf/trunk/deployer: blueprint/pom.xml features/pom.xml kar/pom.xml spring/pom.xml wrap/pom.xml

Author: cschneider
Date: Fri May  4 14:48:07 2012
New Revision: 1334002

URL: http://svn.apache.org/viewvc?rev=1334002&view=rev
Log:
KARAF-1438 Optimize imports for deployers

Modified:
    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

Modified: karaf/trunk/deployer/blueprint/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/deployer/blueprint/pom.xml?rev=1334002&r1=1334001&r2=1334002&view=diff
==============================================================================
--- karaf/trunk/deployer/blueprint/pom.xml (original)
+++ karaf/trunk/deployer/blueprint/pom.xml Fri May  4 14:48:07 2012
@@ -60,11 +60,6 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.springframework.osgi</groupId>
-            <artifactId>spring-osgi-core</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.fileinstall</artifactId>
             <scope>provided</scope>
@@ -101,14 +96,7 @@
                         <!-- Set the blueprint.graceperiod flag to false to allow the bundle to start
                              See the blueprint config file -->
                         <Bundle-SymbolicName>${project.artifactId};blueprint.graceperiod:=false</Bundle-SymbolicName>
-                        <Export-Package>${project.artifactId}*;version=${project.version}</Export-Package>
-                        <Import-Package>
-                            org.apache.felix.service.command;version=${felix.gogo.version};status=provisional;mandatory:=status,
-                            org.apache.aries.blueprint,
-                            org.osgi.service.blueprint.container,
-                            org.osgi.service.blueprint.reflect,
-                            *
-                        </Import-Package>
+                        <Export-Package></Export-Package>
                         <Private-Package>
                             org.apache.karaf.deployer.blueprint,
                             org.apache.karaf.util

Modified: karaf/trunk/deployer/features/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/deployer/features/pom.xml?rev=1334002&r1=1334001&r2=1334002&view=diff
==============================================================================
--- karaf/trunk/deployer/features/pom.xml (original)
+++ karaf/trunk/deployer/features/pom.xml Fri May  4 14:48:07 2012
@@ -99,13 +99,7 @@
                         <!-- Set the blueprint.graceperiod flag to false to allow the bundle to start
                              See the blueprint config file -->
                         <Bundle-SymbolicName>${project.artifactId};blueprint.graceperiod:=false</Bundle-SymbolicName>
-                        <Import-Package>
-                            org.apache.felix.service.command;version=${felix.gogo.version};status=provisional;mandatory:=status,
-                            org.apache.aries.blueprint,
-                            org.osgi.service.blueprint.container,
-                            org.osgi.service.blueprint.reflect,
-                            *
-                        </Import-Package>
+                        <Export-Package></Export-Package>
                         <Private-Package>
                             org.apache.karaf.deployer.features,
                             org.apache.karaf.util

Modified: karaf/trunk/deployer/kar/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/deployer/kar/pom.xml?rev=1334002&r1=1334001&r2=1334002&view=diff
==============================================================================
--- karaf/trunk/deployer/kar/pom.xml (original)
+++ karaf/trunk/deployer/kar/pom.xml Fri May  4 14:48:07 2012
@@ -53,11 +53,6 @@
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.osgi</groupId>
-            <artifactId>spring-osgi-core</artifactId>
-            <scope>provided</scope>
-        </dependency>
 
         <dependency>
             <groupId>org.apache.karaf.kar</groupId>
@@ -102,13 +97,7 @@
                         <!-- Set the blueprint.graceperiod flag to false to allow the bundle to start
                              See the blueprint config file -->
                         <Bundle-SymbolicName>${project.artifactId};blueprint.graceperiod:=false</Bundle-SymbolicName>
-                        <Import-Package>
-                            org.apache.felix.service.command;version=${felix.gogo.version};status=provisional;mandatory:=status,
-                            org.apache.aries.blueprint,
-                            org.osgi.service.blueprint.container,
-                            org.osgi.service.blueprint.reflect,
-                            *
-                        </Import-Package>
+                        <Export-Package></Export-Package>
                         <Private-Package>org.apache.karaf.deployer.kar</Private-Package>
                     </instructions>
                 </configuration>

Modified: karaf/trunk/deployer/spring/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/deployer/spring/pom.xml?rev=1334002&r1=1334001&r2=1334002&view=diff
==============================================================================
--- karaf/trunk/deployer/spring/pom.xml (original)
+++ karaf/trunk/deployer/spring/pom.xml Fri May  4 14:48:07 2012
@@ -100,13 +100,7 @@
                         <!-- Set the blueprint.graceperiod flag to false to allow the bundle to start
                              See the blueprint config file -->
                         <Bundle-SymbolicName>${project.artifactId};blueprint.graceperiod:=false</Bundle-SymbolicName>
-                        <Import-Package>
-                            org.apache.felix.service.command;version=${felix.gogo.version};status=provisional;mandatory:=status,
-                            org.apache.aries.blueprint,
-                            org.osgi.service.blueprint.container,
-                            org.osgi.service.blueprint.reflect,
-                            *
-                        </Import-Package>
+                        <Export-Package></Export-Package>
                         <Private-Package>
                             org.apache.karaf.deployer.spring,
                             org.apache.karaf.util

Modified: karaf/trunk/deployer/wrap/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/deployer/wrap/pom.xml?rev=1334002&r1=1334001&r2=1334002&view=diff
==============================================================================
--- karaf/trunk/deployer/wrap/pom.xml (original)
+++ karaf/trunk/deployer/wrap/pom.xml Fri May  4 14:48:07 2012
@@ -83,14 +83,7 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>${project.artifactId}*;version=${project.version}</Export-Package>
-                        <Import-Package>
-                            org.apache.felix.service.command;version=${felix.gogo.version};status=provisional;mandatory:=status,
-                            org.apache.aries.blueprint,
-                            org.osgi.service.blueprint.container,
-                            org.osgi.service.blueprint.reflect,
-                            *
-                        </Import-Package>
+                        <Export-Package></Export-Package>
                         <Private-Package>
                             org.apache.karaf.deployer.wrap,
                             org.apache.karaf.util