Index: oak-auth-external/pom.xml
===================================================================
--- oak-auth-external/pom.xml	(revision 1804638)
+++ oak-auth-external/pom.xml	(working copy)
@@ -114,6 +114,11 @@
         </dependency>
         <dependency>
             <groupId>org.apache.jackrabbit</groupId>
+            <artifactId>oak-query-spi</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.jackrabbit</groupId>
             <artifactId>oak-core</artifactId>
             <version>${project.version}</version>
         </dependency>
Index: oak-authorization-cug/pom.xml
===================================================================
--- oak-authorization-cug/pom.xml	(revision 1804638)
+++ oak-authorization-cug/pom.xml	(working copy)
@@ -64,10 +64,14 @@
     </dependency>
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
+      <artifactId>oak-query-spi</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.jackrabbit</groupId>
       <artifactId>oak-core</artifactId>
       <version>${project.version}</version>
     </dependency>
-
     <!-- General utility libraries -->
     <dependency>
       <groupId>com.google.guava</groupId>
Index: oak-benchmarks/pom.xml
===================================================================
--- oak-benchmarks/pom.xml	(revision 1804638)
+++ oak-benchmarks/pom.xml	(working copy)
@@ -95,6 +95,11 @@
         </dependency>
         <dependency>
             <groupId>org.apache.jackrabbit</groupId>
+            <artifactId>oak-query-spi</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.jackrabbit</groupId>
             <artifactId>oak-core-spi</artifactId>
             <version>${project.version}</version>
         </dependency>
Index: oak-core/pom.xml
===================================================================
--- oak-core/pom.xml	(revision 1804638)
+++ oak-core/pom.xml	(working copy)
@@ -71,8 +71,6 @@
               org.apache.jackrabbit.oak.plugins.tree,
               org.apache.jackrabbit.oak.plugins.value.jcr,
               org.apache.jackrabbit.oak.plugins.version,
-              org.apache.jackrabbit.oak.spi.query,
-              org.apache.jackrabbit.oak.spi.query.fulltext,
               org.apache.jackrabbit.oak.spi.security,
               org.apache.jackrabbit.oak.spi.security.authentication,
               org.apache.jackrabbit.oak.spi.security.authentication.callback,
@@ -160,6 +158,11 @@
     </dependency>
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
+      <artifactId>oak-query-spi</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.jackrabbit</groupId>
       <artifactId>oak-commons</artifactId>
       <version>${project.version}</version>
     </dependency>
