Author: olli
Date: Fri Jan 15 11:10:15 2016
New Revision: 1724774
URL: http://svn.apache.org/viewvc?rev=1724774&view=rev
Log:
SLING-4412 Upgrade Karaf to 4.0
adjust feature sling-launchpad-oak to Karaf 4.0.4
Modified:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml
Modified:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml?rev=1724774&r1=1724773&r2=1724774&view=diff
==============================================================================
---
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml
(original)
+++
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml
Fri Jan 15 11:10:15 2016
@@ -283,15 +283,10 @@
<feature version="${feature.version}">sling-installer</feature>
<feature version="${feature.version}">sling-extension-adapter</feature>
<feature
version="${feature.version}">sling-extension-bundleresource</feature>
- <bundle
dependency="true">mvn:org.apache.felix/org.apache.felix.inventory/1.0.4</bundle>
<bundle
dependency="true">mvn:org.apache.felix/org.apache.felix.prefs/1.0.6</bundle>
- <bundle
dependency="true">mvn:org.apache.felix/org.apache.felix.webconsole.plugins.event/1.1.4</bundle>
- <!-- TODO issue with Karaf Web Console?-->
- <!--
- <bundle
dependency="true">mvn:org.apache.felix/org.apache.felix.webconsole.plugins.ds/2.0.2</bundle>
+ <!-- TODO both plugins do not get installed with feature -->
<bundle
dependency="true">mvn:org.apache.felix/org.apache.felix.webconsole.plugins.memoryusage/1.0.6</bundle>
<bundle
dependency="true">mvn:org.apache.felix/org.apache.felix.webconsole.plugins.packageadmin/1.0.2</bundle>
- -->
</feature>
<feature name="sling-launchpad-oak-tar" version="${feature.version}">
<config
name="org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService">
