diff --git a/build.gradle b/build.gradle
index dc234028..5aeeca7f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,26 +5,27 @@ ant.importBuild 'build.xml'
 tasks.jar.dependsOn 'mkjar'
 
 repositories {
+  mavenCentral()
   jcenter()
 }
 
 dependencies {
-  compile group: 'commons-codec', name: 'commons-codec', version: '1.10'
-  compile group: 'commons-fileupload', name: 'commons-fileupload', version: '1.3.2'
-  compile group: 'commons-logging', name: 'commons-logging', version: '1.2'
-  compile group: 'commons-net', name: 'commons-net', version: '3.6'
-  compile group: 'javax.mail', name: 'mail', version: '1.4.7'
-  compile group: 'javax.servlet', name: 'javax.servlet-api', version:'3.1.0'
-  compile group: 'org.ccil.cowan.tagsoup', name: 'tagsoup', version: '1.2.1'
-  compile group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '9.4.3.v20170317'
-  compile group: 'org.eclipse.jetty', name: 'jetty-xml', version: '9.4.3.v20170317'
-  compile group: 'org.mozilla', name: 'rhino', version: '1.7.9'
-  compile group: 'xerces', name: 'xercesImpl', version: '2.11.0'
-  // Potential replacement for apache-dom
-  //compile group: 'xmlrpc', name: 'xmlrpc', version: '2.0.1'
+  implementation 'commons-codec:commons-codec:1.10'
+  implementation 'commons-fileupload:commons-fileupload:1.4'
+  implementation 'commons-logging:commons-logging:1.2'
+  implementation 'commons-net:commons-net:3.6'
+  implementation 'com.sun.activation:javax.activation:1.2.0'
+  implementation 'javax.mail:javax.mail-api:1.6.2'
+  implementation 'javax.servlet:javax.servlet-api:4.0.1'
+  implementation 'org.ccil.cowan.tagsoup:tagsoup:1.2.1'
+  implementation 'org.eclipse.jetty:jetty-servlet:9.4.18.v20190429'
+  implementation 'org.eclipse.jetty:jetty-xml:9.4.18.v20190429'
+  implementation 'org.mozilla:rhino:1.7.12'
+  implementation 'xerces:xercesImpl:2.12.0'
+  implementation 'xmlrpc:xmlrpc:2.0.1'
 }
 
 task deps(type: Copy) {
-  from configurations.compile
+  from configurations.compileClasspath
   into 'lib/'
 }
