Merge pull request #319 from jekh/dependency-updates

Update to HttpClient 4.5

Author: jekh

browsermob-core-littleproxy/src/test/java/net/lightbody/bmp/proxy/InterceptorTest.java

@@ -636,7 +636,7 @@ public int getMaximumResponseBufferSizeInBytes() {
     }
 
     @Test
-    public void testCanBypassFilterForRequest() throws IOException {
+    public void testCanBypassFilterForRequest() throws IOException, InterruptedException {
         mockServer.when(request()
                         .withMethod("GET")
                         .withPath("/bypassfilter"),
@@ -677,6 +677,8 @@ public void serverToProxyResponseReceived() {
             assertEquals("Did not receive expected response from mock server", "success", responseBody);
         }
 
+        Thread.sleep(500);
+
         assertEquals("Expected filters source to be invoked on first request", 1, filtersSourceHitCount.get());
         assertEquals("Expected filter instance to be bypassed on first request", 0, filterHitCount.get());
 
@@ -689,6 +691,8 @@ public void serverToProxyResponseReceived() {
             assertEquals("Did not receive expected response from mock server", "success", responseBody);
         }
 
+        Thread.sleep(500);
+
         assertEquals("Expected filters source to be invoked again on second request", 2, filtersSourceHitCount.get());
         assertEquals("Expected filter instance to be invoked on second request (only)", 1, filterHitCount.get());
     }

browsermob-rest/pom.xml

@@ -108,7 +108,6 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>2.0.7-beta</version>
             <scope>test</scope>
         </dependency>
 

pom.xml

@@ -65,6 +65,7 @@
         <log4j.version>2.3</log4j.version>
 
         <groovy.version>2.4.3</groovy.version>
+        <groovy-eclipse-batch.version>${groovy.version}-01</groovy-eclipse-batch.version>
 
         <netty.version>4.0.31.Final</netty.version>
     </properties>
@@ -101,7 +102,7 @@
                         <dependency>
                             <groupId>org.codehaus.groovy</groupId>
                             <artifactId>groovy-eclipse-batch</artifactId>
-                            <version>${groovy.version}-01</version>
+                            <version>${groovy-eclipse-batch.version}</version>
                         </dependency>
                     </dependencies>
                 </plugin>
@@ -269,7 +270,7 @@
             <dependency>
                 <groupId>org.mock-server</groupId>
                 <artifactId>mockserver-netty</artifactId>
-                <version>3.9.15</version>
+                <version>3.9.17</version>
                 <exclusions>
                     <exclusion>
                         <groupId>ch.qos.logback</groupId>
@@ -311,13 +312,13 @@
             <dependency>
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpclient</artifactId>
-                <version>4.3.4</version>
+                <version>4.5</version>
             </dependency>
 
             <dependency>
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpmime</artifactId>
-                <version>4.3.4</version>
+                <version>4.5</version>
             </dependency>
 
             <dependency>