You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2013/12/18 13:30:07 UTC

[16/50] git commit: [KARAF-2202] Define the Felix WebConsole version range

[KARAF-2202] Define the Felix WebConsole version range

git-svn-id: https://svn.apache.org/repos/asf/karaf/cellar/branches/cellar-2.2.x@1448764 13f79535-47bb-0310-9956-ffa450edef68


Project: http://git-wip-us.apache.org/repos/asf/karaf-cellar/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-cellar/commit/3cc12afe
Tree: http://git-wip-us.apache.org/repos/asf/karaf-cellar/tree/3cc12afe
Diff: http://git-wip-us.apache.org/repos/asf/karaf-cellar/diff/3cc12afe

Branch: refs/heads/cellar-2.2.x
Commit: 3cc12afe945341f7c97d1d84e73cf8e1e0755ceb
Parents: cd0b259
Author: jbonofre <jb...@13f79535-47bb-0310-9956-ffa450edef68>
Authored: Thu Feb 21 18:29:59 2013 +0000
Committer: jbonofre <jb...@13f79535-47bb-0310-9956-ffa450edef68>
Committed: Thu Feb 21 18:29:59 2013 +0000

----------------------------------------------------------------------
 webconsole/pom.xml | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/3cc12afe/webconsole/pom.xml
----------------------------------------------------------------------
diff --git a/webconsole/pom.xml b/webconsole/pom.xml
index b4924d3..379e13e 100644
--- a/webconsole/pom.xml
+++ b/webconsole/pom.xml
@@ -35,7 +35,12 @@
 
     <properties>
         <osgi.import>
-            org.apache.karaf.cellar.core*;version="${project.version}"
+            org.apache.karaf.cellar.core*;version="${project.version}",
+            org.apache.felix.webconsole;version="[3,5)",
+            org.json,
+            org.osgi.framework,
+            org.osgi.service.blueprint,
+            org.slf4j;resolution:=optional
         </osgi.import>
         <osgi.dynamic.import>javax.*,org.w3c.*,org.xml.*</osgi.dynamic.import>
         <osgi.export>
@@ -106,22 +111,6 @@
                 </includes>
             </resource>
         </resources>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <configuration>
-                    <instructions>
-                        <Import-Package>*</Import-Package>
-                        <Embed-Dependency>
-                            <!-- Required for JSON data transfer -->
-                            <!-- TODO: this needs to be put in a common place for reuse. -->
-                            json
-                        </Embed-Dependency>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
     </build>
 
 </project>