diff --git a/lib/activation-1.1.jar b/lib/activation-1.1.jar
deleted file mode 100644
index 53f82a1c..00000000
Binary files a/lib/activation-1.1.jar and /dev/null differ
diff --git a/lib/apache-dom.jar b/lib/apache-dom.jar
deleted file mode 100644
index 285646c4..00000000
Binary files a/lib/apache-dom.jar and /dev/null differ
diff --git a/lib/commons-fileupload-1.3.2.jar b/lib/commons-fileupload-1.3.2.jar
deleted file mode 100644
index 4975590e..00000000
Binary files a/lib/commons-fileupload-1.3.2.jar and /dev/null differ
diff --git a/lib/commons-fileupload-1.4.jar b/lib/commons-fileupload-1.4.jar
new file mode 100644
index 00000000..e25a6bc9
Binary files /dev/null and b/lib/commons-fileupload-1.4.jar differ
diff --git a/lib/javax.activation-1.2.0.jar b/lib/javax.activation-1.2.0.jar
new file mode 100644
index 00000000..9637479a
Binary files /dev/null and b/lib/javax.activation-1.2.0.jar differ
diff --git a/lib/javax.mail-api-1.6.2.jar b/lib/javax.mail-api-1.6.2.jar
new file mode 100644
index 00000000..bbe702ef
Binary files /dev/null and b/lib/javax.mail-api-1.6.2.jar differ
diff --git a/lib/javax.servlet-api-3.1.0.jar b/lib/javax.servlet-api-3.1.0.jar
deleted file mode 100644
index 6b14c3d2..00000000
Binary files a/lib/javax.servlet-api-3.1.0.jar and /dev/null differ
diff --git a/lib/javax.servlet-api-4.0.1.jar b/lib/javax.servlet-api-4.0.1.jar
new file mode 100644
index 00000000..844ec7f1
Binary files /dev/null and b/lib/javax.servlet-api-4.0.1.jar differ
diff --git a/lib/jetty-http-9.4.18.v20190429.jar b/lib/jetty-http-9.4.18.v20190429.jar
new file mode 100644
index 00000000..e2e6282c
Binary files /dev/null and b/lib/jetty-http-9.4.18.v20190429.jar differ
diff --git a/lib/jetty-http-9.4.3.v20170317.jar b/lib/jetty-http-9.4.3.v20170317.jar
deleted file mode 100644
index 23ab219f..00000000
Binary files a/lib/jetty-http-9.4.3.v20170317.jar and /dev/null differ
diff --git a/lib/jetty-io-9.4.18.v20190429.jar b/lib/jetty-io-9.4.18.v20190429.jar
new file mode 100644
index 00000000..56acc565
Binary files /dev/null and b/lib/jetty-io-9.4.18.v20190429.jar differ
diff --git a/lib/jetty-io-9.4.3.v20170317.jar b/lib/jetty-io-9.4.3.v20170317.jar
deleted file mode 100644
index 9054dec1..00000000
Binary files a/lib/jetty-io-9.4.3.v20170317.jar and /dev/null differ
diff --git a/lib/jetty-security-9.4.18.v20190429.jar b/lib/jetty-security-9.4.18.v20190429.jar
new file mode 100644
index 00000000..d3557689
Binary files /dev/null and b/lib/jetty-security-9.4.18.v20190429.jar differ
diff --git a/lib/jetty-security-9.4.3.v20170317.jar b/lib/jetty-security-9.4.3.v20170317.jar
deleted file mode 100644
index b3902d87..00000000
Binary files a/lib/jetty-security-9.4.3.v20170317.jar and /dev/null differ
diff --git a/lib/jetty-server-9.4.18.v20190429.jar b/lib/jetty-server-9.4.18.v20190429.jar
new file mode 100644
index 00000000..4372350b
Binary files /dev/null and b/lib/jetty-server-9.4.18.v20190429.jar differ
diff --git a/lib/jetty-server-9.4.3.v20170317.jar b/lib/jetty-server-9.4.3.v20170317.jar
deleted file mode 100644
index fe209d0c..00000000
Binary files a/lib/jetty-server-9.4.3.v20170317.jar and /dev/null differ
diff --git a/lib/jetty-servlet-9.4.18.v20190429.jar b/lib/jetty-servlet-9.4.18.v20190429.jar
new file mode 100644
index 00000000..1d3a94b2
Binary files /dev/null and b/lib/jetty-servlet-9.4.18.v20190429.jar differ
diff --git a/lib/jetty-servlet-9.4.3.v20170317.jar b/lib/jetty-servlet-9.4.3.v20170317.jar
deleted file mode 100644
index 6524bc0f..00000000
Binary files a/lib/jetty-servlet-9.4.3.v20170317.jar and /dev/null differ
diff --git a/lib/jetty-util-9.4.18.v20190429.jar b/lib/jetty-util-9.4.18.v20190429.jar
new file mode 100644
index 00000000..b80bfe8f
Binary files /dev/null and b/lib/jetty-util-9.4.18.v20190429.jar differ
diff --git a/lib/jetty-util-9.4.3.v20170317.jar b/lib/jetty-util-9.4.3.v20170317.jar
deleted file mode 100644
index 10a4a7e2..00000000
Binary files a/lib/jetty-util-9.4.3.v20170317.jar and /dev/null differ
diff --git a/lib/jetty-xml-9.4.18.v20190429.jar b/lib/jetty-xml-9.4.18.v20190429.jar
new file mode 100644
index 00000000..51aa9a5a
Binary files /dev/null and b/lib/jetty-xml-9.4.18.v20190429.jar differ
diff --git a/lib/jetty-xml-9.4.3.v20170317.jar b/lib/jetty-xml-9.4.3.v20170317.jar
deleted file mode 100644
index 58e8061b..00000000
Binary files a/lib/jetty-xml-9.4.3.v20170317.jar and /dev/null differ
diff --git a/lib/mail-1.4.7.jar b/lib/mail-1.4.7.jar
deleted file mode 100644
index 236fcdb6..00000000
Binary files a/lib/mail-1.4.7.jar and /dev/null differ
diff --git a/lib/rhino-1.7.12.jar b/lib/rhino-1.7.12.jar
new file mode 100644
index 00000000..44caf65a
Binary files /dev/null and b/lib/rhino-1.7.12.jar differ
diff --git a/lib/xercesImpl-2.12.0.jar b/lib/xercesImpl-2.12.0.jar
new file mode 100644
index 00000000..b69d01da
Binary files /dev/null and b/lib/xercesImpl-2.12.0.jar differ
diff --git a/lib/xml-apis-1.4.01.jar b/lib/xml-apis-1.4.01.jar
new file mode 100644
index 00000000..46733464
Binary files /dev/null and b/lib/xml-apis-1.4.01.jar differ
diff --git a/src/helma/main/launcher/Main.java b/src/helma/main/launcher/Main.java
index a0e1d175..7a74d120 100644
--- a/src/helma/main/launcher/Main.java
+++ b/src/helma/main/launcher/Main.java
@@ -36,20 +36,21 @@ import java.util.ArrayList;
 public class Main {
     public static final String[] jars = {
         "commons-codec-1-10.jar",
-        "commons-fileupload-1.3.2.jar",
+        "commons-fileupload-1.4.jar",
         "commons-io-2.2.jar",
         "commons-logging-1.2.jar",
-        "commons-net-3.5.jar",
+        "commons-net-3.6.jar",
         "helma.jar",
-        "javax.servlet-api-3.1.0.jar",
-        "jetty-http-9.4.3.v20170317.jar",
-        "jetty-io-9.4.3.v20170317.jar",
-        "jetty-security-9.4.3.v20170317.jar",
-        "jetty-server-9.4.3.v20170317.jar",
-        "jetty-servlet-9.4.3.v20170317.jar",
-        "jetty-util-9.4.3.v20170317.jar",
-        "jetty-xml-9.4.3.v20170317.jar",
-        "mail-1.4.7.jar",
+        "javax.activation-1.2.0.jar",
+        "javax.servlet-api-4.0.1.jar",
+        "jetty-http-9.4.18.v20190429.jar",
+        "jetty-io-9.4.18.v20190429.jar",
+        "jetty-security-9.4.18.v20190429.jar",
+        "jetty-server-9.4.18.v20190429.jar",
+        "jetty-servlet-9.4.18.v20190429.jar",
+        "jetty-util-9.4.18.v20190429.jar",
+        "jetty-xml-9.4.18.v20190429.jar",
+        "javax.mail-api-1.6.2.jar",
         "rhino-1.7.9.jar",
         "tagsoup-1.2.1.jar",
         "xmlrpc-2.0.1.jar"