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:25 UTC
[34/50] git commit: [KARAF-2277] Embed json in Cellar WebConsole
plugin
[KARAF-2277] Embed json in Cellar WebConsole plugin
git-svn-id: https://svn.apache.org/repos/asf/karaf/cellar/branches/cellar-2.2.x@1469849 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/444e8c96
Tree: http://git-wip-us.apache.org/repos/asf/karaf-cellar/tree/444e8c96
Diff: http://git-wip-us.apache.org/repos/asf/karaf-cellar/diff/444e8c96
Branch: refs/heads/cellar-2.2.x
Commit: 444e8c960c945ac66b9b95fcdfb339bb61255aec
Parents: acae4ca
Author: jbonofre <jb...@13f79535-47bb-0310-9956-ffa450edef68>
Authored: Fri Apr 19 14:30:09 2013 +0000
Committer: jbonofre <jb...@13f79535-47bb-0310-9956-ffa450edef68>
Committed: Fri Apr 19 14:30:09 2013 +0000
----------------------------------------------------------------------
pom.xml | 1 +
webconsole/pom.xml | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/444e8c96/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6c61930..352908f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -498,6 +498,7 @@
<Require-Bundle>${osgi.bundles}</Require-Bundle>
<Export-Service>${osgi.export.service}</Export-Service>
<Fragment-Host>${osgi.fragment.host}</Fragment-Host>
+ <Embed-Dependency>${osgi.embed.dependency}</Embed-Dependency>
</instructions>
<supportedProjectTypes>
<supportedProjectType>jar</supportedProjectType>
http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/444e8c96/webconsole/pom.xml
----------------------------------------------------------------------
diff --git a/webconsole/pom.xml b/webconsole/pom.xml
index 379e13e..ce478e6 100644
--- a/webconsole/pom.xml
+++ b/webconsole/pom.xml
@@ -37,7 +37,6 @@
<osgi.import>
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
@@ -46,6 +45,7 @@
<osgi.export>
org.apache.karaf.cellar.webconsole*;version="${project.version}"
</osgi.export>
+ <osgi.embed.dependency>json</osgi.embed.dependency>
</properties>
<dependencies>