Author: olli
Date: Thu Jun 23 12:54:46 2016
New Revision: 1749876
URL: http://svn.apache.org/viewvc?rev=1749876&view=rev
Log:
SLING-4411 Provide Oak features
remove feature oak-sling and move Oak bundles and dependencies to feature
sling-jcr-oak
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=1749876&r1=1749875&r2=1749876&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
Thu Jun 23 12:54:46 2016
@@ -259,10 +259,18 @@
<feature name="sling-jcr-oak" version="${feature.version}">
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.oak.server/1.0.1-SNAPSHOT</bundle>
<!-- dependencies -->
+ <feature>scr</feature>
<feature version="${feature.version}">sling-jcr</feature>
- <feature version="${feature.version}">oak-sling</feature>
- <bundle
dependency="true">mvn:org.apache.jackrabbit/oak-lucene/${org.apache.jackrabbit.oak.version}</bundle>
+ <feature version="${feature.version}">jackrabbit-sling</feature>
+ <feature version="${feature.version}">tika-sling</feature>
+ <bundle
dependency="true">mvn:org.apache.jackrabbit/oak-core/${org.apache.jackrabbit.oak.version}</bundle>
+ <bundle
dependency="true">mvn:org.apache.jackrabbit/oak-commons/${org.apache.jackrabbit.oak.version}</bundle>
+ <bundle
dependency="true">mvn:org.apache.jackrabbit/oak-blob/${org.apache.jackrabbit.oak.version}</bundle>
+ <bundle
dependency="true">mvn:org.apache.jackrabbit/oak-jcr/${org.apache.jackrabbit.oak.version}</bundle>
+ <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>
+ <!-- TODO SLING-5796 Make Oak Lucene optional -->
+ <bundle
dependency="true">mvn:org.apache.jackrabbit/oak-lucene/${org.apache.jackrabbit.oak.version}</bundle>
</feature>
<!-- Apache Sling Launchpad -->
<feature name="sling-launchpad-content" version="${feature.version}">
@@ -418,18 +426,6 @@
<bundle
dependency="true">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
<bundle
dependency="true">mvn:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/1.0</bundle>
</feature>
- <!-- Apache Jackrabbit Oak -->
- <feature name="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>
- </feature>
<!-- Apache Tika -->
<feature name="tika-sling" version="${feature.version}">
<bundle>mvn:org.apache.tika/tika-core/${org.apache.tika.version}</bundle>
