karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject svn commit: r1461913 - /karaf/branches/karaf-2.3.x/webconsole/console/pom.xml
Date Thu, 28 Mar 2013 01:15:49 GMT
Author: jbonofre
Date: Thu Mar 28 01:15:49 2013
New Revision: 1461913

URL: http://svn.apache.org/r1461913
Log:
[KARAF-2229] Use DynamicImport in WebConsole

Modified:
    karaf/branches/karaf-2.3.x/webconsole/console/pom.xml

Modified: karaf/branches/karaf-2.3.x/webconsole/console/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/webconsole/console/pom.xml?rev=1461913&r1=1461912&r2=1461913&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/webconsole/console/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/webconsole/console/pom.xml Thu Mar 28 01:15:49 2013
@@ -35,6 +35,8 @@
 
     <properties>
         <appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
+        <org.json.version>20070829</org.json.version>
+        <org.json.version.osgi>0.0.0.${org.json.version}</org.json.version.osgi>
     </properties>
 
     <dependencies>
@@ -77,7 +79,7 @@
         <dependency>
             <groupId>org.json</groupId>
             <artifactId>json</artifactId>
-            <version>20070829</version>
+            <version>${org.json.version}</version>
             <scope>provided</scope>
             <optional>true</optional>
         </dependency>
@@ -127,18 +129,21 @@
                             org.apache.felix.webconsole.*;-split-package:=merge-first
                         </Private-Package>
                         <Import-Package>
-                            org.osgi.service.metatype;version=1.0,
-                            org.apache.felix.scr;version=1.0;resolution:=optional,
-                            org.osgi.service.http,
-                            org.apache.felix.shell;
-                            org.osgi.service.*;resolution:=optional,
+                            org.osgi.service.metatype;resolution:=optional,
+                            org.osgi.service.prefs;resolution:=optional,
                             javax.portlet;resolution:=optional,
-                            javax.servlet.*;version=2.4,
+                            javax.servlet.*,
                             *
                         </Import-Package>
                         <DynamicImport-Package>
                             org.apache.felix.bundlerepository,
-                            org.osgi.service.obr
+                            org.osgi.service.obr,
+                            org.osgi.service.cm,
+                            org.osgi.service.condpermadmin,
+                            org.osgi.service.log,
+                            org.osgi.service.metatype,
+                            org.osgi.service.permissionadmin,
+                            org.osgi.service.wireadmin
                         </DynamicImport-Package>
                         <Embed-Dependency>
                             <!-- Webconsole -->



Mime
View raw message