diff --git a/gradle/source-layout.gradle b/gradle/source-layout.gradle
index a5d55599..a90ce496 100644
--- a/gradle/source-layout.gradle
+++ b/gradle/source-layout.gradle
@@ -22,5 +22,7 @@ jar {
 }
 
 plugins.withId('war') {
-  webAppDirName = 'src/main/webapp'
+  war {
+    webAppDirectory = file('src/main/webapp')
+  }
 }
diff --git a/metafix-ide/build.gradle b/metafix-ide/build.gradle
index 58ef5428..79bcc358 100644
--- a/metafix-ide/build.gradle
+++ b/metafix-ide/build.gradle
@@ -12,11 +12,13 @@ dependencies {
 apply plugin: 'application'
 apply plugin: 'com.github.johnrengelman.shadow'
 
-mainClassName = 'org.eclipse.xtext.ide.server.ServerLauncher'
-applicationName = 'xtext-server'
+application {
+  mainClass = 'org.eclipse.xtext.ide.server.ServerLauncher'
+  applicationName = 'xtext-server'
+}
 
 shadowJar {
-  from(project.convention.getPlugin(JavaPluginConvention).sourceSets.main.output)
+  from(sourceSets.main.output)
   configurations = [project.configurations.runtimeClasspath]
 
   exclude(