rombert closed pull request #2: Upgraded oak to 1.8.3 + minor version bumps URL: https://github.com/apache/sling-org-apache-sling-starter/pull/2
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/src/main/provisioning/oak.txt b/src/main/provisioning/oak.txt index 5d2675c..4d6a6a0 100644 --- a/src/main/provisioning/oak.txt +++ b/src/main/provisioning/oak.txt @@ -20,17 +20,25 @@ [feature name=oak] [variables] - oak.version=1.6.8 + oak.version=1.8.3 # The segment node store is used via a configuration [artifacts startLevel=10] org.apache.felix/org.apache.felix.jaas/1.0.2 [artifacts startLevel=15] - org.apache.jackrabbit/oak-core/${oak.version} + org.apache.jackrabbit/oak-api/${oak.version} org.apache.jackrabbit/oak-commons/${oak.version} + org.apache.jackrabbit/oak-core/${oak.version} + org.apache.jackrabbit/oak-core-spi/${oak.version} + org.apache.jackrabbit/oak-store-spi/${oak.version} + org.apache.jackrabbit/oak-store-document/${oak.version} + org.apache.jackrabbit/oak-store-composite/${oak.version} + org.apache.jackrabbit/oak-query-spi/${oak.version} + org.apache.jackrabbit/oak-security-spi/${oak.version} org.apache.jackrabbit/oak-lucene/${oak.version} org.apache.jackrabbit/oak-blob/${oak.version} + org.apache.jackrabbit/oak-blob-plugins/${oak.version} org.apache.jackrabbit/oak-jcr/${oak.version} [artifacts startLevel=15 runModes=oak_tar] @@ -43,7 +51,7 @@ # start the Oak server instance after all components have been configured # and started to avoid restarting that component ( see SLING-4556 ) [artifacts startLevel=16] - org.apache.sling/org.apache.sling.jcr.oak.server/1.1.4 + org.apache.sling/org.apache.sling.jcr.oak.server/1.2.0 [configurations] org.apache.felix.jaas.Configuration.factory-GuestLoginModule diff --git a/src/main/provisioning/sling.txt b/src/main/provisioning/sling.txt index 49de475..874a027 100644 --- a/src/main/provisioning/sling.txt +++ b/src/main/provisioning/sling.txt @@ -20,7 +20,7 @@ [feature name=sling] [variables] - jackrabbit.version=2.14.4 + jackrabbit.version=2.16.1 [artifacts] # Add the Slingshot Sample provisioning model ---------------------------------------------------------------- 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: us...@infra.apache.org With regards, Apache Git Services