oliverlietz closed pull request #1: SLING-7442 Update Oak to 1.8.0
URL: https://github.com/apache/sling-org-apache-sling-karaf-features/pull/1
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/pom.xml b/pom.xml
index b85f93b..2bf6d35 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.0</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 ef71193..f9c7c24 100644
--- a/src/main/feature/feature.xml
+++ b/src/main/feature/feature.xml
@@ -454,7 +454,7 @@
<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.1.5-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>
@@ -463,7 +463,7 @@
<bundle>mvn:org.apache.jackrabbit/oak-lucene/${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.1.5-SNAPSHOT</bundle>
</feature>
<!-- Apache Sling Scripting -->
<feature name="sling-scripting" version="${project.version}">
@@ -584,7 +584,17 @@
<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-blob/${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-store-spi/${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-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-jcr/${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-document/${org.apache.jackrabbit.oak.version}</bundle>
+
<!-- dependencies -->
<feature>scr</feature>
<feature version="${project.version}">jackrabbit</feature>
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
