diff --git a/browserup-proxy-core/build.gradle b/browserup-proxy-core/build.gradle
index 288e9c54d..e446e9fdb 100644
--- a/browserup-proxy-core/build.gradle
+++ b/browserup-proxy-core/build.gradle
@@ -57,8 +57,10 @@ uploadArchives {
 }
 
 dependencies {
-    api 'io.netty:netty-codec:4.1.44.Final'
-    api 'xyz.rogfam:littleproxy:2.0.0-beta-5'
+    api "io.netty:netty-codec:${nettyVersion}"
+    api('xyz.rogfam:littleproxy:2.0.0-beta-5') {
+        exclude(group: 'io.netty', module: 'netty-all')
+    }
 
     implementation project(':browserup-proxy-mitm')
 
@@ -68,14 +70,13 @@ dependencies {
     implementation "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}"
     implementation "com.fasterxml.jackson.core:jackson-annotations:${jacksonVersion}"
     implementation 'com.google.guava:guava:28.2-jre'
-    implementation('com.jcraft:jzlib:1.1.3') {
-        exclude(module: 'netty')
-    }
-    implementation 'dnsjava:dnsjava:2.1.9'
+    implementation 'com.jcraft:jzlib:1.1.3'
+    implementation 'dnsjava:dnsjava:3.1.0'
+    implementation "io.netty:netty-all:${nettyVersion}"
     implementation "org.bouncycastle:bcpkix-jdk15on:${bcpVersion}"
     implementation "org.bouncycastle:bcprov-jdk15on:${bcpVersion}"
     implementation 'org.brotli:dec:0.1.2'
-    implementation 'org.javassist:javassist:3.26.0-GA'
+    implementation "org.javassist:javassist:${javassistVersion}"
     implementation 'org.seleniumhq.selenium:selenium-api:3.141.59'
     implementation "org.slf4j:jcl-over-slf4j:${slf4jVersion}"
     implementation "org.slf4j:slf4j-api:${slf4jVersion}"
diff --git a/browserup-proxy-dist/build.gradle b/browserup-proxy-dist/build.gradle
index e2f5ad75a..a14c559c9 100644
--- a/browserup-proxy-dist/build.gradle
+++ b/browserup-proxy-dist/build.gradle
@@ -64,16 +64,20 @@ dependencies {
     implementation "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}"
     implementation "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}"
     implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${jacksonVersion}"
-    implementation 'com.google.inject:guice:4.2.2'
-    implementation 'com.google.inject.extensions:guice-servlet:4.2.2'
-    implementation 'com.google.inject.extensions:guice-multibindings:4.2.2'
-    implementation 'com.google.sitebricks:sitebricks:0.8.11'
+    implementation "com.google.inject:guice:${guiceVersion}"
+    implementation "com.google.inject.extensions:guice-servlet:${guiceVersion}"
+    implementation "com.google.inject.extensions:guice-multibindings:${guiceVersion}"
+    implementation('com.google.sitebricks:sitebricks:0.8.11') {
+        exclude(group: 'org.jboss.netty', module: 'netty')
+        exclude(module: 'validation-api')
+    }
+    implementation "io.netty:netty-all:${nettyVersion}"
     implementation "org.apache.logging.log4j:log4j-api:${log4jVersion}"
     implementation "org.apache.logging.log4j:log4j-core:${log4jVersion}"
     implementation "org.apache.logging.log4j:log4j-slf4j-impl:${log4jVersion}"
     implementation "org.eclipse.jetty:jetty-server:${jettyVersion}"
     implementation "org.eclipse.jetty:jetty-servlet:${jettyVersion}"
-    implementation 'org.javassist:javassist:3.26.0-GA'
+    implementation "org.javassist:javassist:${javassistVersion}"
 }
 
 applicationName = 'browserup-proxy'
@@ -81,7 +85,7 @@ mainClassName = 'com.browserup.bup.proxy.Main'
 
 distributions {
     main {
-        baseName = 'browserup-proxy'
+        distributionBaseName = 'browserup-proxy'
         contents {
             from '../LICENSE'
             from '../README.md'
diff --git a/browserup-proxy-mitm/build.gradle b/browserup-proxy-mitm/build.gradle
index 78401ba4e..708f9761d 100644
--- a/browserup-proxy-mitm/build.gradle
+++ b/browserup-proxy-mitm/build.gradle
@@ -62,10 +62,13 @@ dependencies {
     implementation "org.bouncycastle:bcpkix-jdk15on:${bcpVersion}"
     implementation "org.bouncycastle:bcprov-jdk15on:${bcpVersion}"
 
-    implementation 'io.netty:netty-codec:4.1.44.Final'
+    implementation "io.netty:netty-all:${nettyVersion}"
+    implementation "io.netty:netty-codec:${nettyVersion}"
     implementation "org.slf4j:jcl-over-slf4j:${slf4jVersion}"
     implementation "org.slf4j:slf4j-api:${slf4jVersion}"
-    implementation 'xyz.rogfam:littleproxy:2.0.0-beta-5'
+    implementation('xyz.rogfam:littleproxy:2.0.0-beta-5') {
+        exclude(group: 'io.netty', module: 'netty-all')
+    }
 
     testImplementation "com.fasterxml.jackson.core:jackson-annotations:${jacksonVersion}"
     testImplementation "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}"
diff --git a/browserup-proxy-rest/build.gradle b/browserup-proxy-rest/build.gradle
index 1b4f0fbd0..ef4db00d4 100644
--- a/browserup-proxy-rest/build.gradle
+++ b/browserup-proxy-rest/build.gradle
@@ -10,8 +10,8 @@ plugins {
 archivesBaseName = 'browserup-proxy-rest'
 
 ext {
-    jerseyVersion = '2.30.1'
-    swaggerVersion = '2.1.1'
+    jerseyVersion = '2.31'
+    swaggerVersion = '2.1.2'
 }
 
 uploadArchives {
@@ -65,17 +65,19 @@ dependencies {
     implementation project(':browserup-proxy-core')
 
     implementation 'com.google.guava:guava:28.2-jre'
-    implementation 'com.google.inject:guice:4.2.2'
-    implementation 'com.google.inject.extensions:guice-servlet:4.2.2'
-    implementation 'com.google.inject.extensions:guice-multibindings:4.2.2'
+    implementation "com.google.inject:guice:${guiceVersion}"
+    implementation "com.google.inject.extensions:guice-servlet:${guiceVersion}"
+    implementation "com.google.inject.extensions:guice-multibindings:${guiceVersion}"
     implementation('com.google.sitebricks:sitebricks:0.8.11') {
+        exclude(group: 'org.jboss.netty', module: 'netty')
         exclude(module: 'validation-api')
     }
+    implementation "io.netty:netty-all:${nettyVersion}"
     implementation 'net.sf.jopt-simple:jopt-simple:5.0.4'
     implementation "org.eclipse.jetty:jetty-server:${jettyVersion}"
     implementation "org.eclipse.jetty:jetty-servlet:${jettyVersion}"
     implementation "org.slf4j:jcl-over-slf4j:${slf4jVersion}"
-    implementation 'org.apache.commons:commons-lang3:3.9'
+    implementation 'org.apache.commons:commons-lang3:3.10'
 
     implementation "org.glassfish.jersey.containers:jersey-container-servlet-core:${jerseyVersion}"
     implementation "org.glassfish.jersey.media:jersey-media-json-jackson:${jerseyVersion}"
diff --git a/build.gradle b/build.gradle
index 7d663a1b7..11ee65307 100644
--- a/build.gradle
+++ b/build.gradle
@@ -34,9 +34,12 @@ subprojects {
 
     ext {
         bcpVersion = '1.64'
+        guiceVersion = '4.2.3'
         jacksonVersion = '2.10.3'
-        jettyVersion = '9.4.26.v20200117'
+        javassistVersion = '3.27.0-GA'
+        jettyVersion = '9.4.27.v20200227'
         log4jVersion = '2.13.1'
+        nettyVersion = '4.1.50.Final'
         slf4jVersion = '1.7.30'
     }
 
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 87b738cbd..62d4c0535 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ea13fdfd1..a4f0001d2 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.3.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index af6708ff2..fbd7c5158 100755
--- a/gradlew
+++ b/gradlew
@@ -1,5 +1,21 @@
 #!/usr/bin/env sh
 
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m"'
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -66,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -109,10 +126,11 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
@@ -138,19 +156,19 @@ if $cygwin ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -159,14 +177,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index 0f8d5937c..a9f778a7a 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -13,8 +29,11 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m"
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
@@ -65,6 +84,7 @@ set CMD_LINE_ARGS=%*
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
 "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%