Author: olli
Date: Fri Mar 10 18:53:11 2017
New Revision: 1786415
URL: http://svn.apache.org/viewvc?rev=1786415&view=rev
Log:
SLING-3027 Improve Launchpad Karaf Features
move oak-lucene back to sling-launchpad-oak-* (prevents reconfiguration issues
in integration tests and writing to
${project.basedir}/sling/repository/index/indexWriterDir)
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=1786415&r1=1786414&r2=1786415&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
Fri Mar 10 18:53:11 2017
@@ -414,12 +414,14 @@
<feature name="sling-launchpad-oak-tar" version="${project.version}">
<configfile
finalname="/etc/org.apache.jackrabbit.oak.segment.SegmentNodeStoreService.config">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.jackrabbit.oak.segment.SegmentNodeStoreService</configfile>
<feature version="${project.version}">sling-launchpad-oak</feature>
+
<bundle>mvn:org.apache.jackrabbit/oak-lucene/${org.apache.jackrabbit.oak.version}</bundle>
<bundle>mvn:org.apache.jackrabbit/oak-segment-tar/${org.apache.jackrabbit.oak.version}</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.oak.server/1.1.3-SNAPSHOT</bundle>
</feature>
<feature name="sling-launchpad-oak-mongo" version="${project.version}">
<configfile
finalname="/etc/org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService.config">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService</configfile>
<feature version="${project.version}">sling-launchpad-oak</feature>
+
<bundle>mvn:org.apache.jackrabbit/oak-lucene/${org.apache.jackrabbit.oak.version}</bundle>
<bundle>mvn:org.mongodb/mongo-java-driver/3.4.2</bundle>
<bundle>mvn:com.h2database/h2-mvstore/1.4.193</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.oak.server/1.1.3-SNAPSHOT</bundle>
@@ -559,7 +561,6 @@
<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>
-
<bundle>mvn:org.apache.jackrabbit/oak-lucene/${org.apache.jackrabbit.oak.version}</bundle>
<!-- dependencies -->
<feature>scr</feature>
<feature version="${project.version}">jackrabbit-sling</feature>
