diff --git a/application.properties b/application.properties
index 844ca54..6e47c08 100644
--- a/application.properties
+++ b/application.properties
@@ -1,4 +1,4 @@
 #Grails Metadata file
 #Tue Apr 03 12:40:26 BST 2012
-app.grails.version=2.0.4
+app.grails.version=2.5.0
 app.name=ldap-server
diff --git a/grails-app/conf/BuildConfig.groovy b/grails-app/conf/BuildConfig.groovy
index 1e7da54..423ccea 100644
--- a/grails-app/conf/BuildConfig.groovy
+++ b/grails-app/conf/BuildConfig.groovy
@@ -13,10 +13,11 @@ grails.project.dependency.resolution = {
 	}
 	
 	plugins {
-		build (":release:1.0.1", ":svn:1.0.2") {
-			export = false
+		test(":tomcat:7.0.55.2") {
+		  export = false
 		}
-		test (":hibernate:$grailsVersion", ":tomcat:$grailsVersion") {
+
+		build(":release:3.1.1") {
 			export = false
 		}
 	}
diff --git a/src/groovy/grails/ldap/server/TransientGrailsLdapServer.groovy b/src/groovy/grails/ldap/server/TransientGrailsLdapServer.groovy
index f0e2851..74a44a9 100644
--- a/src/groovy/grails/ldap/server/TransientGrailsLdapServer.groovy
+++ b/src/groovy/grails/ldap/server/TransientGrailsLdapServer.groovy
@@ -23,7 +23,9 @@ import org.springframework.web.context.ServletContextAware
 
 import grails.util.BuildSettingsHolder
 
-import org.codehaus.groovy.grails.commons.ApplicationHolder
+import grails.util.Holders
+
+
 
 import groovy.text.SimpleTemplateEngine
 
@@ -61,7 +63,7 @@ class TransientGrailsLdapServer implements InitializingBean, DisposableBean, Bea
 
 			log.info("${beanName} config: " + configOptions.collect { "$it = ${this.properties[it]}" }.join(', '))
 
-			def baseConfigDirPath = (ApplicationHolder.application.warDeployed) ? ApplicationHolder.application.parentContext.getResource("WEB-INF/grails-app/ldap-servers").file.path : "grails-app/ldap-servers"
+			def baseConfigDirPath = (Holders.grailsApplication.warDeployed) ? Holders.grailsApplication.parentContext.getResource("WEB-INF/grails-app/ldap-servers").file.path : "grails-app/ldap-servers"
 			def baseConfigDir = new File(baseConfigDirPath)
 			configDir = new File(baseConfigDir, beanName - "LdapServer")
 			dataDir = new File(configDir, "data")