diff --git a/build.gradle b/build.gradle
index 13cb239155..6c66880052 100644
--- a/build.gradle
+++ b/build.gradle
@@ -92,12 +92,21 @@ subprojects {
 		}
 		mavenCentral()
 		maven {
-			url "https://artifacts.alfresco.com/nexus/content/groups/internal"
+			url alfrescoMavenUrl
+		}
+		maven {
+			url alfrescoEnterpriseMavenUrl
 			credentials {
-				username 'bamboo'
-				password 'b@mb00'
+				username alfrescoEnterpriseMavenUser
+				password alfrescoEnterpriseMavenPwd
 			}
 		}
+		maven {
+			url 'https://artifacts.alfresco.com/nexus/content/groups/public-snapshots'
+		}
+		maven {
+			url 'https://repository.jboss.org/nexus/content/groups/public'
+		}
 	}
 	
 	dependencies {		     		
diff --git a/gradle.properties b/gradle.properties
index 44b381efbb..7236159c09 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,4 +2,12 @@ groupid=alfresco
 packageName=rm
 version=2.1.0
 build=dev
-alfrescoBaseVersion=4.0.2
+
+alfrescoMavenUrl=https://artifacts.alfresco.com/nexus/content/groups/public/
+alfrescoEnterpriseMavenUrl=https://artifacts.alfresco.com/nexus/content/groups/internal
+alfrescoEnterpriseMavenUser=
+alfrescoEnterpriseMavenPwd=
+
+# set to org.alfresco.enterprise when enterprise version required
+alfrescoGroupId=org.alfresco
+alfrescoBaseVersion=4.2.b
diff --git a/rm-server/build.gradle b/rm-server/build.gradle
index 497848cc37..5ce73c2b82 100644
--- a/rm-server/build.gradle
+++ b/rm-server/build.gradle
@@ -12,8 +12,8 @@ dependencies {
 	testRuntime files(configDir)
 	testRuntime files(testResourceDir)
 	
-	testRuntime group: 'org.alfresco.enterprise', name: 'alfresco', version: alfrescoBaseVersion, type: 'war'
-	testRuntime group: 'org.alfresco.enterprise', name: 'alfresco-solr', version: alfrescoBaseVersion, type: 'zip'
+	testRuntime group: alfrescoGroupId, name: 'alfresco', version: alfrescoBaseVersion, type: 'war'
+	testRuntime group: alfrescoGroupId, name: 'alfresco-solr', version: alfrescoBaseVersion, type: 'zip'
 }
 
 task fetchSOLR(type:Copy) {
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/security/ExtendedReaderDynamicAuthority.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/security/ExtendedReaderDynamicAuthority.java
index 8eaf471512..291e7e9ff5 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/security/ExtendedReaderDynamicAuthority.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/security/ExtendedReaderDynamicAuthority.java
@@ -1,5 +1,5 @@
 /*
-`        * Copyright (C) 2005-2012 Alfresco Software Limited.
+ * Copyright (C) 2005-2012 Alfresco Software Limited.
  *
  * This file is part of Alfresco
  *
@@ -27,7 +27,6 @@ import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.cmr.security.AuthorityService;
 import org.alfresco.service.cmr.security.AuthorityType;
-import org.alfresco.service.namespace.QName;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/WebScriptTestSuite.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/WebScriptTestSuite.java
index 421428e660..0679b820c5 100644
--- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/WebScriptTestSuite.java
+++ b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/WebScriptTestSuite.java
@@ -21,8 +21,8 @@ package org.alfresco.module.org_alfresco_module_rm.test;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.alfresco.module.org_alfresco_module_rm.script.DataSetPost;
 import org.alfresco.module.org_alfresco_module_rm.test.webscript.BootstraptestDataRestApiTest;
+import org.alfresco.module.org_alfresco_module_rm.test.webscript.DataSetPostTest;
 import org.alfresco.module.org_alfresco_module_rm.test.webscript.DataSetsGetTest;
 import org.alfresco.module.org_alfresco_module_rm.test.webscript.DispositionRestApiTest;
 import org.alfresco.module.org_alfresco_module_rm.test.webscript.EventRestApiTest;
@@ -55,7 +55,7 @@ public class WebScriptTestSuite extends TestSuite
         suite.addTestSuite(RmRestApiTest.class);
         suite.addTestSuite(RoleRestApiTest.class);
         suite.addTestSuite(DataSetsGetTest.class);
-        suite.addTestSuite(DataSetPost.class);
+        suite.addTestSuite(DataSetPostTest.class);
         return suite;
     }
 }