Author: olli
Date: Mon Dec 19 19:19:51 2016
New Revision: 1775160
URL: http://svn.apache.org/viewvc?rev=1775160&view=rev
Log:
make jackrabbit-oak-sling from sling-jcr-oak and adjust using features
Modified:
sling/trunk/karaf/org.apache.sling.karaf-features/src/main/feature/feature.xml
Modified:
sling/trunk/karaf/org.apache.sling.karaf-features/src/main/feature/feature.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/karaf/org.apache.sling.karaf-features/src/main/feature/feature.xml?rev=1775160&r1=1775159&r2=1775160&view=diff
==============================================================================
---
sling/trunk/karaf/org.apache.sling.karaf-features/src/main/feature/feature.xml
(original)
+++
sling/trunk/karaf/org.apache.sling.karaf-features/src/main/feature/feature.xml
Mon Dec 19 19:19:51 2016
@@ -313,6 +313,7 @@
<feature>webconsole</feature>
<feature version="${feature.version}">sling</feature>
<feature version="${feature.version}">jackrabbit-sling</feature>
+ <feature version="${feature.version}">jackrabbit-oak-sling</feature>
<feature version="${feature.version}">tika-sling</feature>
</feature>
<feature name="sling-jcr-compiler" version="${feature.version}">
@@ -329,16 +330,15 @@
<feature version="${feature.version}">sling-jcr</feature>
<feature version="${feature.version}">sling-servlets</feature>
</feature>
- <feature name="sling-jcr-oak" version="${feature.version}">
- <!-- dependencies -->
- <feature>scr</feature>
- <feature version="${feature.version}">sling-jcr</feature>
- <feature version="${feature.version}">jackrabbit-sling</feature>
- <feature version="${feature.version}">tika-sling</feature>
+ <feature name="jackrabbit-oak-sling" version="${feature.version}">
<bundle>mvn:org.apache.jackrabbit/oak-core/${org.apache.jackrabbit.oak.version}</bundle>
<bundle>mvn:org.apache.jackrabbit/oak-commons/${org.apache.jackrabbit.oak.version}</bundle>
<bundle>mvn:org.apache.jackrabbit/oak-blob/${org.apache.jackrabbit.oak.version}</bundle>
<bundle>mvn:org.apache.jackrabbit/oak-jcr/${org.apache.jackrabbit.oak.version}</bundle>
+ <!-- dependencies -->
+ <feature>scr</feature>
+ <feature version="${feature.version}">jackrabbit-sling</feature>
+ <feature version="${feature.version}">tika-sling</feature>
<bundle dependency="true">mvn:com.google.guava/guava/15.0</bundle>
<bundle
dependency="true">mvn:org.apache.felix/org.apache.felix.jaas/0.0.4</bundle>
</feature>
@@ -404,7 +404,7 @@ org.apache.karaf.features.internal.servi
<feature version="${feature.version}">sling-servlets</feature>
<!-- ... -->
<feature version="${feature.version}">sling-installer</feature>
- <feature version="${feature.version}">sling-jcr-oak</feature>
+ <feature version="${feature.version}">sling-jcr</feature>
<feature version="${feature.version}">sling-jcr-repoinit</feature>
<feature version="${feature.version}">sling-extension-adapter</feature>
<feature
version="${feature.version}">sling-extension-bundleresource</feature>
