diff --git a/README.md b/README.md
index 72774a7c3..30da906a4 100644
--- a/README.md
+++ b/README.md
@@ -396,7 +396,7 @@ When you build the latest code from source, you'll have access to the latest sna
     <dependency>
         <groupId>net.lightbody.bmp</groupId>
         <artifactId>browsermob-core</artifactId>
-        <version>2.1.35-SNAPSHOT</version>
+        <version>2.1.36-SNAPSHOT</version>
         <scope>test</scope>
     </dependency>
 ```
diff --git a/browsermob-core/pom.xml b/browsermob-core/pom.xml
index 9b2a51d45..cea7415d5 100644
--- a/browsermob-core/pom.xml
+++ b/browsermob-core/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>browsermob-proxy</artifactId>
         <groupId>net.lightbody.bmp</groupId>
-        <version>2.1.35-SNAPSHOT</version>
+        <version>2.1.36-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -14,7 +14,7 @@
     <name>BrowserMob Proxy Core (LittleProxy) Module</name>
 
     <properties>
-        <unit-test-jetty.version>9.4.15.v20190215</unit-test-jetty.version>
+        <unit-test-jetty.version>9.4.21.v20190926</unit-test-jetty.version>
     </properties>
 
     <build>
@@ -87,7 +87,7 @@
         <dependency>
             <groupId>dnsjava</groupId>
             <artifactId>dnsjava</artifactId>
-            <version>2.1.8</version>
+            <version>2.1.9</version>
         </dependency>
 
         <dependency>
@@ -255,7 +255,7 @@
 
         <dependency>
             <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-library</artifactId>
+            <artifactId>hamcrest</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/browsermob-core/src/test/java/net/lightbody/bmp/proxy/InterceptorTest.java b/browsermob-core/src/test/java/net/lightbody/bmp/proxy/InterceptorTest.java
index 64cae3581..bdb2eb298 100644
--- a/browsermob-core/src/test/java/net/lightbody/bmp/proxy/InterceptorTest.java
+++ b/browsermob-core/src/test/java/net/lightbody/bmp/proxy/InterceptorTest.java
@@ -4,14 +4,10 @@
 import io.netty.handler.codec.http.*;
 import net.lightbody.bmp.BrowserMobProxy;
 import net.lightbody.bmp.BrowserMobProxyServer;
-import net.lightbody.bmp.filters.RequestFilter;
 import net.lightbody.bmp.filters.RequestFilterAdapter;
-import net.lightbody.bmp.filters.ResponseFilter;
 import net.lightbody.bmp.filters.ResponseFilterAdapter;
 import net.lightbody.bmp.proxy.test.util.MockServerTest;
 import net.lightbody.bmp.proxy.test.util.NewProxyServerTestUtil;
-import net.lightbody.bmp.util.HttpMessageContents;
-import net.lightbody.bmp.util.HttpMessageInfo;
 import net.lightbody.bmp.util.HttpObjectUtil;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
@@ -33,8 +29,8 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 
-import static org.hamcrest.Matchers.endsWith;
-import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.CoreMatchers.endsWith;
+import static org.hamcrest.CoreMatchers.equalTo;
 import static org.junit.Assert.*;
 import static org.mockserver.model.HttpRequest.request;
 import static org.mockserver.model.HttpResponse.response;
diff --git a/browsermob-core/src/test/java/net/lightbody/bmp/proxy/dns/ChainedHostResolverTest.java b/browsermob-core/src/test/java/net/lightbody/bmp/proxy/dns/ChainedHostResolverTest.java
index 9415f8854..04de7c9b9 100644
--- a/browsermob-core/src/test/java/net/lightbody/bmp/proxy/dns/ChainedHostResolverTest.java
+++ b/browsermob-core/src/test/java/net/lightbody/bmp/proxy/dns/ChainedHostResolverTest.java
@@ -17,20 +17,13 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
 
+import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.empty;
 import static org.hamcrest.Matchers.greaterThan;
-import static org.hamcrest.Matchers.not;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.*;
 
 public class ChainedHostResolverTest {
     @Test
@@ -62,7 +55,7 @@ public void testResolveReturnsFirstResults() {
         ChainedHostResolver chainResolver = new ChainedHostResolver(ImmutableList.of(firstResolver, secondResolver));
 
         when(firstResolver.resolve("1.1.1.1")).thenReturn(TestConstants.addressOnesList);
-        when(secondResolver.resolve("1.1.1.1")).thenReturn(Collections.<InetAddress>emptyList());
+        when(secondResolver.resolve("1.1.1.1")).thenReturn(Collections.emptyList());
 
         Collection<InetAddress> results = chainResolver.resolve("1.1.1.1");
         assertNotNull("Resolver should not return null results", results);
diff --git a/browsermob-dist/pom.xml b/browsermob-dist/pom.xml
index fd0dd4f52..d38915711 100644
--- a/browsermob-dist/pom.xml
+++ b/browsermob-dist/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>browsermob-proxy</artifactId>
         <groupId>net.lightbody.bmp</groupId>
-        <version>2.1.35-SNAPSHOT</version>
+        <version>2.1.36-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -15,7 +15,6 @@
 
     <properties>
         <zip.name>${project.parent.artifactId}-${project.version}</zip.name>
-        <netty.version>${netty-4.1.version}</netty.version>
     </properties>
 
     <dependencies>
diff --git a/browsermob-legacy/pom.xml b/browsermob-legacy/pom.xml
index 4581348de..ce801aba5 100644
--- a/browsermob-legacy/pom.xml
+++ b/browsermob-legacy/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>browsermob-proxy</artifactId>
         <groupId>net.lightbody.bmp</groupId>
-        <version>2.1.35-SNAPSHOT</version>
+        <version>2.1.36-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -110,7 +110,7 @@
 
         <dependency>
             <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-library</artifactId>
+            <artifactId>hamcrest</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/browsermob-rest/pom.xml b/browsermob-rest/pom.xml
index 7e1647a07..e845c78c1 100644
--- a/browsermob-rest/pom.xml
+++ b/browsermob-rest/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>browsermob-proxy</artifactId>
         <groupId>net.lightbody.bmp</groupId>
-        <version>2.1.35-SNAPSHOT</version>
+        <version>2.1.36-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -63,19 +63,19 @@
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-server</artifactId>
-            <version>9.4.15.v20190215</version>
+            <version>9.4.21.v20190926</version>
         </dependency>
 
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-servlet</artifactId>
-            <version>9.4.15.v20190215</version>
+            <version>9.4.21.v20190926</version>
         </dependency>
 
         <dependency>
             <groupId>net.sf.jopt-simple</groupId>
             <artifactId>jopt-simple</artifactId>
-            <version>3.2</version>
+            <version>5.0.4</version>
         </dependency>
 
         <dependency>
@@ -167,7 +167,7 @@
 
         <dependency>
             <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-library</artifactId>
+            <artifactId>hamcrest</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/mitm/pom.xml b/mitm/pom.xml
index 01af63138..f74f746fa 100644
--- a/mitm/pom.xml
+++ b/mitm/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>browsermob-proxy</artifactId>
         <groupId>net.lightbody.bmp</groupId>
-        <version>2.1.35-SNAPSHOT</version>
+        <version>2.1.36-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -88,7 +88,7 @@
 
         <dependency>
             <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-library</artifactId>
+            <artifactId>hamcrest</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/pom.xml b/pom.xml
index 792751b5a..4191cf7f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>net.lightbody.bmp</groupId>
     <artifactId>browsermob-proxy</artifactId>
-    <version>2.1.35-SNAPSHOT</version>
+    <version>2.1.36-SNAPSHOT</version>
     <modules>
         <module>browsermob-core</module>
         <module>browsermob-legacy</module>
@@ -46,7 +46,7 @@
         <url>git@github.com:lightbody/browsermob-proxy.git</url>
         <tag>HEAD</tag>
     </scm>
-    
+
     <pluginRepositories>
         <pluginRepository>
             <id>bintray</id>
@@ -65,25 +65,26 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <slf4j.version>1.7.26</slf4j.version>
+        <slf4j.version>1.7.28</slf4j.version>
         <selenium.version>3.141.59</selenium.version>
 
-        <jackson.version>2.8.9</jackson.version>
+        <jackson.version>2.10.0</jackson.version>
         <logstash-gelf.version>1.13.0</logstash-gelf.version>
 
         <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
 
-        <log4j.version>2.11.2</log4j.version>
+        <log4j.version>2.12.1</log4j.version>
 
-        <groovy.version>2.5.6</groovy.version>
-        <groovy-eclipse-batch.version>2.5.6-01</groovy-eclipse-batch.version>
+        <groovy.version>2.5.8</groovy.version>
+        <groovy-eclipse-batch.version>2.5.8-02</groovy-eclipse-batch.version>
 
-        <netty.version>4.1.39.Final</netty.version>
+        <netty.version>4.1.42.Final</netty.version>
         <!-- netty 4.1 version to use for browsermob-dist and when using the netty-4.1 profile -->
-        <netty-4.1.version>4.1.39.Final</netty-4.1.version>
 
-        <bouncycastle.version>1.61</bouncycastle.version>
+        <bouncycastle.version>1.64</bouncycastle.version>
         <java-statsd-client.version>3.0.1</java-statsd-client.version>
+        <java.version>8</java.version>
+        <additionalJOption>-Xdoclint:none</additionalJOption>
     </properties>
 
     <build>
@@ -103,11 +104,11 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.8.0</version>
+                    <version>3.8.1</version>
                     <configuration>
-                        <compilerId>groovy-eclipse-compiler</compilerId>
-                        <source>1.8</source>
-                        <target>1.8</target>
+                        <source>${java.version}</source>
+                        <target>${java.version}</target>
+                        <encoding>UTF-8</encoding>
                     </configuration>
                     <dependencies>
                         <dependency>
@@ -152,7 +153,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>2.10.4</version>
+                    <version>3.1.1</version>
                     <executions>
                         <execution>
                             <id>attach-javadocs</id>
@@ -161,7 +162,7 @@
                                 <goal>jar</goal>
                             </goals>
                             <configuration>
-                                <additionalparam>${javadoc.opts}</additionalparam>
+                                <additionalJOption>${additionalJOption}</additionalJOption>
                             </configuration>
                         </execution>
                     </executions>
@@ -176,11 +177,11 @@
                             <inherited>false</inherited>
                             <phase>install</phase>
                             <configuration>
-                                <file>${basedir}/resources/jar/littleproxy-1.1.5.jar</file>
+                                <file>${basedir}/resources/jar/littleproxy-1.1.6.jar</file>
                                 <repositoryLayout>default</repositoryLayout>
                                 <groupId>org.littleshoot</groupId>
                                 <artifactId>littleproxy</artifactId>
-                                <version>1.1.5</version>
+                                <version>1.1.6</version>
                                 <packaging>jar</packaging>
                             </configuration>
                             <goals>
@@ -241,7 +242,7 @@
             <dependency>
                 <groupId>com.google.guava</groupId>
                 <artifactId>guava</artifactId>
-                <version>27.1-jre</version>
+                <version>28.1-jre</version>
             </dependency>
 
             <dependency>
@@ -268,19 +269,19 @@
 
             <dependency>
                 <groupId>org.hamcrest</groupId>
-                <artifactId>hamcrest-library</artifactId>
-                <version>1.3</version>
+                <artifactId>hamcrest</artifactId>
+                <version>2.1</version>
             </dependency>
 
             <dependency>
                 <groupId>org.mockito</groupId>
                 <artifactId>mockito-core</artifactId>
-                <version>2.25.0</version>
+                <version>3.1.0</version>
             </dependency>
             <dependency>
                 <groupId>net.bytebuddy</groupId>
                 <artifactId>byte-buddy</artifactId>
-                <version>1.9.10</version>
+                <version>1.10.1</version>
             </dependency>
 
             <dependency>
@@ -308,7 +309,7 @@
             <dependency>
                 <groupId>org.littleshoot</groupId>
                 <artifactId>littleproxy</artifactId>
-                <version>1.1.5</version>
+                <version>1.1.6</version>
             </dependency>
 
 
@@ -351,13 +352,13 @@
             <dependency>
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpclient</artifactId>
-                <version>4.5.7</version>
+                <version>4.5.10</version>
             </dependency>
 
             <dependency>
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpmime</artifactId>
-                <version>4.5.7</version>
+                <version>4.5.10</version>
             </dependency>
 
             <dependency>
@@ -456,7 +457,7 @@
             <dependency>
                 <groupId>org.javassist</groupId>
                 <artifactId>javassist</artifactId>
-                <version>3.24.1-GA</version>
+                <version>3.26.0-GA</version>
             </dependency>
 
         </dependencies>
@@ -466,7 +467,7 @@
         <dependency>
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy-all</artifactId>
-            <version>2.5.6</version>
+            <version>2.5.8</version>
             <type>pom</type>
         </dependency>
     </dependencies>
@@ -489,7 +490,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-plugin</artifactId>
-                        <version>2.19.1</version>
+                        <version>3.0.0-M3</version>
                         <configuration>
                             <skipTests>true</skipTests>
                         </configuration>
@@ -497,7 +498,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-source-plugin</artifactId>
-                        <version>3.0.1</version>
+                        <version>3.1.0</version>
                         <executions>
                             <execution>
                                 <id>attach-sources</id>
@@ -511,7 +512,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>2.10.4</version>
+                        <version>3.1.1</version>
                         <executions>
                             <execution>
                                 <id>attach-javadocs</id>
@@ -542,7 +543,7 @@
                     <plugin>
                         <groupId>org.sonatype.plugins</groupId>
                         <artifactId>nexus-staging-maven-plugin</artifactId>
-                        <version>1.6.7</version>
+                        <version>1.6.8</version>
                         <extensions>true</extensions>
                         <configuration>
                             <serverId>ossrh</serverId>
@@ -566,21 +567,5 @@
         </profile>
         <!-- Work-around for incomplete javadoc on Java 8, courtesy of http://stackoverflow.com/questions/15886209/maven-is-not-working-in-java-8-when-javadoc-tags-are-incomplete.
              Once legacy code is removed and javadoc is cleaned up, this can be removed. -->
-        <profile>
-            <id>doclint-java8-disable</id>
-            <activation>
-                <jdk>[1.8,)</jdk>
-            </activation>
-            <properties>
-                <javadoc.opts>-Xdoclint:none</javadoc.opts>
-            </properties>
-        </profile>
-
-        <profile>
-            <id>netty-4.1</id>
-            <properties>
-                <netty.version>${netty-4.1.version}</netty.version>
-            </properties>
-        </profile>
     </profiles>
 </project>
diff --git a/resources/jar/littleproxy-1.1.5.jar b/resources/jar/littleproxy-1.1.5.jar
deleted file mode 100644
index 2f5a9198f..000000000
Binary files a/resources/jar/littleproxy-1.1.5.jar and /dev/null differ
diff --git a/resources/jar/littleproxy-1.1.6.jar b/resources/jar/littleproxy-1.1.6.jar
new file mode 100644
index 000000000..927e769a3
Binary files /dev/null and b/resources/jar/littleproxy-1.1.6.jar differ