You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2015/02/12 11:28:42 UTC
svn commit: r1659202 -
/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml
Author: olli
Date: Thu Feb 12 10:28:41 2015
New Revision: 1659202
URL: http://svn.apache.org/r1659202
Log:
SLING-4411 provide Oak features
* update Jackrabbit
* update Tika
* add oak-sling
* add sling-jcr-oak
* add sling-launchpad-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=1659202&r1=1659201&r2=1659202&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 Feb 12 10:28:41 2015
@@ -180,6 +180,23 @@
<feature version="${project.version}">sling-extension-adapter</feature>
<feature version="${project.version}">sling-extension-bundleresource</feature>
</feature>
+ <feature name="sling-launchpad-oak" version="${project.version}">
+ <!-- Sling with Oak Repository and Felix Web Console -->
+ <config name="org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService">
+ name=Default\ NodeStore
+ repository.home=sling/oak/repository
+ </config>
+ <feature version="${project.version}">infrastructure-sling</feature>
+ <feature version="${project.version}">webconsole-sling</feature>
+ <feature version="${project.version}">sling</feature>
+ <feature version="${project.version}">sling-servlets</feature>
+ <feature version="${project.version}">sling-jcr-oak</feature>
+ <!-- ... -->
+ <feature version="${project.version}">sling-fragments</feature>
+ <feature version="${project.version}">sling-installer</feature>
+ <feature version="${project.version}">sling-extension-adapter</feature>
+ <feature version="${project.version}">sling-extension-bundleresource</feature>
+ </feature>
<!-- Apache Sling JCR -->
<feature name="sling-jcr" version="${project.version}">
<feature version="${project.version}">sling</feature>
@@ -206,6 +223,14 @@
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.concurrent/1.3.4_1</bundle>
<bundle dependency="true">mvn:commons-pool/commons-pool/1.6</bundle>
</feature>
+ <!-- Apache Sling JCR Oak -->
+ <feature name="sling-jcr-oak" version="${project.version}">
+ <feature version="${project.version}">sling-jcr</feature>
+ <feature version="${project.version}">oak-sling</feature>
+ <bundle>mvn:org.apache.sling/org.apache.sling.jcr.oak.server/0.0.2-SNAPSHOT</bundle>
+ <!-- bundle dependencies -->
+ <bundle dependency="true">mvn:org.apache.felix/org.apache.felix.jaas/0.0.2</bundle>
+ </feature>
<!-- Apache Sling JCR Jackrabbit Security -->
<feature name="sling-jcr-jackrabbit-security" version="${project.version}">
<feature version="${project.version}">sling-jcr-jackrabbit</feature>
@@ -242,12 +267,12 @@
<!-- Apache Jackrabbit -->
<feature name="jackrabbit-sling" version="${project.version}">
<feature version="${project.version}">commons-sling</feature>
- <bundle dependency="true">mvn:org.apache.jackrabbit/jackrabbit-api/2.6.5</bundle>
- <bundle dependency="true">mvn:org.apache.jackrabbit/jackrabbit-jcr-commons/2.6.5</bundle>
- <bundle dependency="true">mvn:org.apache.jackrabbit/jackrabbit-jcr-rmi/2.6.5</bundle>
- <bundle dependency="true">mvn:org.apache.jackrabbit/jackrabbit-spi/2.6.5</bundle>
- <bundle dependency="true">mvn:org.apache.jackrabbit/jackrabbit-spi-commons/2.6.5</bundle>
- <bundle dependency="true">mvn:org.apache.jackrabbit/jackrabbit-webdav/2.6.5</bundle>
+ <bundle dependency="true">mvn:org.apache.jackrabbit/jackrabbit-api/2.8.0</bundle>
+ <bundle dependency="true">mvn:org.apache.jackrabbit/jackrabbit-jcr-commons/2.8.0</bundle>
+ <bundle dependency="true">mvn:org.apache.jackrabbit/jackrabbit-jcr-rmi/2.8.0</bundle>
+ <bundle dependency="true">mvn:org.apache.jackrabbit/jackrabbit-spi/2.8.0</bundle>
+ <bundle dependency="true">mvn:org.apache.jackrabbit/jackrabbit-spi-commons/2.8.0</bundle>
+ <bundle dependency="true">mvn:org.apache.jackrabbit/jackrabbit-webdav/2.8.0</bundle>
<!-- bundle dependencies -->
<bundle dependency="true">mvn:javax.jcr/jcr/2.0</bundle>
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-annotation_1.1_spec/1.0.1</bundle>
@@ -257,10 +282,25 @@
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jcdi_1.0_spec/1.0</bundle>
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
</feature>
+ <!-- Apache Jackrabbit Oak-->
+ <feature name="oak-sling" version="${project.version}">
+ <feature>scr</feature>
+ <feature version="${project.version}">jackrabbit-sling</feature>
+ <feature version="${project.version}">tika-sling</feature>
+ <bundle>mvn:org.apache.jackrabbit/oak-core/1.0.11</bundle>
+ <bundle>mvn:org.apache.jackrabbit/oak-commons/1.0.11</bundle>
+ <bundle>mvn:org.apache.jackrabbit/oak-mk/1.0.11</bundle>
+ <bundle>mvn:org.apache.jackrabbit/oak-mk-api/1.0.11</bundle>
+ <bundle>mvn:org.apache.jackrabbit/oak-mk-remote/1.0.11</bundle>
+ <bundle>mvn:org.apache.jackrabbit/oak-lucene/1.0.11</bundle>
+ <bundle>mvn:org.apache.jackrabbit/oak-blob/1.0.11</bundle>
+ <!-- bundle dependencies -->
+ <bundle dependency="true">mvn:com.google.guava/guava/15.0</bundle>
+ </feature>
<!-- Apache Tika -->
<feature name="tika-sling" version="${project.version}">
- <bundle dependency="true">mvn:org.apache.tika/tika-bundle/1.2</bundle>
- <bundle dependency="true">mvn:org.apache.tika/tika-core/1.2</bundle>
+ <bundle dependency="true">mvn:org.apache.tika/tika-bundle/1.7</bundle>
+ <bundle dependency="true">mvn:org.apache.tika/tika-core/1.7</bundle>
</feature>
<!-- Apache Sling Auth (contrib) -->
<feature name="sling-auth-xing-login" version="0.0.2">