karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject karaf git commit: KARAF-4252 - Add felix inventory bundle in scr feature, required by DS WebConsole plugin
Date Wed, 06 Jan 2016 20:22:36 GMT
Repository: karaf
Updated Branches:
  refs/heads/master 84fdb7efc -> 747f8d9b9


KARAF-4252 - Add felix inventory bundle in scr feature, required by DS WebConsole plugin


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

Branch: refs/heads/master
Commit: 747f8d9b9745072a631acc8e2e4d9ce7c1d49fea
Parents: 84fdb7e
Author: Jean-Baptiste Onofré <jbonofre@apache.org>
Authored: Wed Jan 6 21:21:54 2016 +0100
Committer: Jean-Baptiste Onofré <jbonofre@apache.org>
Committed: Wed Jan 6 21:21:54 2016 +0100

----------------------------------------------------------------------
 assemblies/features/standard/src/main/feature/feature.xml | 1 +
 pom.xml                                                   | 1 +
 2 files changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/747f8d9b/assemblies/features/standard/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/standard/src/main/feature/feature.xml b/assemblies/features/standard/src/main/feature/feature.xml
index 5413c3f..9ad1051 100644
--- a/assemblies/features/standard/src/main/feature/feature.xml
+++ b/assemblies/features/standard/src/main/feature/feature.xml
@@ -531,6 +531,7 @@
         </conditional>
         <conditional>
             <condition>webconsole</condition>
+            <bundle start-level="30">mvn:org.apache.felix/org.apache.felix.inventory/${felix.inventory.version}</bundle>
             <bundle start-level="30">mvn:org.apache.felix/org.apache.felix.webconsole.plugins.ds/${felix.scr.webconsole.plugin.version}</bundle>
         </conditional>
         <conditional>

http://git-wip-us.apache.org/repos/asf/karaf/blob/747f8d9b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 486eb6a..e93f58f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -185,6 +185,7 @@
         <felix.framework.version>5.4.0</felix.framework.version>
         <felix.framework.security.version>2.4.0</felix.framework.security.version>
         <felix.gogo.version>0.16.2</felix.gogo.version>
+        <felix.inventory.version>1.0.4</felix.inventory.version>
         <felix.plugin.version>3.0.1</felix.plugin.version>
         <felix.utils.version>1.8.0</felix.utils.version>
         <felix.webconsole.version>4.2.14</felix.webconsole.version>


Mime
View raw message