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 2018/05/06 10:56:43 UTC
[sling-org-apache-sling-karaf-features] branch master updated
(60f147f -> 4a22930)
This is an automated email from the ASF dual-hosted git repository.
olli pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-karaf-features.git.
from 60f147f SLING-7576 Update Composum to 1.8.3
new bb60472 SLING-3027 Improve Launchpad Karaf Features
new 4a22930 SLING-7546 Take requirements for services into account
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/main/feature/feature.xml | 133 +++++++++++++++++++++++++++----------------
1 file changed, 83 insertions(+), 50 deletions(-)
--
To stop receiving notification emails like this one, please contact
olli@apache.org.
[sling-org-apache-sling-karaf-features] 01/02: SLING-3027 Improve
Launchpad Karaf Features
Posted by ol...@apache.org.
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 bb60472a0b904436b3e791600217b21b646e8754
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat May 5 22:57:52 2018 +0200
SLING-3027 Improve Launchpad Karaf Features
use latest releases
---
src/main/feature/feature.xml | 56 ++++++++++++++++++++++----------------------
1 file changed, 28 insertions(+), 28 deletions(-)
diff --git a/src/main/feature/feature.xml b/src/main/feature/feature.xml
index ca2a133..91f5628 100644
--- a/src/main/feature/feature.xml
+++ b/src/main/feature/feature.xml
@@ -21,10 +21,10 @@
<!-- 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.16.4</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.api/2.18.0</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.5.36</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>
<!-- Apache Sling Commons -->
@@ -196,7 +196,7 @@
<feature version="${project.version}">sling</feature>
</feature>
<feature name="sling-fsresource" version="${project.version}">
- <bundle>mvn:org.apache.sling/org.apache.sling.fsresource/2.1.12</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.fsresource/2.1.14</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
<feature version="${project.version}">jackrabbit-vault</feature>
@@ -218,7 +218,7 @@
<feature name="sling-i18n" version="${project.version}">
<config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_i18n">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_i18n</config>
<config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-i18n">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-i18n</config>
- <bundle>mvn:org.apache.sling/org.apache.sling.i18n/2.5.12</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.i18n/2.5.14</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
</feature>
@@ -229,7 +229,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.6</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.models.impl/1.4.8</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
<feature version="${project.version}">sling-scripting</feature>
@@ -238,9 +238,9 @@
<bundle>mvn:org.apache.sling/org.apache.sling.models.jacksonexporter/1.0.8</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling-models</feature>
- <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-annotations/2.9.4</bundle>
- <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-core/2.9.4</bundle>
- <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/2.9.4</bundle>
+ <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-annotations/2.9.5</bundle>
+ <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-core/2.9.5</bundle>
+ <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/2.9.5</bundle>
</feature>
<feature name="sling-pipes" version="${project.version}">
<bundle>mvn:org.apache.sling/org.apache.sling.pipes/2.0.2</bundle>
@@ -281,7 +281,7 @@
<feature version="${project.version}">sling-commons-html</feature>
</feature>
<feature name="sling-security" version="${project.version}">
- <bundle>mvn:org.apache.sling/org.apache.sling.security/1.1.10</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.security/1.1.12</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
</feature>
@@ -307,7 +307,7 @@
<feature name="sling-xss" version="${project.version}">
<config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_xss">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_xss</config>
<config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-xss">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-xss</config>
- <bundle>mvn:org.apache.sling/org.apache.sling.xss/2.0.4</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.xss/2.0.6</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
<bundle dependency="true">mvn:org.apache.geronimo.bundles/commons-httpclient/3.1_2</bundle>
@@ -321,7 +321,7 @@
<feature version="${project.version}">sling</feature>
</feature>
<feature name="sling-installer-healthcheck" version="${project.version}">
- <bundle>mvn:org.apache.sling/org.apache.sling.installer.hc/1.0.0</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.installer.hc/2.0.0</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling-installer</feature>
<feature version="${project.version}">sling-healthcheck</feature>
@@ -351,7 +351,7 @@
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.davex/1.3.10</bundle>
<!-- (not using org.apache.sling.jcr.jcr-wrapper) -->
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.registration/1.0.4</bundle>
- <bundle>mvn:org.apache.sling/org.apache.sling.jcr.resource/3.0.8</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.jcr.resource/3.0.10</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.3.8</bundle>
<!-- dependencies -->
@@ -401,7 +401,7 @@
<bundle>mvn:org.apache.sling/org.apache.sling.nosql.mongodb-resourceprovider/1.1.0</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling-nosql-generic</feature>
- <bundle dependency="true">mvn:org.mongodb/mongo-java-driver/3.6.3</bundle>
+ <bundle dependency="true">mvn:org.mongodb/mongo-java-driver/3.7.0</bundle>
</feature>
<!-- Apache Sling Quickstart -->
<feature name="sling-quickstart-nosql-couchbase" version="${project.version}">
@@ -457,8 +457,8 @@
<feature version="${project.version}">sling-quickstart-oak</feature>
<bundle>mvn:org.apache.jackrabbit/oak-lucene/1.8.2</bundle>
<bundle>mvn:org.apache.jackrabbit/oak-store-document/1.8.2</bundle>
- <bundle>mvn:com.h2database/h2-mvstore/1.4.196</bundle>
- <bundle>mvn:org.mongodb/mongo-java-driver/3.6.3</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>
</feature>
<!-- Apache Sling Scripting -->
@@ -477,16 +477,16 @@
<feature version="${project.version}">sling</feature>
<feature version="${project.version}">sling-adapter</feature>
<feature version="${project.version}">sling-scripting</feature>
- <bundle dependency="true">mvn:org.freemarker/freemarker/2.3.27-incubating</bundle>
+ <bundle dependency="true">mvn:org.freemarker/freemarker/2.3.28</bundle>
</feature>
<feature name="sling-scripting-groovy" version="${project.version}">
<bundle>mvn:org.apache.sling/org.apache.sling.scripting.groovy/1.0.2</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
<feature version="${project.version}">sling-scripting</feature>
- <bundle dependency="true">mvn:org.codehaus.groovy/groovy/2.4.14</bundle>
- <bundle dependency="true">mvn:org.codehaus.groovy/groovy-json/2.4.14</bundle>
- <bundle dependency="true">mvn:org.codehaus.groovy/groovy-templates/2.4.14</bundle>
+ <bundle dependency="true">mvn:org.codehaus.groovy/groovy/2.4.15</bundle>
+ <bundle dependency="true">mvn:org.codehaus.groovy/groovy-json/2.4.15</bundle>
+ <bundle dependency="true">mvn:org.codehaus.groovy/groovy-templates/2.4.15</bundle>
</feature>
<feature name="sling-scripting-java" version="${project.version}">
<bundle>mvn:org.apache.sling/org.apache.sling.scripting.java/2.1.2</bundle>
@@ -500,7 +500,7 @@
<!-- dependencies -->
<feature version="${project.version}">sling-scripting</feature>
<bundle dependency="true">mvn:javax.jcr/jcr/2.0</bundle>
- <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.rhino/1.7.8_1</bundle>
+ <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.rhino/1.7.9_1</bundle>
</feature>
<feature name="sling-scripting-jsp" version="${project.version}">
<bundle>mvn:org.apache.sling/org.apache.sling.scripting.jsp/2.3.4</bundle>
@@ -511,7 +511,7 @@
</feature>
<feature name="sling-scripting-sightly" version="${project.version}">
<config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-scripting_sightly">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-scripting_sightly</config>
- <bundle>mvn:org.apache.sling/org.apache.sling.scripting.sightly/1.0.48-1.3.1</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.scripting.sightly/1.0.52-1.3.1</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.scripting.sightly.compiler/1.0.20-1.3.1</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.scripting.sightly.compiler.java/1.0.22-1.3.1</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.scripting.sightly.js.provider/1.0.26</bundle>
@@ -526,7 +526,7 @@
<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.8_1</bundle>
+ <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>
@@ -535,9 +535,9 @@
<feature version="${project.version}">sling</feature>
<feature version="${project.version}">sling-scripting</feature>
<feature version="${project.version}">sling-i18n</feature>
- <bundle dependency="true">mvn:org.attoparser/attoparser/2.0.4.RELEASE</bundle>
- <bundle dependency="true">mvn:org.unbescape/unbescape/1.1.5.RELEASE</bundle>
- <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ognl/3.2.4_1</bundle>
+ <bundle dependency="true">mvn:org.attoparser/attoparser/2.0.5.RELEASE</bundle>
+ <bundle dependency="true">mvn:org.unbescape/unbescape/1.1.6.RELEASE</bundle>
+ <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ognl/3.2.6_1</bundle>
<bundle dependency="true">mvn:org.javassist/javassist/3.22.0-GA</bundle>
</feature>
<!-- Apache Sling Servlets -->
@@ -614,11 +614,11 @@
</feature>
<!-- Apache Tika -->
<feature name="tika" version="${project.version}">
- <bundle>mvn:org.apache.tika/tika-core/1.17</bundle>
- <bundle>mvn:org.apache.tika/tika-parsers/1.17</bundle>
+ <bundle>mvn:org.apache.tika/tika-core/1.18</bundle>
+ <bundle>mvn:org.apache.tika/tika-parsers/1.18</bundle>
<bundle>mvn:org.apache.pdfbox/pdfbox/2.0.8</bundle>
<bundle>mvn:org.apache.pdfbox/fontbox/2.0.8</bundle>
- <bundle>mvn:org.apache.pdfbox/jempbox/1.8.13</bundle>
+ <bundle>mvn:org.apache.pdfbox/jempbox/1.8.14</bundle>
</feature>
<!-- Apache Sling Samples -->
<feature name="sling-samples-fling" version="${project.version}">
--
To stop receiving notification emails like this one, please contact
olli@apache.org.
[sling-org-apache-sling-karaf-features] 02/02: SLING-7546 Take
requirements for services into account
Posted by ol...@apache.org.
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 <ol...@apache.org>
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
olli@apache.org.