diff --git a/Makefile b/Makefile
index 3b12f5be..9b8b4ff5 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ rpmversion := $(versionnumber)-$(release)
 
 GRADLE = ./gradlew -PbuildVersion=$(buildversion)
 
-jarfile := cypher-shell-all.jar
+jarfile := cypher-shell.jar
 rpmfile := cypher-shell-$(rpmversion).noarch.rpm
 debfile := cypher-shell_$(debversion)_all.deb
 
diff --git a/build.gradle b/build.gradle
index c2386e82..4ed2695a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,8 +4,8 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.3'
-        classpath 'info.solidsoft.gradle.pitest:gradle-pitest-plugin:1.1.9'
+        classpath 'com.github.jengelman.gradle.plugins:shadow:4.0.2'
+        classpath 'info.solidsoft.gradle.pitest:gradle-pitest-plugin:1.4.0'
     }
 }
 
@@ -40,7 +40,6 @@ subprojects {
     apply plugin: 'distribution'
     apply plugin: 'com.github.johnrengelman.shadow'
     apply from: "$rootProject.projectDir/gradle/integration-test.gradle"
-    apply plugin: 'pmd'
     apply plugin: 'jacoco'
     apply plugin: 'info.solidsoft.pitest'
 
diff --git a/cypher-shell/build.gradle b/cypher-shell/build.gradle
index e7b1dc1f..7a8a1660 100644
--- a/cypher-shell/build.gradle
+++ b/cypher-shell/build.gradle
@@ -12,7 +12,7 @@ task generateBuildProperties {
   }
 }
 
-processResources.dependsOn generateBuildProperties
+processResources.finalizedBy generateBuildProperties
 
 jar {
   manifest {
diff --git a/cypher-shell/src/dist/cypher-shell b/cypher-shell/src/dist/cypher-shell
index f42aef5c..646dc12b 100755
--- a/cypher-shell/src/dist/cypher-shell
+++ b/cypher-shell/src/dist/cypher-shell
@@ -69,12 +69,12 @@ _show_java_help() {
 build_classpath() {
   APP_HOME="$(cd "$(dirname "$0")" && pwd)"
   # First try in sub directory
-  JARPATH="$(find "${APP_HOME}" -name "cypher-shell-all.jar" )"
+  JARPATH="$(find "${APP_HOME}" -name "cypher-shell.jar" )"
 
   # Then try installation directory (prefix/bin and prefix/share/cypher-shell/lib)
   if [[ -z "${JARPATH}" ]]; then
     APP_HOME="${APP_HOME}/../share/cypher-shell"
-    JARPATH="$(find "${APP_HOME}" -name "cypher-shell-all.jar" )"
+    JARPATH="$(find "${APP_HOME}" -name "cypher-shell.jar" )"
   fi
 }
 
diff --git a/cypher-shell/src/dist/cypher-shell.bat b/cypher-shell/src/dist/cypher-shell.bat
index 09c693f5..75ee5967 100755
--- a/cypher-shell/src/dist/cypher-shell.bat
+++ b/cypher-shell/src/dist/cypher-shell.bat
@@ -71,7 +71,7 @@ set CMD_LINE_ARGS=%$
 
 SETLOCAL EnableDelayedExpansion
 SET CYPHER_SHELL_JAR=
-FOR /f "delims=" %%a in ('dir "%NEO4J_HOME%\cypher-shell-all.jar" /s/b') do set CYPHER_SHELL_JAR=!CYPHER_SHELL_JAR!%%a
+FOR /f "delims=" %%a in ('dir "%NEO4J_HOME%\cypher-shell.jar" /s/b') do set CYPHER_SHELL_JAR=!CYPHER_SHELL_JAR!%%a
 
 @rem Execute cypher-shell
 "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %CYPHER_SHELL_OPTS%  -jar "%CYPHER_SHELL_JAR%" %CMD_LINE_ARGS%
diff --git a/gradle/integration-test.gradle b/gradle/integration-test.gradle
index 5306912a..1bc4c27c 100644
--- a/gradle/integration-test.gradle
+++ b/gradle/integration-test.gradle
@@ -18,7 +18,7 @@ dependencies {
 
 // Define integration test task
 task integrationTest(type: Test) {
-  testClassesDir = sourceSets.integrationTest.output.classesDir
+  testClassesDirs = sourceSets.integrationTest.output.classesDirs
   classpath = sourceSets.integrationTest.runtimeClasspath
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 64e1901e..a194df39 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=https\://services.gradle.org/distributions/gradle-3.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-bin.zip
diff --git a/packaging/debian/cypher-shell.install b/packaging/debian/cypher-shell.install
index c846ad6f..405e94f2 100644
--- a/packaging/debian/cypher-shell.install
+++ b/packaging/debian/cypher-shell.install
@@ -1,2 +1,2 @@
 cypher-shell/build/install/cypher-shell/cypher-shell            usr/bin
-cypher-shell/build/install/cypher-shell/cypher-shell-all.jar    usr/share/cypher-shell/lib
\ No newline at end of file
+cypher-shell/build/install/cypher-shell/cypher-shell.jar    usr/share/cypher-shell/lib
\ No newline at end of file