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/07/23 17:48:38 UTC
svn commit: r1692412 -
/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml
Author: olli
Date: Thu Jul 23 15:48:38 2015
New Revision: 1692412
URL: http://svn.apache.org/r1692412
Log:
SLING-3027 move features sling-extension-i18n, sling-extension-xss, sling-jcr-compiler and sling-scripting-sightly up from contrib and reorder alphabetically
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=1692412&r1=1692411&r2=1692412&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 Jul 23 15:48:38 2015
@@ -129,6 +129,11 @@
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
</feature>
+ <feature name="sling-extension-i18n" version="${project.version}">
+ <bundle>mvn:org.apache.sling/org.apache.sling.i18n/2.3.2</bundle>
+ <!-- dependencies -->
+ <feature version="${project.version}">sling</feature>
+ </feature>
<feature name="sling-extension-jmx-provider" version="${project.version}">
<bundle>mvn:org.apache.sling/org.apache.sling.jmx.provider/1.0.2</bundle>
<!-- dependencies -->
@@ -156,6 +161,12 @@
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
</feature>
+ <feature name="sling-extension-xss" version="${project.version}">
+ <bundle>mvn:org.apache.sling/org.apache.sling.xss/1.0.2</bundle>
+ <!-- dependencies -->
+ <feature version="${project.version}">sling</feature>
+ <bundle>mvn:org.apache.geronimo.bundles/commons-httpclient/3.1_2</bundle>
+ </feature>
<!-- Apache Sling Installer -->
<feature name="sling-installer" version="${project.version}">
<bundle>mvn:org.apache.sling/org.apache.sling.installer.console/1.0.0</bundle>
@@ -175,6 +186,54 @@
<feature version="${project.version}">sling-installer</feature>
<feature version="${project.version}">sling-jcr</feature>
</feature>
+ <!-- Apache Sling JCR -->
+ <feature name="sling-jcr" version="${project.version}">
+ <bundle>mvn:org.apache.sling/org.apache.sling.jcr.api/2.2.0</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.jcr.base/2.2.2</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.jcr.classloader/3.2.2</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.jcr.contentloader/2.1.10</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.jcr.davex/1.2.2</bundle>
+ <!-- (not using org.apache.sling.jcr.jcr-wrapper) -->
+ <bundle>mvn:org.apache.sling/org.apache.sling.jcr.registration/1.0.2</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.jcr.resource/2.5.4</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.jcr.webconsole/1.0.2</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.jcr.webdav/2.2.2</bundle>
+ <!-- dependencies -->
+ <feature>webconsole</feature>
+ <feature version="${project.version}">sling</feature>
+ <feature version="${project.version}">jackrabbit-sling</feature>
+ <feature version="${project.version}">tika-sling</feature>
+ </feature>
+ <feature name="sling-jcr-compiler" version="${project.version}">
+ <bundle>mvn:org.apache.sling/org.apache.sling.jcr.compiler/2.1.0</bundle>
+ <!-- dependencies -->
+ <feature version="${project.version}">sling</feature>
+ <feature version="${project.version}">sling-jcr</feature>
+ </feature>
+ <!-- Apache Sling JCR Jackrabbit -->
+ <feature name="sling-jcr-jackrabbit" version="${project.version}">
+ <bundle>mvn:org.apache.sling/org.apache.sling.jcr.jackrabbit.server/2.2.0</bundle>
+ <!-- dependencies -->
+ <feature version="${project.version}">sling-jcr</feature>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.concurrent/1.3.4_1</bundle>
+ <bundle>mvn:commons-pool/commons-pool/1.6</bundle>
+ </feature>
+ <!-- Apache Sling JCR Jackrabbit Security -->
+ <feature name="sling-jcr-jackrabbit-security" version="${project.version}">
+ <bundle>mvn:org.apache.sling/org.apache.sling.jcr.jackrabbit.accessmanager/2.1.2</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.jcr.jackrabbit.usermanager/2.2.2</bundle>
+ <!-- dependencies -->
+ <feature version="${project.version}">sling-jcr-jackrabbit</feature>
+ <feature version="${project.version}">sling-servlets</feature>
+ </feature>
+ <!-- Apache Sling JCR Oak -->
+ <feature name="sling-jcr-oak" version="${project.version}">
+ <bundle>mvn:org.apache.sling/org.apache.sling.jcr.oak.server/0.0.2-SNAPSHOT</bundle>
+ <!-- dependencies -->
+ <feature version="${project.version}">sling-jcr</feature>
+ <feature version="${project.version}">oak-sling</feature>
+ <bundle>mvn:org.apache.felix/org.apache.felix.jaas/0.0.2</bundle>
+ </feature>
<!-- Apache Sling Launchpad -->
<feature name="sling-launchpad-content" version="${project.version}">
<bundle>mvn:org.apache.sling/org.apache.sling.launchpad.content/2.0.8</bundle>
@@ -256,48 +315,6 @@
<feature version="${project.version}">sling-launchpad-oak</feature>
<bundle>mvn:org.mongodb/mongo-java-driver/2.13.1</bundle>
</feature>
- <!-- Apache Sling JCR -->
- <feature name="sling-jcr" version="${project.version}">
- <bundle>mvn:org.apache.sling/org.apache.sling.jcr.api/2.2.0</bundle>
- <bundle>mvn:org.apache.sling/org.apache.sling.jcr.base/2.2.2</bundle>
- <bundle>mvn:org.apache.sling/org.apache.sling.jcr.classloader/3.2.2</bundle>
- <bundle>mvn:org.apache.sling/org.apache.sling.jcr.contentloader/2.1.10</bundle>
- <bundle>mvn:org.apache.sling/org.apache.sling.jcr.davex/1.2.2</bundle>
- <!-- (not using org.apache.sling.jcr.jcr-wrapper) -->
- <bundle>mvn:org.apache.sling/org.apache.sling.jcr.registration/1.0.2</bundle>
- <bundle>mvn:org.apache.sling/org.apache.sling.jcr.resource/2.5.4</bundle>
- <bundle>mvn:org.apache.sling/org.apache.sling.jcr.webconsole/1.0.2</bundle>
- <bundle>mvn:org.apache.sling/org.apache.sling.jcr.webdav/2.2.2</bundle>
- <!-- dependencies -->
- <feature>webconsole</feature>
- <feature version="${project.version}">sling</feature>
- <feature version="${project.version}">jackrabbit-sling</feature>
- <feature version="${project.version}">tika-sling</feature>
- </feature>
- <!-- Apache Sling JCR Jackrabbit -->
- <feature name="sling-jcr-jackrabbit" version="${project.version}">
- <bundle>mvn:org.apache.sling/org.apache.sling.jcr.jackrabbit.server/2.2.0</bundle>
- <!-- dependencies -->
- <feature version="${project.version}">sling-jcr</feature>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.concurrent/1.3.4_1</bundle>
- <bundle>mvn:commons-pool/commons-pool/1.6</bundle>
- </feature>
- <!-- Apache Sling JCR Oak -->
- <feature name="sling-jcr-oak" version="${project.version}">
- <bundle>mvn:org.apache.sling/org.apache.sling.jcr.oak.server/0.0.2-SNAPSHOT</bundle>
- <!-- dependencies -->
- <feature version="${project.version}">sling-jcr</feature>
- <feature version="${project.version}">oak-sling</feature>
- <bundle>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}">
- <bundle>mvn:org.apache.sling/org.apache.sling.jcr.jackrabbit.accessmanager/2.1.2</bundle>
- <bundle>mvn:org.apache.sling/org.apache.sling.jcr.jackrabbit.usermanager/2.2.2</bundle>
- <!-- dependencies -->
- <feature version="${project.version}">sling-jcr-jackrabbit</feature>
- <feature version="${project.version}">sling-servlets</feature>
- </feature>
<!-- Apache Sling Scripting -->
<feature name="sling-scripting" version="${project.version}">
<bundle>mvn:org.apache.sling/org.apache.sling.scripting.api/2.1.8</bundle>
@@ -318,6 +335,18 @@
<!-- dependencies -->
<feature version="${project.version}">sling-scripting</feature>
</feature>
+ <feature name="sling-scripting-sightly" version="${project.version}">
+ <bundle>mvn:org.apache.sling/org.apache.sling.scripting.sightly/1.0.2</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.scripting.sightly.js.provider/1.0.6</bundle>
+ <!-- dependencies -->
+ <feature version="${project.version}">sling</feature>
+ <feature version="${project.version}">sling-jcr</feature>
+ <feature version="${project.version}">sling-scripting</feature>
+ <feature version="${project.version}">sling-extension-i18n</feature>
+ <feature version="${project.version}">sling-extension-xss</feature>
+ <feature version="${project.version}">sling-jcr-compiler</feature>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.rhino/1.7R5_1</bundle>
+ </feature>
<!-- Apache Sling Servlets -->
<feature name="sling-servlets" version="${project.version}">
<bundle>mvn:org.apache.sling/org.apache.sling.servlets.get/2.1.12</bundle>
@@ -420,11 +449,6 @@
<feature version="${project.version}">sling-jcr</feature>
<feature version="${project.version}">sling-scripting</feature>
</feature>
- <feature name="sling-extension-i18n" version="${project.version}">
- <bundle>mvn:org.apache.sling/org.apache.sling.i18n/2.3.2</bundle>
- <!-- dependencies -->
- <feature version="${project.version}">sling</feature>
- </feature>
<feature name="sling-extension-query" version="${project.version}">
<bundle>mvn:org.apache.sling/org.apache.sling.query/3.0.0</bundle>
<!-- dependencies -->
@@ -446,19 +470,6 @@
<feature version="${project.version}">sling</feature>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.urlrewritefilter/4.0.4_1</bundle>
</feature>
- <feature name="sling-extension-xss" version="${project.version}">
- <bundle>mvn:org.apache.sling/org.apache.sling.xss/1.0.2</bundle>
- <!-- dependencies -->
- <feature version="${project.version}">sling</feature>
- <bundle>mvn:org.apache.geronimo.bundles/commons-httpclient/3.1_2</bundle>
- </feature>
- <!-- Apache Sling JCR (contrib) -->
- <feature name="sling-jcr-compiler" version="${project.version}">
- <bundle>mvn:org.apache.sling/org.apache.sling.jcr.compiler/2.1.0</bundle>
- <!-- dependencies -->
- <feature version="${project.version}">sling</feature>
- <feature version="${project.version}">sling-jcr</feature>
- </feature>
<!-- Apache Sling Scripting (contrib) -->
<feature name="sling-scripting-groovy" version="${project.version}">
<bundle>mvn:org.apache.sling/org.apache.sling.scripting.groovy/1.0.0</bundle>
@@ -474,18 +485,6 @@
<feature version="${project.version}">sling-scripting</feature>
<bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/1.0</bundle>
</feature>
- <feature name="sling-scripting-sightly" version="${project.version}">
- <bundle>mvn:org.apache.sling/org.apache.sling.scripting.sightly/1.0.2</bundle>
- <bundle>mvn:org.apache.sling/org.apache.sling.scripting.sightly.js.provider/1.0.6</bundle>
- <!-- dependencies -->
- <feature version="${project.version}">sling</feature>
- <feature version="${project.version}">sling-jcr</feature>
- <feature version="${project.version}">sling-scripting</feature>
- <feature version="${project.version}">sling-extension-i18n</feature>
- <feature version="${project.version}">sling-extension-xss</feature>
- <feature version="${project.version}">sling-jcr-compiler</feature>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.rhino/1.7R5_1</bundle>
- </feature>
<feature name="sling-scripting-thymeleaf" version="${project.version}">
<bundle>mvn:org.apache.sling/org.apache.sling.scripting.thymeleaf/0.0.6</bundle>
<!-- dependencies -->