Author: olli Date: Sat Mar 15 19:59:09 2014 New Revision: 1577928 URL: http://svn.apache.org/r1577928 Log: SLING-3027 update and improve features
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=1577928&r1=1577927&r2=1577928&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 Sat Mar 15 19:59:09 2014 @@ -11,14 +11,10 @@ <feature>http-whiteboard</feature> <bundle dependency="true">mvn:org.apache.felix/org.apache.felix.inventory/1.0.0</bundle> </feature> - <!-- javax --> - <feature name="javax-sling" version="${project.version}"> - <bundle dependency="true">mvn:javax.jcr/jcr/2.0</bundle> - </feature> <!-- Apache Felix Webconsole --> <feature name="webconsole-sling" version="${project.version}"> <feature>commons-sling</feature> - <bundle dependency="true">mvn:org.apache.felix/org.apache.felix.webconsole/4.2.0</bundle> + <bundle dependency="true">mvn:org.apache.felix/org.apache.felix.webconsole/4.2.2</bundle> <bundle dependency="true">mvn:org.apache.felix/org.apache.felix.webconsole.plugins.ds/1.0.0</bundle> <bundle dependency="true">mvn:org.apache.felix/org.apache.felix.webconsole.plugins.event/1.1.0</bundle> <bundle dependency="true">mvn:org.apache.felix/org.apache.felix.webconsole.plugins.memoryusage/1.0.4</bundle> @@ -34,6 +30,8 @@ <bundle dependency="true">mvn:commons-lang/commons-lang/2.6</bundle> <bundle dependency="true">mvn:org.apache.commons/commons-math/2.2</bundle> <bundle dependency="true">mvn:org.apache.geronimo.bundles/commons-httpclient/3.1_2</bundle> + <!-- bundle dependencies (commons-fileupload) --> + <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/1.0</bundle> </feature> <!-- Apache Derby --> <feature name="derby-sling" version="${project.version}"> @@ -43,12 +41,12 @@ <feature name="sling" version="${project.version}"> <feature version="${project.version}">infrastructure-sling</feature> <feature version="${project.version}">commons-sling</feature> - <feature version="${project.version}">javax-sling</feature> - <bundle>mvn:org.apache.sling/org.apache.sling.api/2.4.2</bundle> - <bundle>mvn:org.apache.sling/org.apache.sling.auth.core/1.1.4</bundle> - <bundle>mvn:org.apache.sling/org.apache.sling.engine/2.2.10</bundle> + <bundle>mvn:org.apache.sling/org.apache.sling.api/2.6.0</bundle> + <bundle>mvn:org.apache.sling/org.apache.sling.auth.core/1.1.6</bundle> + <bundle>mvn:org.apache.sling/org.apache.sling.engine/2.3.2</bundle> <!-- org.apache.sling.resourceresolver requires jcr --> - <bundle>mvn:org.apache.sling/org.apache.sling.resourceresolver/1.0.6</bundle> + <bundle>mvn:org.apache.sling/org.apache.sling.resourceresolver/1.0.7-SNAPSHOT</bundle> + <bundle>mvn:org.apache.sling/org.apache.sling.serviceusermapper/1.0.0</bundle> <bundle>mvn:org.apache.sling/org.apache.sling.settings/1.3.0</bundle> <!-- Apache Sling Commons --> <bundle>mvn:org.apache.sling/org.apache.sling.commons.classloader/1.3.0</bundle> @@ -64,7 +62,8 @@ <!-- Apache Sling Launchpad --> <bundle>mvn:org.apache.sling/org.apache.sling.launchpad.api/1.1.0</bundle> <bundle>mvn:org.apache.sling/org.apache.sling.launchpad.karaf/${project.version}</bundle> - <!-- json --> + <!-- bundle dependencies --> + <bundle dependency="true">mvn:javax.jcr/jcr/2.0</bundle> <bundle dependency="true">mvn:org.apache.geronimo.bundles/json/20090211_1</bundle> </feature> <!-- Apache Sling Auth --> @@ -77,7 +76,8 @@ <bundle>mvn:org.apache.sling/org.apache.sling.auth.openid/1.0.2</bundle> </feature> <feature name="sling-auth-selector" version="${project.version}"> - <feature version="${project.version}">sling</feature> + <feature version="${project.version}">sling-auth-form</feature> + <feature version="${project.version}">sling-auth-openid</feature> <bundle>mvn:org.apache.sling/org.apache.sling.auth.selector/1.0.4</bundle> </feature> <!-- Apache Sling Extensions --> @@ -87,7 +87,7 @@ </feature> <feature name="sling-extension-bundleresource" version="${project.version}"> <feature version="${project.version}">sling</feature> - <bundle>mvn:org.apache.sling/org.apache.sling.bundleresource.impl/2.1.2</bundle> + <bundle>mvn:org.apache.sling/org.apache.sling.bundleresource.impl/2.2.0</bundle> </feature> <feature name="sling-extension-discovery" version="${project.version}"> <feature version="${project.version}">sling</feature> @@ -95,16 +95,19 @@ <bundle>mvn:org.apache.sling/org.apache.sling.discovery.support/1.0.0</bundle> </feature> <feature name="sling-extension-discovery-impl" version="${project.version}"> - <feature>sling-extension-discovery</feature> - <bundle>mvn:org.apache.sling/org.apache.sling.discovery.impl/1.0.2</bundle> + <feature version="${project.version}">webconsole-sling</feature> + <feature version="${project.version}">sling-extension-discovery</feature> + <bundle>mvn:org.apache.sling/org.apache.sling.discovery.impl/1.0.4</bundle> </feature> <feature name="sling-extension-discovery-standalone" version="${project.version}"> <feature version="${project.version}">sling-extension-discovery</feature> <bundle>mvn:org.apache.sling/org.apache.sling.discovery.standalone/1.0.0</bundle> </feature> <feature name="sling-extension-event" version="${project.version}"> + <!-- TODO java.lang.NoClassDefFoundError: org/apache/sling/commons/threads/ThreadPool --> + <feature version="${project.version}">sling</feature> <feature version="${project.version}">sling-extension-discovery</feature> - <bundle>mvn:org.apache.sling/org.apache.sling.event/3.3.4</bundle> + <bundle>mvn:org.apache.sling/org.apache.sling.event/3.3.6</bundle> </feature> <feature name="sling-extension-explorer" version="${project.version}"> <feature version="${project.version}">sling</feature> @@ -112,6 +115,7 @@ </feature> <feature name="sling-extension-fsresource" version="${project.version}"> <feature version="${project.version}">sling</feature> + <!-- TODO relax import (&(osgi.wiring.package=org.apache.sling.api.resource)(version>=2.3.0)(!(version>=2.4.0))) --> <bundle>mvn:org.apache.sling/org.apache.sling.fsresource/1.1.2</bundle> </feature> <!-- @@ -123,12 +127,15 @@ --> <feature name="sling-extension-jmx-provider" version="${project.version}"> <feature version="${project.version}">sling</feature> - <bundle>mvn:org.apache.sling/org.apache.sling.jmx.provider/0.6.0</bundle> + <bundle>mvn:org.apache.sling/org.apache.sling.jmx.provider/1.0.0</bundle> </feature> <feature name="sling-extension-resource-inventory" version="${project.version}"> <feature version="${project.version}">sling</feature> - <bundle>mvn:org.apache.sling/org.apache.sling.resource.inventory/0.5.0</bundle> + <bundle>mvn:org.apache.sling/org.apache.sling.resource.inventory/1.0.0</bundle> + <!-- bundle dependencies --> + <bundle dependency="true">mvn:org.apache.commons/commons-lang3/3.3</bundle> </feature> + <!-- TODO failes with NPE, should be moved to commons --> <feature name="sling-extension-threaddump" version="${project.version}"> <bundle>mvn:org.apache.sling/org.apache.sling.extensions.threaddump/0.2.2</bundle> </feature> @@ -152,11 +159,13 @@ </feature> <feature name="sling-installer-provider-jcr" version="${project.version}"> <feature version="${project.version}">sling-installer</feature> + <feature version="${project.version}">sling-jcr</feature> <bundle>mvn:org.apache.sling/org.apache.sling.installer.provider.jcr/3.1.6</bundle> </feature> <!-- Apache Sling Launchpad --> <feature name="sling-launchpad-content" version="${project.version}"> <feature version="${project.version}">sling</feature> + <feature version="${project.version}">sling-auth-form</feature> <bundle>mvn:org.apache.sling/org.apache.sling.launchpad.content/2.0.6</bundle> </feature> <feature name="sling-launchpad-jackrabbit" version="${project.version}"> @@ -175,39 +184,44 @@ <feature version="${project.version}">sling-extension-bundleresource</feature> </feature> <!-- Apache Sling JCR --> - <!-- TODO: org.apache.sling.jcr.base depends on org.apache.jackrabbit.api --> <feature name="sling-jcr" version="${project.version}"> <feature version="${project.version}">sling</feature> - <bundle>mvn:org.apache.sling/org.apache.sling.jcr.api/2.1.0</bundle> - <bundle>mvn:org.apache.sling/org.apache.sling.jcr.base/2.1.2</bundle> + <feature version="${project.version}">jackrabbit-sling</feature> + <feature version="${project.version}">tika-sling</feature> + <feature version="${project.version}">webconsole-sling</feature> + <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.0</bundle> - <bundle>mvn:org.apache.sling/org.apache.sling.jcr.contentloader/2.1.6</bundle> + <bundle>mvn:org.apache.sling/org.apache.sling.jcr.contentloader/2.1.7-SNAPSHOT</bundle> <bundle>mvn:org.apache.sling/org.apache.sling.jcr.davex/1.2.0</bundle> <!-- (not using org.apache.sling.jcr.jcr-wrapper) --> <bundle>mvn:org.apache.sling/org.apache.sling.jcr.ocm/2.0.4-incubator</bundle> - <!-- <bundle>mvn:org.apache.sling/org.apache.sling.jcr.registration/0.0.1-SNAPSHOT</bundle> --> - <bundle>mvn:org.apache.sling/org.apache.sling.jcr.resource/2.2.8</bundle> + <bundle>mvn:org.apache.sling/org.apache.sling.jcr.registration/1.0.0</bundle> + <bundle>mvn:org.apache.sling/org.apache.sling.jcr.resource/2.3.4</bundle> <bundle>mvn:org.apache.sling/org.apache.sling.jcr.webconsole/1.0.0</bundle> - <bundle>mvn:org.apache.sling/org.apache.sling.jcr.webdav/2.2.0</bundle> + <bundle>mvn:org.apache.sling/org.apache.sling.jcr.webdav/2.2.2</bundle> </feature> <!-- Apache Sling JCR Jackrabbit --> + <!-- TODO needs a database impl! --> <feature name="sling-jcr-jackrabbit" version="${project.version}"> <feature version="${project.version}">sling-jcr</feature> - <feature version="${project.version}">tika-sling</feature> - <feature version="${project.version}">jackrabbit-sling</feature> <feature version="${project.version}">sling-servlets</feature> <!-- org.apache.sling.jcr.jackrabbit.accessmanager requires org.apache.sling.servlets.post --> <bundle>mvn:org.apache.sling/org.apache.sling.jcr.jackrabbit.accessmanager/2.1.0</bundle> - <bundle>mvn:org.apache.sling/org.apache.sling.jcr.jackrabbit.server/2.1.2</bundle> + <bundle>mvn:org.apache.sling/org.apache.sling.jcr.jackrabbit.server/2.1.3-SNAPSHOT</bundle> <bundle>mvn:org.apache.sling/org.apache.sling.jcr.jackrabbit.usermanager/2.2.0</bundle> </feature> <!-- Apache Sling Scripting --> <feature name="sling-scripting" version="${project.version}"> - <bundle>mvn:org.apache.sling/org.apache.sling.scripting.api/2.1.4</bundle> - <bundle>mvn:org.apache.sling/org.apache.sling.scripting.core/2.0.24</bundle> + <feature version="${project.version}">sling</feature> + <bundle>mvn:org.apache.sling/org.apache.sling.scripting.api/2.1.6</bundle> + <bundle>mvn:org.apache.sling/org.apache.sling.scripting.core/2.0.26</bundle> + <!-- bundle dependencies --> + <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/1.0</bundle> </feature> <feature name="sling-scripting-javascript" version="${project.version}"> <feature version="${project.version}">sling-scripting</feature> + <feature version="${project.version}">sling-jcr</feature> <bundle>mvn:org.apache.sling/org.apache.sling.scripting.javascript/2.0.12</bundle> </feature> <feature name="sling-scripting-jsp" version="${project.version}"> @@ -218,29 +232,38 @@ <!-- Apache Sling Servlets --> <feature name="sling-servlets" version="${project.version}"> <feature version="${project.version}">sling</feature> - <bundle>mvn:org.apache.sling/org.apache.sling.servlets.get/2.1.4</bundle> - <bundle>mvn:org.apache.sling/org.apache.sling.servlets.post/2.3.2</bundle> - <bundle>mvn:org.apache.sling/org.apache.sling.servlets.resolver/2.2.4</bundle> + <feature version="${project.version}">sling-jcr</feature> + <bundle>mvn:org.apache.sling/org.apache.sling.servlets.get/2.1.6</bundle> + <bundle>mvn:org.apache.sling/org.apache.sling.servlets.post/2.3.4</bundle> + <bundle>mvn:org.apache.sling/org.apache.sling.servlets.resolver/2.3.0</bundle> </feature> <!-- Apache Jackrabbit --> <feature name="jackrabbit-sling" version="${project.version}"> - <feature version="${project.version}">javax-sling</feature> <feature version="${project.version}">commons-sling</feature> - <bundle dependency="true">mvn:org.apache.jackrabbit/jackrabbit-api/2.4.2</bundle> - <bundle dependency="true">mvn:org.apache.jackrabbit/jackrabbit-jcr-commons/2.4.2</bundle> - <bundle dependency="true">mvn:org.apache.jackrabbit/jackrabbit-jcr-rmi/2.4.2</bundle> - <bundle dependency="true">mvn:org.apache.jackrabbit/jackrabbit-spi/2.4.2</bundle> - <bundle dependency="true">mvn:org.apache.jackrabbit/jackrabbit-spi-commons/2.4.2</bundle> - <bundle dependency="true">mvn:org.apache.jackrabbit/jackrabbit-webdav/2.4.2</bundle> + <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 dependencies --> + <bundle dependency="true">mvn:javax.jcr/jcr/2.0</bundle> + <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-jcdi_1.0_spec/1.0</bundle> + <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-interceptor_1.1_spec/1.0</bundle> + <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-el_2.2_spec/1.0</bundle> + <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-atinject_1.0_spec/1.0</bundle> + <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-annotation_1.1_spec/1.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> </feature> - <!-- contrib --> - <!-- Apache Sling Extensions --> - <feature name="sling-extension-i18n" version="2.2.6"> - <bundle>mvn:org.apache.sling/org.apache.sling.i18n/2.2.6</bundle> + <!-- Apache Sling Extensions (contrib) --> + <feature name="sling-extension-i18n" version="2.2.8"> + <feature version="${project.version}">sling</feature> + <feature version="${project.version}">jackrabbit-sling</feature> + <bundle>mvn:org.apache.sling/org.apache.sling.i18n/2.2.8</bundle> </feature> </features>