diff --git a/build.gradle b/build.gradle
index 881b0a5..4696729 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,17 +1,18 @@
+// WARNING: You must use Java 8 with Gradle 5 (DO NOT USE Java 9+ or Gradle 6+)
+
 plugins {
     id 'war'
     id "com.eriwen.gradle.css" version "2.14.0"
     id "eu.butter.gradle.js" version "2.15.1"
+    // id "org.padler.gradle.minify" version "1.7.0" // TODO: Replace above plugins with this one as above don't work with Gradle 6
 }
 
 description = "EPICS to web gateway"
 group 'org.jlab'
-version = '1.9.3'
-
-def junitJupiterVersion = '5.4.2'
+version = '1.10.0'
 
 ext {
-    releaseDate = 'March 11 2020'
+    releaseDate = 'October 28 2020'
     productionRelease = 'true'
 }
 
@@ -19,16 +20,19 @@ repositories {
     mavenCentral()
 }
 
-compileJava   {
-    sourceCompatibility = '1.8'
-    targetCompatibility = '1.8'
+/*compileJava { // This is only needed to cross-compile using Java 11 targeting Java 8; invalid if you use Java 8 to begin with!
+    options.compilerArgs.addAll(['--release', '8'])
+}*/
+
+tasks.withType(JavaCompile) {
+    options.encoding = 'UTF-8'
 }
 
 dependencies {
     compile 'javax.servlet:jstl:1.2'
     implementation 'org.glassfish:javax.json:1.1.4'
-    implementation 'org.epics:jca:2.3.6'
-    implementation 'org.epics:caj:1.1.15'
+    implementation files('lib/jca-2.4.6.jar')
+    //implementation 'org.epics:jca:2.4.6' // Only works with Java 11 runtime
     providedCompile 'javax:javaee-api:7.0'
 
     testImplementation 'junit:junit:4.13'
diff --git a/build.xml b/build.xml
deleted file mode 100644
index 7079924..0000000
--- a/build.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="epics2web" default="clean-build" basedir=".">    
-    <property name="project.release.version" value="1.9.3"/>
-    <property name="project.release.date" value="11 March 2020"/>
-    <property name="project.release.production" value="true"/>
-    <property environment="env"/>   
-    <fail unless="env.CATALINA_HOME" message="Environment variable CATALINA_HOME must be set in order to include Tomcat libraries in classpath"/>
-    <property name="src.dir" value="src/main/java"/>
-    <property name="build.dir" value="build"/>
-    <property name="classes.dir" value="${build.dir}/classes"/>
-    <property name="dist.dir" value="dist"/>
-    <property name="lib.dir" value="lib"/>
-    <property name="config.dir" value="config"/>
-    <property name="tomcat.lib.dir" value="${env.CATALINA_HOME}/lib"/>
-    <property name="doc.dir" value="doc"/>
-    <property name="dist.dir" value="dist"/>
-    <property name="dist.war" value="${dist.dir}/${ant.project.name}.war"/>
-    <path id="project.class.path">       
-        <pathelement path="${java.class.path}"/>
-        <fileset dir="${lib.dir}">
-            <include name="*.jar"/>
-        </fileset> 
-        <fileset dir="${tomcat.lib.dir}">
-            <include name="*.jar"/>
-        </fileset>       
-    </path>        
-    <target name="war" depends="compile">
-        <mkdir dir="${dist.dir}"/>     
-        <copy todir="${build.dir}/web">
-            <fileset dir="src/main/webapp"/>
-        </copy>  
-        <copy file="src/main/webapp/WEB-INF/web.xml" toFile="${build.dir}/web/WEB-INF/web.xml" overwrite="true" force="true">
-            <filterset>
-                <filter token="VERSION" value="${project.release.version}"/>
-                <filter token="RELEASE_DATE" value="${project.release.date}"/>
-                <filter token="PRODUCTION_RELEASE" value="${project.release.production}"/>
-            </filterset>
-        </copy>
-        <java jar="build-lib/yuicompressor-2.4.8.jar" fork="true">
-            <arg value="-o"/>
-            <arg value="${build.dir}/web/resources/css/${ant.project.name}-${project.release.version}.min.css"/>
-            <arg value="${build.dir}/web/resources/css/${ant.project.name}.css"/>
-        </java>
-        <copy file="${build.dir}/web/resources/css/${ant.project.name}-${project.release.version}.min.css" toFile="${build.dir}/web/resources/css/${ant.project.name}.min.css"></copy>       
-        <java jar="build-lib/yuicompressor-2.4.8.jar" fork="true">
-            <arg value="-o"/>
-            <arg value="${build.dir}/web/resources/js/${ant.project.name}-${project.release.version}.min.js"/>
-            <arg value="${build.dir}/web/resources/js/${ant.project.name}.js"/>
-        </java>          
-        <copy file="${build.dir}/web/resources/js/${ant.project.name}-${project.release.version}.min.js" toFile="${build.dir}/web/resources/js/${ant.project.name}.min.js"></copy> 
-        <war destfile="${dist.war}" basedir="${build.dir}/web" webxml="${build.dir}/web/WEB-INF/web.xml">
-            <lib dir="${lib.dir}" includes="*.jar"/>
-            <classes dir="${classes.dir}"/>
-        </war>
-    </target>
-    <target name="clean">
-        <delete dir="${build.dir}"/>
-        <delete dir="${dist.dir}"/>
-    </target>    
-    <target name="compile">
-        <mkdir dir="${classes.dir}"/>
-        <javac srcdir="${src.dir}" destdir="${classes.dir}" includeantruntime="false" source="1.8" debug="true" encoding="UTF-8">
-            <classpath refid="project.class.path"/>
-            <compilerarg value="-Xlint:unchecked"/>
-        </javac>
-        <copy todir="${classes.dir}">
-            <fileset dir="${src.dir}" excludes="**/*.java"/>
-        </copy>        
-    </target>    
-    <target name="doc">
-        <javadoc sourcepath="${src.dir}" destdir="${dist.dir}/javadoc" overview="${src.dir}/overview.html">
-            <classpath refid="project.class.path"/>
-            <header>${ant.project.name} Version ${project.release.version}</header>
-            <doctitle>${ant.project.name} Overview</doctitle>
-            <link href="http://docs.oracle.com/javase/8/docs/api/"/>
-        </javadoc>
-    </target>    
-    <target name="clean-build" depends="clean,compile"/>
-</project>
diff --git a/lib/caj-1.1.15.jar b/lib/caj-1.1.15.jar
deleted file mode 100644
index 410342a..0000000
Binary files a/lib/caj-1.1.15.jar and /dev/null differ
diff --git a/lib/jca-2.3.6.jar b/lib/jca-2.3.6.jar
deleted file mode 100644
index f7da428..0000000
Binary files a/lib/jca-2.3.6.jar and /dev/null differ
diff --git a/lib/jca-2.4.6.jar b/lib/jca-2.4.6.jar
new file mode 100644
index 0000000..607e3a3
Binary files /dev/null and b/lib/jca-2.4.6.jar differ