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-jcr-oak-server.git
commit 97ff1cf68011f8210e58cac7b93a3c82145347a3 Author: Oliver Lietz <[email protected]> AuthorDate: Fri Jan 26 12:59:55 2018 +0100 SLING-7423 Upgrade Oak to 1.8 --- pom.xml | 12 +++++++++--- .../jcr/oak/server/internal/OakSlingRepositoryManager.java | 10 ++++++---- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index cd41862..002448b 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ </parent> <artifactId>org.apache.sling.jcr.oak.server</artifactId> - <version>1.1.5-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <name>Apache Sling JCR Oak Repository Server</name> <description>This bundle provides a SlingRepository based on Apache Jackrabbit Oak.</description> @@ -42,7 +42,7 @@ <properties> <jackrabbit.version>2.16.0</jackrabbit.version> - <oak.version>1.6.8</oak.version> + <oak.version>1.8.1</oak.version> <org.ops4j.pax.exam.version>4.11.0</org.ops4j.pax.exam.version> </properties> @@ -124,6 +124,12 @@ </dependency> <dependency> <groupId>org.apache.jackrabbit</groupId> + <artifactId>oak-query-spi</artifactId> + <version>${oak.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.jackrabbit</groupId> <artifactId>oak-jcr</artifactId> <version>${oak.version}</version> <scope>provided</scope> @@ -168,7 +174,7 @@ <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.testing.paxexam</artifactId> - <version>0.0.4</version> + <version>1.0.0-SNAPSHOT</version> <scope>test</scope> </dependency> <!-- OSGi --> diff --git a/src/main/java/org/apache/sling/jcr/oak/server/internal/OakSlingRepositoryManager.java b/src/main/java/org/apache/sling/jcr/oak/server/internal/OakSlingRepositoryManager.java index 98c4395..651e350 100644 --- a/src/main/java/org/apache/sling/jcr/oak/server/internal/OakSlingRepositoryManager.java +++ b/src/main/java/org/apache/sling/jcr/oak/server/internal/OakSlingRepositoryManager.java @@ -32,29 +32,31 @@ import javax.jcr.Repository; import org.apache.jackrabbit.JcrConstants; import org.apache.jackrabbit.api.JackrabbitRepository; +import org.apache.jackrabbit.oak.InitialContent; import org.apache.jackrabbit.oak.Oak; import org.apache.jackrabbit.oak.jcr.Jcr; import org.apache.jackrabbit.oak.osgi.OsgiWhiteboard; import org.apache.jackrabbit.oak.plugins.commit.ConflictValidatorProvider; import org.apache.jackrabbit.oak.plugins.commit.JcrConflictHandler; -import org.apache.jackrabbit.oak.plugins.index.aggregate.NodeAggregator; +import org.apache.jackrabbit.oak.plugins.index.WhiteboardIndexEditorProvider; import org.apache.jackrabbit.oak.plugins.index.aggregate.SimpleNodeAggregator; import org.apache.jackrabbit.oak.plugins.index.lucene.util.LuceneIndexHelper; import org.apache.jackrabbit.oak.plugins.name.NameValidatorProvider; import org.apache.jackrabbit.oak.plugins.name.NamespaceEditorProvider; import org.apache.jackrabbit.oak.plugins.nodetype.TypeEditorProvider; -import org.apache.jackrabbit.oak.plugins.nodetype.write.InitialContent; import org.apache.jackrabbit.oak.plugins.observation.CommitRateLimiter; import org.apache.jackrabbit.oak.plugins.version.VersionHook; import org.apache.jackrabbit.oak.spi.lifecycle.RepositoryInitializer; +import org.apache.jackrabbit.oak.spi.mount.MountInfoProvider; +import org.apache.jackrabbit.oak.spi.mount.Mounts; +import org.apache.jackrabbit.oak.spi.query.QueryIndex.NodeAggregator; +import org.apache.jackrabbit.oak.spi.query.WhiteboardIndexProvider; import org.apache.jackrabbit.oak.spi.security.SecurityProvider; import org.apache.jackrabbit.oak.spi.security.user.UserConfiguration; import org.apache.jackrabbit.oak.spi.security.user.UserConstants; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeStore; import org.apache.jackrabbit.oak.spi.whiteboard.Whiteboard; -import org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardIndexEditorProvider; -import org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardIndexProvider; import org.apache.sling.commons.threads.ThreadPool; import org.apache.sling.commons.threads.ThreadPoolManager; import org.apache.sling.jcr.base.AbstractSlingRepository2; -- To stop receiving notification emails like this one, please contact [email protected].