Index: oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/CompositeQueryIndexProvider.java (deleted)
===================================================================
Index: oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/Cursor.java (deleted)
===================================================================
Index: oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/Filter.java (deleted)
===================================================================
Index: oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/IndexRow.java (deleted)
===================================================================
Index: oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/QueryConstants.java (deleted)
===================================================================
Index: oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/QueryEngineSettings.java
===================================================================
--- oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/QueryEngineSettings.java	(revision 1804821)
+++ oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/QueryEngineSettings.java	(working copy)
@@ -29,7 +29,7 @@
 public class QueryEngineSettings implements QueryEngineSettingsMBean, QueryLimits {
     
     /**
-     * the flag used to turn on/off the optimisations on top of the {@link org.apache.jackrabbit.oak.query.Query} object.
+     * the flag used to turn on/off the optimisations on top of the {@code org.apache.jackrabbit.oak.query.Query} object.
      * {@code -Doak.query.sql2optimisation}
      */
     public static final String SQL2_OPTIMISATION_FLAG = "oak.query.sql2optimisation";
Index: oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/QueryIndex.java (deleted)
===================================================================
Index: oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/QueryIndexProvider.java (deleted)
===================================================================
Index: oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/QueryLimits.java (deleted)
===================================================================
Index: oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/WhiteboardIndexProvider.java (deleted)
===================================================================
Index: oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/fulltext/FullTextAnd.java (deleted)
===================================================================
Index: oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/fulltext/FullTextContains.java (deleted)
===================================================================
Index: oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/fulltext/FullTextExpression.java (deleted)
===================================================================
Index: oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/fulltext/FullTextOr.java (deleted)
===================================================================
Index: oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/fulltext/FullTextParser.java (deleted)
===================================================================
Index: oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/fulltext/FullTextTerm.java (deleted)
===================================================================
Index: oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/fulltext/FullTextVisitor.java (deleted)
===================================================================
Index: oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/fulltext/LikePattern.java (deleted)
===================================================================
Index: oak-it/pom.xml
===================================================================
--- oak-it/pom.xml	(revision 1804638)
+++ oak-it/pom.xml	(working copy)
@@ -52,6 +52,12 @@
         </dependency>
         <dependency>
             <groupId>org.apache.jackrabbit</groupId>
+            <artifactId>oak-query-spi</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.jackrabbit</groupId>
             <artifactId>oak-segment-tar</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
Index: oak-it-osgi/pom.xml
===================================================================
--- oak-it-osgi/pom.xml	(revision 1804638)
+++ oak-it-osgi/pom.xml	(working copy)
@@ -89,6 +89,12 @@
     </dependency>
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
+      <artifactId>oak-query-spi</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.jackrabbit</groupId>
       <artifactId>oak-core</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
Index: oak-it-osgi/test-bundles.xml
===================================================================
--- oak-it-osgi/test-bundles.xml	(revision 1804638)
+++ oak-it-osgi/test-bundles.xml	(working copy)
@@ -46,6 +46,7 @@
         <include>org.apache.jackrabbit:oak-blob</include>
         <include>org.apache.jackrabbit:oak-core-spi</include>
         <include>org.apache.jackrabbit:oak-store-spi</include>
+        <include>org.apache.jackrabbit:oak-query-spi</include>
         <include>org.apache.jackrabbit:oak-blob-plugins</include>
         <include>io.dropwizard.metrics:metrics-core</include>
       </includes>
Index: oak-jcr/pom.xml
===================================================================
--- oak-jcr/pom.xml	(revision 1804638)
+++ oak-jcr/pom.xml	(working copy)
@@ -235,6 +235,11 @@
     </dependency>
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
+      <artifactId>oak-query-spi</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.jackrabbit</groupId>
       <artifactId>oak-store-spi</artifactId>
       <version>${project.version}</version>
       <type>test-jar</type>
Index: oak-lucene/pom.xml
===================================================================
--- oak-lucene/pom.xml	(revision 1804638)
+++ oak-lucene/pom.xml	(working copy)
@@ -184,6 +184,11 @@
     </dependency>
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
+      <artifactId>oak-query-spi</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.jackrabbit</groupId>
       <artifactId>oak-core</artifactId>
       <version>${project.version}</version>
     </dependency>
Index: oak-query-spi/pom.xml
===================================================================
--- oak-query-spi/pom.xml	(nonexistent)
+++ oak-query-spi/pom.xml	(working copy)
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd ">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.jackrabbit</groupId>
+    <artifactId>oak-parent</artifactId>
+    <version>1.8-SNAPSHOT</version>
+    <relativePath>../oak-parent/pom.xml</relativePath>
+  </parent>
+
+  <artifactId>oak-query-spi</artifactId>
+  <name>Oak Query SPI</name>
+  <packaging>bundle</packaging>
+
+  <build>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.felix</groupId>
+          <artifactId>maven-bundle-plugin</artifactId>
+          <configuration>
+            <instructions>
+              <Export-Package>
+                org.apache.jackrabbit.oak.spi.query,
+                org.apache.jackrabbit.oak.spi.query.fulltext
+              </Export-Package>
+            </instructions>
+          </configuration>
+          <executions>
+            <execution>
+              <id>baseline</id>
+              <goals>
+                <goal>baseline</goal>
+              </goals>
+              <phase>pre-integration-test</phase>
+              <configuration>
+                <!--
+                  This is required as classes present in this module
+                  were part of oak-core. This should be removed
+                  post 1.8 release
+                -->
+                <comparisonArtifactId>oak-core</comparisonArtifactId>
+              </configuration>
+            </execution>
+          </executions>
+       </plugin>
+        <plugin>
+          <groupId>org.apache.felix</groupId>
+          <artifactId>maven-scr-plugin</artifactId>
+        </plugin>
+        <plugin>
+          <artifactId>maven-failsafe-plugin</artifactId>
+          <configuration>
+            <systemPropertyVariables>
+              <java.util.logging.config.file>
+                src/test/resources/logging.properties
+              </java.util.logging.config.file>
+            </systemPropertyVariables>
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.rat</groupId>
+          <artifactId>apache-rat-plugin</artifactId>
+          <configuration>
+            <excludes>
+              <exclude>**/test.json</exclude>
+            </excludes>
+          </configuration>
+        </plugin>
+     </plugins>
+    </build>
+
+  <dependencies>
+    <!-- Optional OSGi dependencies, used only when running within OSGi -->
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.core</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.compendium</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.annotation</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.felix</groupId>
+      <artifactId>org.apache.felix.scr.annotations</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+    <!-- JCR and Jackrabbit dependencies -->
+    <dependency>
+      <groupId>javax.jcr</groupId>
+      <artifactId>jcr</artifactId>
+      <version>2.0</version>
+    </dependency>
+
+    <!-- Dependencies to other Oak components -->
+    <dependency>
+      <groupId>org.apache.jackrabbit</groupId>
+      <artifactId>oak-api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.jackrabbit</groupId>
+      <artifactId>oak-commons</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.jackrabbit</groupId>
+      <artifactId>oak-store-spi</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+
+    <!-- General utility libraries -->
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+      <version>1.5</version>
+    </dependency>
+
+    <!-- Logging -->
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+    </dependency>
+
+    <!-- Findbugs annotations -->
+    <dependency>
+      <groupId>com.google.code.findbugs</groupId>
+      <artifactId>jsr305</artifactId>
+    </dependency>
+
+    <!-- Test Dependencies -->
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>1.10.19</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+</project>
\ No newline at end of file
Index: oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/CompositeQueryIndexProvider.java
===================================================================
Index: oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/Cursor.java
===================================================================
Index: oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/Filter.java
===================================================================
--- oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/Filter.java	(revision 1804821)
+++ oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/Filter.java	(working copy)
@@ -412,8 +412,20 @@
 
     Filter EMPTY_FILTER = new Filter() {
 
-        private final QueryEngineSettings EMPTY_SETTINGS = new QueryEngineSettings();
+        private final QueryLimits EMPTY_LIMITS = new QueryLimits() {
 
+            @Override
+            public long getLimitInMemory() {
+                return Long.MAX_VALUE;
+            }
+
+            @Override
+            public long getLimitReads() {
+                return Long.MAX_VALUE;
+            }
+
+        };
+
         @Override
         public Collection<PropertyRestriction> getPropertyRestrictions() {
             return Collections.emptyList();
@@ -430,8 +442,8 @@
         }
 
         @Override
-        public QueryEngineSettings getQueryLimits() {
-            return EMPTY_SETTINGS;
+        public QueryLimits getQueryLimits() {
+            return EMPTY_LIMITS;
         }
 
         @Override
Index: oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/IndexRow.java
===================================================================
Index: oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/QueryConstants.java
===================================================================
Index: oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/QueryIndex.java
===================================================================
Index: oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/QueryIndexProvider.java
===================================================================
Index: oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/QueryLimits.java
===================================================================
Index: oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/WhiteboardIndexProvider.java
===================================================================
Index: oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/fulltext/FullTextAnd.java
===================================================================
Index: oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/fulltext/FullTextContains.java
===================================================================
Index: oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/fulltext/FullTextExpression.java
===================================================================
Index: oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/fulltext/FullTextOr.java
===================================================================
Index: oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/fulltext/FullTextParser.java
===================================================================
Index: oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/fulltext/FullTextTerm.java
===================================================================
Index: oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/fulltext/FullTextVisitor.java
===================================================================
Index: oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/fulltext/LikePattern.java
===================================================================
Index: oak-query-spi/src/test/resources/logging.properties
===================================================================
--- oak-query-spi/src/test/resources/logging.properties	(nonexistent)
+++ oak-query-spi/src/test/resources/logging.properties	(working copy)
@@ -0,0 +1,16 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+handlers = org.slf4j.bridge.SLF4JBridgeHandler
Index: oak-run/pom.xml
===================================================================
--- oak-run/pom.xml	(revision 1804638)
+++ oak-run/pom.xml	(working copy)
@@ -205,6 +205,11 @@
     </dependency>
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
+      <artifactId>oak-query-spi</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.jackrabbit</groupId>
       <artifactId>oak-core-spi</artifactId>
       <version>${project.version}</version>
     </dependency>
Index: oak-solr-core/pom.xml
===================================================================
--- oak-solr-core/pom.xml	(revision 1804638)
+++ oak-solr-core/pom.xml	(working copy)
@@ -127,6 +127,11 @@
         </dependency>
         <dependency>
             <groupId>org.apache.jackrabbit</groupId>
+            <artifactId>oak-query-spi</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.jackrabbit</groupId>
             <artifactId>oak-core</artifactId>
             <version>${project.version}</version>
             <classifier>tests</classifier>
Index: oak-store-composite/pom.xml
===================================================================
--- oak-store-composite/pom.xml	(revision 1804638)
+++ oak-store-composite/pom.xml	(working copy)
@@ -106,6 +106,11 @@
       <artifactId>oak-store-spi</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.jackrabbit</groupId>
+      <artifactId>oak-query-spi</artifactId>
+      <version>${project.version}</version>
+    </dependency>
 
     <!-- General utility libraries -->
     <dependency>
Index: pom.xml
===================================================================
--- pom.xml	(revision 1804638)
+++ pom.xml	(working copy)
@@ -41,6 +41,7 @@
     <module>oak-api</module>
     <module>oak-core-spi</module>
     <module>oak-store-spi</module>
+    <module>oak-query-spi</module>
     <module>oak-store-composite</module>
 
     <module>oak-blob-plugins</module>