diff --git a/build.gradle b/build.gradle
index 9b919824e0..35846c03f2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,6 +8,7 @@ buildscript {
         classpath("org.springframework.build.gradle:propdeps-plugin:0.0.3")
         classpath("org.springframework.build.gradle:docbook-reference-plugin:0.2.7")
         classpath("org.springframework.build.gradle:bundlor-plugin:0.1.2")
+        classpath("org.gradle.api.plugins:gradle-tomcat-plugin:0.9.8")
     }
 }
 
@@ -76,6 +77,8 @@ configure(subprojects - coreModuleProjects) {
 }
 
 configure(javaProjects) {
+    ext.TOMCAT_GRADLE = "$rootDir/gradle/tomcat.gradle"
+    ext.WAR_SAMPLE_GRADLE = "$rootDir/gradle/war-sample.gradle"
     apply from: "$rootDir/gradle/javaprojects.gradle"
     apply from: "$rootDir/gradle/release-checks.gradle"
     apply from: "$rootDir/gradle/maven-deployment.gradle"
diff --git a/gradle/tomcat.gradle b/gradle/tomcat.gradle
new file mode 100644
index 0000000000..2dbb097d87
--- /dev/null
+++ b/gradle/tomcat.gradle
@@ -0,0 +1,10 @@
+apply plugin: 'tomcat'
+
+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'
+    }
+}
\ No newline at end of file
diff --git a/gradle/war-sample.gradle b/gradle/war-sample.gradle
new file mode 100644
index 0000000000..7da343f22f
--- /dev/null
+++ b/gradle/war-sample.gradle
@@ -0,0 +1,6 @@
+apply plugin: 'war'
+apply from: TOMCAT_GRADLE
+
+sonarRunner {
+    skipProject = true
+}
\ No newline at end of file
diff --git a/samples/concurrency-jc/build.gradle b/samples/concurrency-jc/build.gradle
index 9a03c289f7..6cb8dde79c 100644
--- a/samples/concurrency-jc/build.gradle
+++ b/samples/concurrency-jc/build.gradle
@@ -1,15 +1,7 @@
-apply plugin: 'war'
+apply from: WAR_SAMPLE_GRADLE
 
-sonarRunner {
-    skipProject = true
-}
-
-eclipse {
-    wtp {
-        component {
-            contextPath = 'concurrency'
-        }
-    }
+war {
+    baseName = "concurrency"
 }
 
 dependencies {
diff --git a/samples/helloworld-jc/build.gradle b/samples/helloworld-jc/build.gradle
index 7312b003f9..f1abb7b14e 100644
--- a/samples/helloworld-jc/build.gradle
+++ b/samples/helloworld-jc/build.gradle
@@ -1,15 +1,7 @@
-apply plugin: 'war'
+apply from: WAR_SAMPLE_GRADLE
 
-sonarRunner {
-    skipProject = true
-}
-
-eclipse {
-    wtp {
-        component {
-            contextPath = 'helloworld'
-        }
-    }
+war {
+    baseName = "helloworld"
 }
 
 dependencies {
diff --git a/samples/inmemory-jc/build.gradle b/samples/inmemory-jc/build.gradle
index 94cd1925b9..50fd2ebe42 100644
--- a/samples/inmemory-jc/build.gradle
+++ b/samples/inmemory-jc/build.gradle
@@ -1,15 +1,7 @@
-apply plugin: 'war'
+apply from: WAR_SAMPLE_GRADLE
 
-sonarRunner {
-    skipProject = true
-}
-
-eclipse {
-    wtp {
-        component {
-            contextPath = 'inmemory'
-        }
-    }
+war {
+    baseName = "inmemory"
 }
 
 dependencies {
diff --git a/samples/jdbc-jc/build.gradle b/samples/jdbc-jc/build.gradle
index c87118413b..bf44ddf0de 100644
--- a/samples/jdbc-jc/build.gradle
+++ b/samples/jdbc-jc/build.gradle
@@ -1,15 +1,7 @@
-apply plugin: 'war'
+apply from: WAR_SAMPLE_GRADLE
 
-sonarRunner {
-    skipProject = true
-}
-
-eclipse {
-    wtp {
-        component {
-            contextPath = 'jdbc'
-        }
-    }
+war {
+    baseName = "jdbc"
 }
 
 dependencies {
diff --git a/samples/ldap-jc/build.gradle b/samples/ldap-jc/build.gradle
index 07968cc0ef..45d88ce300 100644
--- a/samples/ldap-jc/build.gradle
+++ b/samples/ldap-jc/build.gradle
@@ -1,15 +1,7 @@
-apply plugin: 'war'
+apply from: WAR_SAMPLE_GRADLE
 
-sonarRunner {
-    skipProject = true
-}
-
-eclipse {
-    wtp {
-        component {
-            contextPath = 'ldap'
-        }
-    }
+war {
+    baseName = "ldap"
 }
 
 dependencies {
diff --git a/samples/openid-jc/build.gradle b/samples/openid-jc/build.gradle
index 1581dc482f..11472cc661 100644
--- a/samples/openid-jc/build.gradle
+++ b/samples/openid-jc/build.gradle
@@ -1,15 +1,7 @@
-apply plugin: 'war'
+apply from: WAR_SAMPLE_GRADLE
 
-sonarRunner {
-    skipProject = true
-}
-
-eclipse {
-    wtp {
-        component {
-            contextPath = 'openid'
-        }
-    }
+war {
+    baseName = "openid"
 }
 
 dependencies {
diff --git a/samples/preauth-jc/build.gradle b/samples/preauth-jc/build.gradle
index 0468525594..8a0866079e 100644
--- a/samples/preauth-jc/build.gradle
+++ b/samples/preauth-jc/build.gradle
@@ -1,15 +1,7 @@
-apply plugin: 'war'
+apply from: WAR_SAMPLE_GRADLE
 
-sonarRunner {
-    skipProject = true
-}
-
-eclipse {
-    wtp {
-        component {
-            contextPath = 'preauth'
-        }
-    }
+war {
+    baseName = "preauth"
 }
 
 dependencies {
diff --git a/samples/rememberme-jc/build.gradle b/samples/rememberme-jc/build.gradle
index 82102c8ae0..303357b811 100644
--- a/samples/rememberme-jc/build.gradle
+++ b/samples/rememberme-jc/build.gradle
@@ -1,15 +1,7 @@
-apply plugin: 'war'
+apply from: WAR_SAMPLE_GRADLE
 
-sonarRunner {
-    skipProject = true
-}
-
-eclipse {
-    wtp {
-        component {
-            contextPath = 'rememberme'
-        }
-    }
+war {
+    baseName = "rememberme"
 }
 
 dependencies {
diff --git a/samples/x509-jc/build.gradle b/samples/x509-jc/build.gradle
index 67d434738a..760e6df482 100644
--- a/samples/x509-jc/build.gradle
+++ b/samples/x509-jc/build.gradle
@@ -1,16 +1,9 @@
-apply plugin: 'war'
+apply from: WAR_SAMPLE_GRADLE
 
-sonarRunner {
-    skipProject = true
+war {
+    baseName = "x509"
 }
 
-eclipse {
-    wtp {
-        component {
-            contextPath = 'x509'
-        }
-    }
-}
 
 dependencies {