This is an automated email from the ASF dual-hosted git repository. olli pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-karaf-features.git
commit 4a229304425e9fa5618828218f8e526af5508f72 Author: Oliver Lietz <[email protected]> AuthorDate: Sun May 6 12:46:14 2018 +0200 SLING-7546 Take requirements for services into account * use snapshots with added metadata * add missing capabilities to features where metadata in bundles is not yet present --- src/main/feature/feature.xml | 83 +++++++++++++++++++++++++++++++------------- 1 file changed, 58 insertions(+), 25 deletions(-) diff --git a/src/main/feature/feature.xml b/src/main/feature/feature.xml index 91f5628..f5e6c87 100644 --- a/src/main/feature/feature.xml +++ b/src/main/feature/feature.xml @@ -21,12 +21,12 @@ <!-- Apache Sling --> <feature name="sling" version="${project.version}"> <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-resourceresolver">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-resourceresolver</config> - <bundle>mvn:org.apache.sling/org.apache.sling.api/2.18.0</bundle> + <bundle>mvn:org.apache.sling/org.apache.sling.api/2.18.1-SNAPSHOT</bundle> <bundle>mvn:org.apache.sling/org.apache.sling.auth.core/1.4.2</bundle> <bundle>mvn:org.apache.sling/org.apache.sling.engine/2.6.12</bundle> - <bundle>mvn:org.apache.sling/org.apache.sling.resourceresolver/1.6.0</bundle> - <bundle>mvn:org.apache.sling/org.apache.sling.serviceusermapper/1.4.0</bundle> - <bundle>mvn:org.apache.sling/org.apache.sling.settings/1.3.8</bundle> + <bundle>mvn:org.apache.sling/org.apache.sling.resourceresolver/1.6.1-SNAPSHOT</bundle> + <bundle>mvn:org.apache.sling/org.apache.sling.serviceusermapper/1.4.1-SNAPSHOT</bundle> + <bundle>mvn:org.apache.sling/org.apache.sling.settings/1.3.9-SNAPSHOT</bundle> <!-- Apache Sling Commons --> <bundle>mvn:org.apache.sling/org.apache.sling.commons.johnzon/1.1.0</bundle> <bundle>mvn:org.apache.sling/org.apache.sling.commons.mime/2.1.10</bundle> @@ -49,6 +49,11 @@ <bundle dependency="true">mvn:org.apache.commons/commons-collections4/4.1</bundle> <bundle dependency="true">mvn:org.apache.commons/commons-lang3/3.7</bundle> <bundle dependency="true">mvn:org.apache.commons/commons-math/2.2</bundle> + <!-- capabilities --> + <!-- https://github.com/bndtools/bnd/issues/2429 --> + <capability> + osgi.service;objectClass=org.osgi.service.event.EventHandler + </capability> </feature> <!-- Apache Sling Auth --> <feature name="sling-auth-form" version="${project.version}"> @@ -76,7 +81,7 @@ <feature version="${project.version}">sling-commons-classloader</feature> </feature> <feature name="sling-commons-classloader" version="${project.version}"> - <bundle>mvn:org.apache.sling/org.apache.sling.commons.classloader/1.4.2</bundle> + <bundle>mvn:org.apache.sling/org.apache.sling.commons.classloader/1.4.3-SNAPSHOT</bundle> </feature> <feature name="sling-commons-fsclassloader" version="${project.version}"> <bundle>mvn:org.apache.sling/org.apache.sling.commons.fsclassloader/1.0.8</bundle> @@ -89,9 +94,10 @@ <bundle dependency="true">mvn:org.apache.commons/commons-lang3/3.7</bundle> </feature> <feature name="sling-commons-html" version="${project.version}"> - <bundle>mvn:org.apache.sling/org.apache.sling.commons.html/1.0.0</bundle> + <bundle>mvn:org.apache.sling/org.apache.sling.commons.html/1.0.1-SNAPSHOT</bundle> <!-- dependencies --> <feature>scr</feature> + <bundle dependency="true">mvn:org.apache.sling/org.apache.sling.commons.osgi/2.4.0</bundle> </feature> <feature name="sling-commons-messaging" version="${project.version}"> <bundle>mvn:org.apache.sling/org.apache.sling.commons.messaging/0.0.1-SNAPSHOT</bundle> @@ -107,7 +113,7 @@ <bundle dependency="true">mvn:org.apache.commons/commons-email/1.5</bundle> </feature> <feature name="sling-commons-metrics" version="${project.version}"> - <bundle>mvn:org.apache.sling/org.apache.sling.commons.metrics/1.2.4</bundle> + <bundle>mvn:org.apache.sling/org.apache.sling.commons.metrics/1.2.5-SNAPSHOT</bundle> <!-- dependencies --> <feature>scr</feature> <bundle dependency="true">mvn:io.dropwizard.metrics/metrics-core/3.2.6</bundle> @@ -122,7 +128,7 @@ <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle> </feature> <feature name="sling-commons-threads" version="${project.version}"> - <bundle>mvn:org.apache.sling/org.apache.sling.commons.threads/3.2.16</bundle> + <bundle>mvn:org.apache.sling/org.apache.sling.commons.threads/3.2.17-SNAPSHOT</bundle> <!-- dependencies --> <feature>config</feature> </feature> @@ -139,29 +145,34 @@ </feature> <feature name="sling-discovery" version="${project.version}"> <bundle>mvn:org.apache.sling/org.apache.sling.discovery.api/1.0.4</bundle> - <bundle>mvn:org.apache.sling/org.apache.sling.discovery.base/2.0.8</bundle> - <bundle>mvn:org.apache.sling/org.apache.sling.discovery.commons/1.0.20</bundle> <bundle>mvn:org.apache.sling/org.apache.sling.discovery.support/1.0.4</bundle> <!-- dependencies --> <feature version="${project.version}">sling</feature> - <bundle dependency="true">mvn:javax.jcr/jcr/2.0</bundle> - <bundle dependency="true">mvn:org.apache.httpcomponents/httpcore-osgi/4.4.9</bundle> - <bundle dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/4.5.5</bundle> </feature> <feature name="sling-discovery-impl" version="${project.version}"> - <bundle>mvn:org.apache.sling/org.apache.sling.discovery.impl/1.2.12</bundle> + <bundle>mvn:org.apache.sling/org.apache.sling.discovery.base/2.0.8</bundle> + <bundle>mvn:org.apache.sling/org.apache.sling.discovery.commons/1.0.21-SNAPSHOT</bundle> + <bundle>mvn:org.apache.sling/org.apache.sling.discovery.impl/1.2.13-SNAPSHOT</bundle> <!-- dependencies --> <feature>webconsole</feature> <feature version="${project.version}">sling-discovery</feature> + <bundle dependency="true">mvn:javax.jcr/jcr/2.0</bundle> + <bundle dependency="true">mvn:org.apache.httpcomponents/httpcore-osgi/4.4.9</bundle> + <bundle dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/4.5.5</bundle> </feature> <feature name="sling-discovery-oak" version="${project.version}"> <config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_discovery">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_discovery</config> <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-discovery">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-discovery</config> - <bundle>mvn:org.apache.sling/org.apache.sling.discovery.oak/1.2.22</bundle> + <bundle>mvn:org.apache.sling/org.apache.sling.discovery.base/2.0.8</bundle> + <bundle>mvn:org.apache.sling/org.apache.sling.discovery.commons/1.0.21-SNAPSHOT</bundle> + <bundle>mvn:org.apache.sling/org.apache.sling.discovery.oak/1.2.23-SNAPSHOT</bundle> <!-- dependencies --> <feature>webconsole</feature> <feature version="${project.version}">sling-discovery</feature> <feature version="${project.version}">sling-healthcheck</feature> + <bundle dependency="true">mvn:javax.jcr/jcr/2.0</bundle> + <bundle dependency="true">mvn:org.apache.httpcomponents/httpcore-osgi/4.4.9</bundle> + <bundle dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/4.5.5</bundle> </feature> <feature name="sling-discovery-standalone" version="${project.version}"> <bundle>mvn:org.apache.sling/org.apache.sling.discovery.standalone/1.0.2</bundle> @@ -183,7 +194,7 @@ <feature name="sling-event" version="${project.version}"> <config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_event">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_event</config> <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-event">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-event</config> - <bundle>mvn:org.apache.sling/org.apache.sling.event/4.2.10</bundle> + <bundle>mvn:org.apache.sling/org.apache.sling.event/4.2.11-SNAPSHOT</bundle> <bundle>mvn:org.apache.sling/org.apache.sling.event.dea/1.1.2</bundle> <!-- dependencies --> <feature version="${project.version}">sling</feature> @@ -229,7 +240,7 @@ </feature> <feature name="sling-models" version="${project.version}"> <bundle>mvn:org.apache.sling/org.apache.sling.models.api/1.3.6</bundle> - <bundle>mvn:org.apache.sling/org.apache.sling.models.impl/1.4.8</bundle> + <bundle>mvn:org.apache.sling/org.apache.sling.models.impl/1.4.9-SNAPSHOT</bundle> <!-- dependencies --> <feature version="${project.version}">sling</feature> <feature version="${project.version}">sling-scripting</feature> @@ -315,7 +326,7 @@ <!-- Apache Sling Installer --> <feature name="sling-installer" version="${project.version}"> <bundle>mvn:org.apache.sling/org.apache.sling.installer.console/1.0.2</bundle> - <bundle>mvn:org.apache.sling/org.apache.sling.installer.core/3.8.12</bundle> + <bundle>mvn:org.apache.sling/org.apache.sling.installer.core/3.8.13-SNAPSHOT</bundle> <bundle>mvn:org.apache.sling/org.apache.sling.installer.factory.configuration/1.1.2</bundle> <!-- dependencies --> <feature version="${project.version}">sling</feature> @@ -345,8 +356,8 @@ <config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer-sling">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.repoinit.RepositoryInitializer-sling</config> <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-jcr_resource">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-jcr_resource</config> <bundle>mvn:org.apache.sling/org.apache.sling.jcr.api/2.4.0</bundle> - <bundle>mvn:org.apache.sling/org.apache.sling.jcr.base/3.0.4</bundle> - <bundle>mvn:org.apache.sling/org.apache.sling.jcr.classloader/3.2.2</bundle> + <bundle>mvn:org.apache.sling/org.apache.sling.jcr.base/3.0.5-SNAPSHOT</bundle> + <bundle>mvn:org.apache.sling/org.apache.sling.jcr.classloader/3.2.3-SNAPSHOT</bundle> <bundle>mvn:org.apache.sling/org.apache.sling.jcr.contentloader/2.2.4</bundle> <bundle>mvn:org.apache.sling/org.apache.sling.jcr.davex/1.3.10</bundle> <!-- (not using org.apache.sling.jcr.jcr-wrapper) --> @@ -436,7 +447,7 @@ <feature version="${project.version}">sling-jcr-repoinit</feature> <feature version="${project.version}">sling-adapter</feature> <feature version="${project.version}">sling-bundleresource</feature> - <feature version="${project.version}">sling-discovery-oak</feature> + <feature version="${project.version}">sling-discovery-standalone</feature> <bundle dependency="true">mvn:org.apache.felix/org.apache.felix.prefs/1.1.0</bundle> <bundle>mvn:org.apache.felix/org.apache.felix.webconsole.plugins.memoryusage/1.0.8</bundle> <bundle>mvn:org.apache.felix/org.apache.felix.webconsole.plugins.packageadmin/1.0.4</bundle> @@ -449,7 +460,13 @@ <bundle>mvn:org.apache.jackrabbit/oak-segment-tar/1.8.2</bundle> <!-- OAK-7263 oak-lucene should not depend on oak-store-document --> <bundle>mvn:org.apache.jackrabbit/oak-store-document/1.8.2</bundle> - <bundle>mvn:org.apache.sling/org.apache.sling.jcr.oak.server/1.2.0</bundle> + <bundle>mvn:org.apache.sling/org.apache.sling.jcr.oak.server/1.2.1-SNAPSHOT</bundle> + <!-- capabilities --> + <!-- OAK-7380 Add missing OSGi capabilities --> + <capability> + osgi.service;objectClass=org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore, + osgi.service;objectClass=org.apache.jackrabbit.oak.spi.blob.BlobStore + </capability> </feature> <feature name="sling-quickstart-oak-mongo" version="${project.version}"> <config external="true" name="org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexProviderService">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexProviderService</config> @@ -459,7 +476,13 @@ <bundle>mvn:org.apache.jackrabbit/oak-store-document/1.8.2</bundle> <bundle>mvn:com.h2database/h2-mvstore/1.4.197</bundle> <bundle>mvn:org.mongodb/mongo-java-driver/3.7.0</bundle> - <bundle>mvn:org.apache.sling/org.apache.sling.jcr.oak.server/1.2.0</bundle> + <bundle>mvn:org.apache.sling/org.apache.sling.jcr.oak.server/1.2.1-SNAPSHOT</bundle> + <!-- capabilities --> + <!-- OAK-7380 Add missing OSGi capabilities --> + <capability> + osgi.service;objectClass=org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore, + osgi.service;objectClass=org.apache.jackrabbit.oak.spi.blob.BlobStore + </capability> </feature> <!-- Apache Sling Scripting --> <feature name="sling-scripting" version="${project.version}"> @@ -525,12 +548,11 @@ <feature version="${project.version}">sling-models</feature> <feature version="${project.version}">sling-xss</feature> <feature version="${project.version}">sling-commons-compiler</feature> - <feature version="${project.version}">sling-commons-fsclassloader</feature> <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.rhino/1.7.9_1</bundle> </feature> <feature name="sling-scripting-thymeleaf" version="${project.version}"> <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-scripting_thymeleaf">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-scripting_thymeleaf</config> - <bundle>mvn:org.apache.sling/org.apache.sling.scripting.thymeleaf/1.1.0</bundle> + <bundle>mvn:org.apache.sling/org.apache.sling.scripting.thymeleaf/1.1.1-SNAPSHOT</bundle> <!-- dependencies --> <feature version="${project.version}">sling</feature> <feature version="${project.version}">sling-scripting</feature> @@ -605,6 +627,17 @@ <feature version="${project.version}">tika</feature> <bundle dependency="true">mvn:com.google.guava/guava/15.0</bundle> <bundle>mvn:org.apache.felix/org.apache.felix.jaas/1.0.2</bundle> + <!-- capabilities --> + <!-- OAK-7380 Add missing OSGi capabilities --> + <capability> + osgi.service;objectClass=org.apache.jackrabbit.oak.api.jmx.CacheStatsMBean, + osgi.service;objectClass=org.apache.jackrabbit.oak.api.jmx.QueryEngineSettingsMBean, + osgi.service;objectClass=org.apache.jackrabbit.oak.spi.mount.MountInfoProvider, + osgi.service;objectClass=org.apache.jackrabbit.oak.spi.security.SecurityProvider, + osgi.service;objectClass=org.apache.jackrabbit.oak.spi.state.NodeStore, + osgi.service;objectClass=org.apache.jackrabbit.oak.spi.state.NodeStoreProvider, + osgi.service;objectClass=org.apache.jackrabbit.oak.stats.StatisticsProvider + </capability> </feature> <feature name="jackrabbit-vault" version="${project.version}"> <bundle>mvn:org.apache.jackrabbit.vault/org.apache.jackrabbit.vault/3.1.44</bundle> -- To stop receiving notification emails like this one, please contact [email protected].
