diff --git a/pom.xml b/pom.xml
index 9fc9e29f72..6451d5cdf8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,7 @@
         <dependency>
             <groupId>org.alfresco.cmis.client</groupId>
             <artifactId>alfresco-opencmis-extension</artifactId>
-            <version>1.0</version>
+            <version>0.9</version>
         </dependency>
         <dependency>
             <groupId>org.apache.ws.commons.schema</groupId>
@@ -85,10 +85,6 @@
                     <groupId>org.apache.geronimo.specs</groupId>
                     <artifactId>geronimo-javamail_1.4_spec</artifactId>
                 </exclusion>
-                <exclusion>
-                    <groupId>org.codehaus.woodstox</groupId>
-                    <artifactId>wstx-asl</artifactId>
-                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -110,11 +106,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>org.apache.chemistry.opencmis</groupId>
-            <artifactId>chemistry-opencmis-client-impl</artifactId>
-            <version>${dependency.opencmis.version}</version>
-        </dependency>
         <!-- ALF-19407 chemistry-tck-atompub and junit are dependencies of CMISTestRunnerWebScript, which is not a test -->
         <dependency>
             <groupId>org.apache.chemistry</groupId>
diff --git a/source/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptHelper.java b/source/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptHelper.java
index c49df16d93..fceb903c97 100644
--- a/source/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptHelper.java
+++ b/source/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptHelper.java
@@ -152,7 +152,6 @@ public class ResourceWebScriptHelper
      * @param selectParam
      * @return List<String> bean property names potentially using JSON Pointer syntax
      */
-    @SuppressWarnings("unchecked")
     public static List<String> getSelectClause(String selectParam) throws InvalidArgumentException
     {
         if (selectParam == null) return Collections.emptyList();
@@ -168,7 +167,8 @@ public class ResourceWebScriptHelper
 			{
 				return Arrays.asList(selectedPropsTree.getText());
 			}
-			List<Tree> children = (List<Tree>) selectedPropsTree.getChildren();
+			@SuppressWarnings("unchecked")
+            List<Tree> children = (List<Tree>)selectedPropsTree.getChildren();
 			if (children!= null && !children.isEmpty())
 			{
 				List<String> properties = new ArrayList<String>(children.size());
diff --git a/source/test-java/org/alfresco/rest/api/tests/TCKEnterpriseTestFixture.java b/source/test-java/org/alfresco/rest/api/tests/TCKEnterpriseTestFixture.java
index 58a7b57840..a2ecf8b0c0 100644
--- a/source/test-java/org/alfresco/rest/api/tests/TCKEnterpriseTestFixture.java
+++ b/source/test-java/org/alfresco/rest/api/tests/TCKEnterpriseTestFixture.java
@@ -12,7 +12,7 @@ public class TCKEnterpriseTestFixture extends EnterpriseTestFixture
 		"rest-api-test-context.xml"
     };
 
-	public final static String[] CLASS_LOCATIONS = new String[] {"classpath*:/publicapi/lucene/"};
+	public final static String[] CLASS_LOCATIONS = new String[] {"classpath*:/publicapi/solr/"};
 
     private static TCKEnterpriseTestFixture instance;