commit 35ddac28c5bb42a968e276e265a7ec9638ec74e0
author Felix Meschberger <fmeschbe@apache.org> Mon Mar 22 15:31:13 2010 +0000
committer Felix Meschberger <fmeschbe@apache.org> Mon Mar 22 15:31:13 2010 +0000
tree cadbd04705b710f05692b16a14bd60a91b016c89
parent 217ed2d4c7c428060ba4d7a721071f9a5dbfd03f

FELIX-2217 Enhance OBR support to accomodate both the "old" OSGi OBR API and the "new" Apache Felix OBR API

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@926131 13f79535-47bb-0310-9956-ffa450edef68

webconsole/pom.xml

diff --git a/webconsole/pom.xml b/webconsole/pom.xml
index 64c97d3..d1886d9 100644
--- a/webconsole/pom.xml
+++ b/webconsole/pom.xml
@@ -92,18 +92,18 @@
                             org.osgi.service.http,
                             org.apache.felix.scr;
                             org.apache.felix.shell;
-                            org.apache.felix.bundlerepository;
                             org.osgi.service.*;resolution:=optional,
                             javax.portlet;resolution:=optional,
                             javax.servlet.*;version=2.4,
                             *
                         </Import-Package>
+                        <DynamicImport-Package>
+                            org.apache.felix.bundlerepository,
+                            org.osgi.service.obr
+                        </DynamicImport-Package>
                         <Embed-Dependency>
                             <!-- Import/Export-Package parsing -->
-                            org.apache.felix.bundlerepository;
-                                inline=org/apache/felix/bundlerepository/impl/R4*.class|
-                                    org/apache/felix/bundlerepository/impl/Util.class|
-                                    org/apache/felix/bundlerepository/impl/VersionRange.class,
+                            org.apache.felix.utils;inline=org/apache/felix/utils/manifest/**,
                             
                             <!-- ServiceTracker -->
                             org.osgi.compendium;
@@ -166,10 +166,7 @@
                                         <_donotcopy>LICENSE.json</_donotcopy>
                                         <!-- <_donotcopy>(LICENSE.json|NOTICE.bare)</_donotcopy> -->
                                         <Embed-Dependency>
-                                            org.apache.felix.bundlerepository;
-                                                inline=org/apache/felix/bundlerepository/impl/R4*.class|
-                                                    org/apache/felix/bundlerepository/impl/Util.class|
-                                                    org/apache/felix/bundlerepository/impl/VersionRange.class
+                                            org.apache.felix.utils;inline=org/apache/felix/utils/manifest/**
                                         </Embed-Dependency>
                                     </instructions>
                                 </configuration>
@@ -236,11 +233,26 @@
         <!--  Parsing Import/Export-Package headers -->
         <dependency>
             <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.bundlerepository</artifactId>
-            <version>1.5.0-SNAPSHOT</version>
-            <scope>compile</scope>
+            <artifactId>org.apache.felix.utils</artifactId>
+            <version>0.1.0-SNAPSHOT</version>
+            <scope>provided</scope>
             <optional>true</optional>
         </dependency>
-
+        
+        <!-- OSGi and Apache Felix OBR API -->
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.osgi.service.obr</artifactId>
+            <version>1.0.2</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.bundlerepository</artifactId>
+            <version>1.5.0-SNAPSHOT</version>
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency>
+        
     </dependencies>
 </project>