This is an automated email from the ASF dual-hosted git repository. olli pushed a commit to branch feature/oak-1.8 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-karaf-features.git
commit 09d44583bac2371c971e0d1d6f67725418b60c14 Author: Oliver Lietz <[email protected]> AuthorDate: Fri Jan 26 12:49:44 2018 +0100 SLING-7442 Upgrade Karaf Features to Oak 1.8 --- pom.xml | 2 +- src/main/feature/feature.xml | 21 ++++++++++++++------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index b85f93b..b038156 100644 --- a/pom.xml +++ b/pom.xml @@ -38,7 +38,7 @@ <properties> <org.apache.karaf.version>4.2.0.M2</org.apache.karaf.version> <org.apache.jackrabbit.version>2.16.0</org.apache.jackrabbit.version> - <org.apache.jackrabbit.oak.version>1.6.7</org.apache.jackrabbit.oak.version> + <org.apache.jackrabbit.oak.version>1.8.1</org.apache.jackrabbit.oak.version> <org.apache.tika.version>1.17</org.apache.tika.version> </properties> diff --git a/src/main/feature/feature.xml b/src/main/feature/feature.xml index 6a22f5e..6784ed2 100644 --- a/src/main/feature/feature.xml +++ b/src/main/feature/feature.xml @@ -449,21 +449,20 @@ <bundle>mvn:org.apache.felix/org.apache.felix.webconsole.plugins.packageadmin/1.0.4</bundle> </feature> <feature name="sling-quickstart-oak-tar" 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> <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/${org.apache.jackrabbit.oak.version}</bundle> <bundle>mvn:org.apache.jackrabbit/oak-segment-tar/${org.apache.jackrabbit.oak.version}</bundle> - <bundle>mvn:org.apache.sling/org.apache.sling.jcr.oak.server/1.1.4</bundle> + <bundle>mvn:org.apache.sling/org.apache.sling.jcr.oak.server/1.2.0-SNAPSHOT</bundle> </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> <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/${org.apache.jackrabbit.oak.version}</bundle> + <bundle>mvn:org.apache.jackrabbit/oak-store-document/${org.apache.jackrabbit.oak.version}</bundle> <bundle>mvn:org.mongodb/mongo-java-driver/3.6.1</bundle> <bundle>mvn:com.h2database/h2-mvstore/1.4.196</bundle> - <bundle>mvn:org.apache.sling/org.apache.sling.jcr.oak.server/1.1.4</bundle> + <bundle>mvn:org.apache.sling/org.apache.sling.jcr.oak.server/1.2.0-SNAPSHOT</bundle> </feature> <!-- Apache Sling Scripting --> <feature name="sling-scripting" version="${project.version}"> @@ -581,16 +580,24 @@ <bundle dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/4.5.5</bundle> </feature> <feature name="jackrabbit-oak" version="${project.version}"> - <bundle>mvn:org.apache.jackrabbit/oak-core/${org.apache.jackrabbit.oak.version}</bundle> - <bundle>mvn:org.apache.jackrabbit/oak-commons/${org.apache.jackrabbit.oak.version}</bundle> + <bundle>mvn:org.apache.jackrabbit/oak-api/${org.apache.jackrabbit.oak.version}</bundle> <bundle>mvn:org.apache.jackrabbit/oak-blob/${org.apache.jackrabbit.oak.version}</bundle> + <bundle>mvn:org.apache.jackrabbit/oak-blob-plugins/${org.apache.jackrabbit.oak.version}</bundle> + <bundle>mvn:org.apache.jackrabbit/oak-commons/${org.apache.jackrabbit.oak.version}</bundle> + <bundle>mvn:org.apache.jackrabbit/oak-core/${org.apache.jackrabbit.oak.version}</bundle> + <bundle>mvn:org.apache.jackrabbit/oak-core-spi/${org.apache.jackrabbit.oak.version}</bundle> <bundle>mvn:org.apache.jackrabbit/oak-jcr/${org.apache.jackrabbit.oak.version}</bundle> + <bundle>mvn:org.apache.jackrabbit/oak-query-spi/${org.apache.jackrabbit.oak.version}</bundle> + <bundle>mvn:org.apache.jackrabbit/oak-security-spi/${org.apache.jackrabbit.oak.version}</bundle> + <bundle>mvn:org.apache.jackrabbit/oak-store-composite/${org.apache.jackrabbit.oak.version}</bundle> + <bundle>mvn:org.apache.jackrabbit/oak-store-spi/${org.apache.jackrabbit.oak.version}</bundle> <!-- dependencies --> <feature>scr</feature> <feature version="${project.version}">jackrabbit</feature> <feature version="${project.version}">tika</feature> - <bundle>mvn:com.google.guava/guava/15.0</bundle> + <bundle dependency="true">mvn:com.google.guava/guava/15.0</bundle> <bundle>mvn:org.apache.felix/org.apache.felix.jaas/1.0.2</bundle> + <bundle dependency="true">mvn:io.dropwizard.metrics/metrics-core/3.2.6</bundle> </feature> <feature name="jackrabbit-vault" version="${project.version}"> <bundle>mvn:org.apache.jackrabbit.vault/org.apache.jackrabbit.vault/3.1.42</bundle> -- To stop receiving notification emails like this one, please contact [email protected].
