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 2020/04/07 20:04:43 UTC
[sling-org-apache-sling-karaf-features] 01/05: SLING-3027 Improve
Launchpad Karaf Features
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 81f7f418ea2584c7c30a14c4171ed7988503285c
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Fri Apr 3 09:34:17 2020 +0200
SLING-3027 Improve Launchpad Karaf Features
* Update JCR Oak Server
* Update Jackrabbit and Oak
* Switch from jackrabbit-api to oak-jackrabbit-api
---
src/main/feature/feature.xml | 55 ++++++++++++++++++++++----------------------
1 file changed, 27 insertions(+), 28 deletions(-)
diff --git a/src/main/feature/feature.xml b/src/main/feature/feature.xml
index 20e96d1..10e2cf4 100644
--- a/src/main/feature/feature.xml
+++ b/src/main/feature/feature.xml
@@ -227,8 +227,8 @@
<feature version="${project.version}">jackrabbit-vault</feature>
<bundle dependency="true">mvn:javax.jcr/jcr/2.0</bundle>
<bundle dependency="true">mvn:com.google.guava/guava/15.0</bundle>
- <bundle dependency="true">mvn:org.apache.jackrabbit/jackrabbit-api/2.18.3</bundle>
- <bundle dependency="true">mvn:org.apache.jackrabbit/jackrabbit-jcr-commons/2.18.3</bundle>
+ <bundle dependency="true">mvn:org.apache.jackrabbit/oak-jackrabbit-api/1.26.0</bundle>
+ <bundle dependency="true">mvn:org.apache.jackrabbit/jackrabbit-jcr-commons/2.20.0</bundle>
</feature>
<feature name="sling-healthcheck" version="${project.version}">
<bundle>mvn:org.apache.sling/org.apache.sling.hc.api/1.0.4</bundle>
@@ -441,11 +441,11 @@
<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>
<config external="true" name="org.apache.jackrabbit.oak.segment.SegmentNodeStoreService">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.jackrabbit.oak.segment.SegmentNodeStoreService</config>
<feature version="${project.version}">sling-quickstart-oak</feature>
- <bundle>mvn:org.apache.jackrabbit/oak-lucene/1.18.0</bundle>
- <bundle>mvn:org.apache.jackrabbit/oak-segment-tar/1.18.0</bundle>
+ <bundle>mvn:org.apache.jackrabbit/oak-lucene/1.26.0</bundle>
+ <bundle>mvn:org.apache.jackrabbit/oak-segment-tar/1.26.0</bundle>
<!-- OAK-7263 oak-lucene should not depend on oak-store-document -->
- <bundle>mvn:org.apache.jackrabbit/oak-store-document/1.18.0</bundle>
- <bundle>mvn:org.apache.sling/org.apache.sling.jcr.oak.server/1.2.2</bundle>
+ <bundle>mvn:org.apache.jackrabbit/oak-store-document/1.26.0</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.jcr.oak.server/1.2.4</bundle>
<!-- capabilities -->
<!-- OAK-7380 Add missing OSGi capabilities -->
<capability>
@@ -459,11 +459,11 @@
<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>
<config external="true" name="org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService</config>
<feature version="${project.version}">sling-quickstart-oak</feature>
- <bundle>mvn:org.apache.jackrabbit/oak-lucene/1.18.0</bundle>
- <bundle>mvn:org.apache.jackrabbit/oak-store-document/1.18.0</bundle>
+ <bundle>mvn:org.apache.jackrabbit/oak-lucene/1.26.0</bundle>
+ <bundle>mvn:org.apache.jackrabbit/oak-store-document/1.26.0</bundle>
<bundle>mvn:com.h2database/h2-mvstore/1.4.200</bundle>
<bundle>mvn:org.mongodb/mongo-java-driver/3.12.2</bundle>
- <bundle>mvn:org.apache.sling/org.apache.sling.jcr.oak.server/1.2.2</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.jcr.oak.server/1.2.4</bundle>
<!-- capabilities -->
<!-- OAK-7380 Add missing OSGi capabilities -->
<capability>
@@ -589,14 +589,13 @@
</feature>
<!-- Apache Jackrabbit -->
<feature name="jackrabbit" version="${project.version}">
- <bundle>mvn:org.apache.jackrabbit/jackrabbit-api/2.18.3</bundle>
- <bundle>mvn:org.apache.jackrabbit/jackrabbit-data/2.18.3</bundle>
- <bundle>mvn:org.apache.jackrabbit/jackrabbit-jcr-commons/2.18.3</bundle>
- <bundle>mvn:org.apache.jackrabbit/jackrabbit-jcr-rmi/2.18.3</bundle>
- <bundle>mvn:org.apache.jackrabbit/jackrabbit-spi/2.18.3</bundle>
- <bundle>mvn:org.apache.jackrabbit/jackrabbit-spi-commons/2.18.3</bundle>
- <bundle>mvn:org.apache.jackrabbit/jackrabbit-webdav/2.18.3</bundle>
- <!-- dependencies -->
+ <bundle>mvn:org.apache.jackrabbit/oak-jackrabbit-api/1.26.0</bundle>
+ <bundle>mvn:org.apache.jackrabbit/jackrabbit-data/2.20.0</bundle>
+ <bundle>mvn:org.apache.jackrabbit/jackrabbit-jcr-commons/2.20.0</bundle>
+ <bundle>mvn:org.apache.jackrabbit/jackrabbit-jcr-rmi/2.20.0</bundle>
+ <bundle>mvn:org.apache.jackrabbit/jackrabbit-spi/2.20.0</bundle>
+ <bundle>mvn:org.apache.jackrabbit/jackrabbit-spi-commons/2.20.0</bundle>
+ <bundle>mvn:org.apache.jackrabbit/jackrabbit-webdav/2.20.0</bundle>
<!-- dependencies -->
<feature version="${project.version}">httpcomponents-client</feature>
<bundle dependency="true">mvn:javax.jcr/jcr/2.0</bundle>
@@ -613,17 +612,17 @@
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
</feature>
<feature name="jackrabbit-oak" version="${project.version}">
- <bundle>mvn:org.apache.jackrabbit/oak-api/1.18.0</bundle>
- <bundle>mvn:org.apache.jackrabbit/oak-blob/1.18.0</bundle>
- <bundle>mvn:org.apache.jackrabbit/oak-blob-plugins/1.18.0</bundle>
- <bundle>mvn:org.apache.jackrabbit/oak-commons/1.18.0</bundle>
- <bundle>mvn:org.apache.jackrabbit/oak-core/1.18.0</bundle>
- <bundle>mvn:org.apache.jackrabbit/oak-core-spi/1.18.0</bundle>
- <bundle>mvn:org.apache.jackrabbit/oak-jcr/1.18.0</bundle>
- <bundle>mvn:org.apache.jackrabbit/oak-query-spi/1.18.0</bundle>
- <bundle>mvn:org.apache.jackrabbit/oak-security-spi/1.18.0</bundle>
- <bundle>mvn:org.apache.jackrabbit/oak-store-composite/1.18.0</bundle>
- <bundle>mvn:org.apache.jackrabbit/oak-store-spi/1.18.0</bundle>
+ <bundle>mvn:org.apache.jackrabbit/oak-api/1.26.0</bundle>
+ <bundle>mvn:org.apache.jackrabbit/oak-blob/1.26.0</bundle>
+ <bundle>mvn:org.apache.jackrabbit/oak-blob-plugins/1.26.0</bundle>
+ <bundle>mvn:org.apache.jackrabbit/oak-commons/1.26.0</bundle>
+ <bundle>mvn:org.apache.jackrabbit/oak-core/1.26.0</bundle>
+ <bundle>mvn:org.apache.jackrabbit/oak-core-spi/1.26.0</bundle>
+ <bundle>mvn:org.apache.jackrabbit/oak-jcr/1.26.0</bundle>
+ <bundle>mvn:org.apache.jackrabbit/oak-query-spi/1.26.0</bundle>
+ <bundle>mvn:org.apache.jackrabbit/oak-security-spi/1.26.0</bundle>
+ <bundle>mvn:org.apache.jackrabbit/oak-store-composite/1.26.0</bundle>
+ <bundle>mvn:org.apache.jackrabbit/oak-store-spi/1.26.0</bundle>
<!-- dependencies -->
<feature>scr</feature>
<feature version="${project.version}">sling-commons-metrics</feature>