diff --git a/pom.xml b/pom.xml
index 6451d5cdf8..9fc9e29f72 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,7 @@
         <dependency>
             <groupId>org.alfresco.cmis.client</groupId>
             <artifactId>alfresco-opencmis-extension</artifactId>
-            <version>0.9</version>
+            <version>1.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.ws.commons.schema</groupId>
@@ -85,6 +85,10 @@
                     <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>
@@ -106,6 +110,11 @@
                 </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 fceb903c97..c49df16d93 100644
--- a/source/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptHelper.java
+++ b/source/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptHelper.java
@@ -152,6 +152,7 @@ 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();
@@ -167,8 +168,7 @@ public class ResourceWebScriptHelper
 			{
 				return Arrays.asList(selectedPropsTree.getText());
 			}
-			@SuppressWarnings("unchecked")
-            List<Tree> children = (List<Tree>)selectedPropsTree.getChildren();
+			List<Tree> children = (List<Tree>) selectedPropsTree.getChildren();
 			if (children!= null && !children.isEmpty())
 			{
 				List<String> properties = new ArrayList<String>(children.size());