diff --git a/build.gradle b/build.gradle
index 05b68c1..4208e1b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,16 +1,20 @@
 buildscript {
   repositories {
     maven { url "https://repo.spring.io/plugins-release" }
-    maven { url "https://repo.spring.io/plugins-snapshot" }
-    jcenter()
   }
   dependencies {
-    classpath("org.springframework.build.gradle:propdeps-plugin:0.0.6-SNAPSHOT")
+    classpath("org.springframework.build.gradle:propdeps-plugin:0.0.7")
     classpath('me.champeau.gradle:gradle-javadoc-hotfix-plugin:0.1')
-    classpath('org.gradle.api.plugins:gradle-tomcat-plugin:1.2.2')
-    classpath 'org.asciidoctor:asciidoctor-gradle-plugin:0.7.3'
   }
 }
+
+plugins {
+  id 'org.asciidoctor.convert' version '1.5.2'
+  id 'com.bluepapa32.watch' version '0.1.5'
+  id 'org.kordamp.gradle.livereload' version '0.2.1'
+  id 'com.bmuschko.tomcat' version '2.2.1'
+}
+
 ext.releaseBuild = version.endsWith('RELEASE')
 ext.snapshotBuild = version.endsWith('SNAPSHOT')
 ext.milestoneBuild = !(releaseBuild || snapshotBuild)
@@ -78,8 +82,8 @@ configure(allprojects) {
 
   idea {
     module {
-      scopes.PROVIDED.plus += configurations.provided
-      scopes.PROVIDED.plus += configurations.optional
+      scopes.PROVIDED.plus += [configurations.provided]
+      scopes.PROVIDED.plus += [configurations.optional]
     }
   }
   // servlet-api (2.5) and tomcat-servlet-api (3.0) classpath entries should not be
@@ -135,9 +139,6 @@ configure(allprojects) { subproject ->
 configure(rootProject) {
   apply plugin: 'org.asciidoctor.gradle.asciidoctor'
 
-  asciidoctorj {
-    version = '1.5.0.preview.7'
-  }
   asciidoctor {
     options = [
             eruby: 'erubis',
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index c636197..768266b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-all.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-2.4-all.zip
diff --git a/mail-webapp/build.gradle b/mail-webapp/build.gradle
index 488525f..8808b3e 100644
--- a/mail-webapp/build.gradle
+++ b/mail-webapp/build.gradle
@@ -1,29 +1,30 @@
 apply plugin: 'groovy'
 apply plugin: 'war'
-apply plugin: 'tomcat'
+apply plugin: 'com.bmuschko.tomcat'
 
 tasks.findByPath("artifactoryPublish")?.enabled = false
 sonarRunner {
     skipProject = true
 }
 
-task integrationTomcatRunWar(type: org.gradle.api.plugins.tomcat.tasks.TomcatRunWar, dependsOn: war) {
-    contextPath = '/mail'
-    daemon = true
-    doFirst {
-        // delay reserving ports to ensure they are still available
-        def ports = reservePorts(3)
-        httpPort = ports[0]
-        ajpPort = ports[1]
-        stopPort = ports[2]
-    }
+task integrationTomcatRunWar(type: com.bmuschko.gradle.tomcat.tasks.TomcatRun, dependsOn: war) {
+	contextPath = '/mail'
+	daemon = true
+	doFirst {
+		// delay reserving ports to ensure they are still available
+		def ports = reservePorts(3)
+		httpPort = ports[0]
+		ajpPort = ports[1]
+		stopPort = ports[2]
+	}
 }
 
-task integrationTomcatStop(type: org.gradle.api.plugins.tomcat.tasks.TomcatStop, dependsOn: war) {
-    doFirst {
-        stopPort = integrationTomcatRunWar.stopPort
-    }
+task integrationTomcatStop(type: com.bmuschko.gradle.tomcat.tasks.TomcatStop, dependsOn: war) {
+	doFirst {
+		stopPort = integrationTomcatRunWar.stopPort
+	}
 }
+
 test {
     doFirst {
         def host = 'localhost:' + integrationTomcatRunWar.httpPort
@@ -37,12 +38,10 @@ description = 'Spring MVC Test HtmlUnit Sample'
 tasks.findByPath("artifactoryPublish")?.enabled = false
 
 dependencies {
-    def tomcatVersion = '7.0.42'
-    tomcat "org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}",
-            "org.apache.tomcat.embed:tomcat-embed-logging-juli:${tomcatVersion}"
-    tomcat("org.apache.tomcat.embed:tomcat-embed-jasper:${tomcatVersion}") {
-        exclude group: 'org.eclipse.jdt.core.compiler', module: 'ecj'
-    }
+	def tomcatVersion = '7.0.61'
+	tomcat "org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}",
+			"org.apache.tomcat.embed:tomcat-embed-logging-juli:${tomcatVersion}"
+	tomcat("org.apache.tomcat.embed:tomcat-embed-jasper:${tomcatVersion}")
 
     compile "org.springframework:spring-context:$springVersion",
             "org.springframework:spring-webmvc:$springVersion",