Updated dependencies, including guava (to 22). Replaced usage of deprecated HostAndPort.getHostText() with .getHost().

jekh · jekh · commit ffd97b462193 · 2017-07-16T11:58:38.000-07:00
diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/filters/HttpsAwareFiltersAdapter.java b/browsermob-core/src/main/java/net/lightbody/bmp/filters/HttpsAwareFiltersAdapter.java
@@ -102,7 +102,7 @@ public String getHost(HttpRequest modifiedRequest) {
         String serverHost;
         if (isHttps()) {
             HostAndPort hostAndPort = HostAndPort.fromString(getHttpsRequestHostAndPort());
-            serverHost = hostAndPort.getHostText();
+            serverHost = hostAndPort.getHost();
         } else {
             serverHost = HttpUtil.getHostFromRequest(modifiedRequest);
         }
diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/filters/ResolvedHostnameCacheFilter.java b/browsermob-core/src/main/java/net/lightbody/bmp/filters/ResolvedHostnameCacheFilter.java
@@ -53,7 +53,7 @@ public void proxyToServerResolutionSucceeded(String serverHostAndPort, InetSocke
         if (resolvedAddress != null) {
             // place the resolved host into the hostname cache, so subsequent requests will be able to identify the IP address
             HostAndPort parsedHostAndPort = HostAndPort.fromString(serverHostAndPort);
-            String host = parsedHostAndPort.getHostText();
+            String host = parsedHostAndPort.getHost();
 
             if (host != null && !host.isEmpty()) {
                 resolvedAddresses.put(host, resolvedAddress.getHostAddress());
diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/util/BrowserMobHttpUtil.java b/browsermob-core/src/main/java/net/lightbody/bmp/util/BrowserMobHttpUtil.java
@@ -276,7 +276,7 @@ public static String removeMatchingPort(String hostWithPort, int portNumber) {
         HostAndPort parsedHostAndPort = HostAndPort.fromString(hostWithPort);
         if (parsedHostAndPort.hasPort() && parsedHostAndPort.getPort() == portNumber) {
             // HostAndPort.getHostText() strips brackets from ipv6 addresses, so reparse using fromHost
-            return HostAndPort.fromHost(parsedHostAndPort.getHostText()).toString();
+            return HostAndPort.fromHost(parsedHostAndPort.getHost()).toString();
         } else {
             return hostWithPort;
         }
diff --git a/browsermob-legacy/src/main/java/net/lightbody/bmp/BrowserMobProxyServerLegacyAdapter.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/BrowserMobProxyServerLegacyAdapter.java
@@ -504,7 +504,7 @@ public void setOptions(Map<String, String> options) {
             log.warn("Chained proxy support through setOptions is deprecated. Use setUpstreamProxy() to enable chained proxy support.");
 
             HostAndPort hostAndPort = HostAndPort.fromString(httpProxy);
-            this.setChainedProxy(new InetSocketAddress(hostAndPort.getHostText(), hostAndPort.getPortOrDefault(80)));
+            this.setChainedProxy(new InetSocketAddress(hostAndPort.getHost(), hostAndPort.getPortOrDefault(80)));
         } else {
             if (errorOnUnsupportedOperation) {
                 throw new UnsupportedOperationException("The LittleProxy-based implementation of BrowserMob Proxy does not support the setOptions method. Use the methods defined in the BrowserMobProxy interface to set connection parameters.");
diff --git a/mitm/pom.xml b/mitm/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>browsermob-proxy</artifactId>
         <groupId>net.lightbody.bmp</groupId>
@@ -13,9 +14,10 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.littleshoot</groupId>
+            <!-- Temporarily using the BMP release of littleproxy because LP 1.1.2 is incompatible with guava 22+ -->
+            <groupId>net.lightbody.bmp</groupId>
             <artifactId>littleproxy</artifactId>
-            <version>1.1.2</version>
+            <version>1.1.0-beta-bmp-17</version>
             <optional>true</optional>
             <exclusions>
                 <exclusion>
diff --git a/mitm/src/main/java/net/lightbody/bmp/util/HttpUtil.java b/mitm/src/main/java/net/lightbody/bmp/util/HttpUtil.java
@@ -114,7 +114,7 @@ private static String parseHostHeader(HttpRequest httpRequest, boolean includePo
                 return hostAndPort;
             } else {
                 HostAndPort parsedHostAndPort = HostAndPort.fromString(hostAndPort);
-                return parsedHostAndPort.getHostText();
+                return parsedHostAndPort.getHost();
             }
         } else {
             return null;
diff --git a/pom.xml b/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>net.lightbody.bmp</groupId>
     <artifactId>browsermob-proxy</artifactId>
@@ -43,8 +44,8 @@
         <connection>scm:git:git@github.com:lightbody/browsermob-proxy.git</connection>
         <developerConnection>scm:git:git@github.com:lightbody/browsermob-proxy.git</developerConnection>
         <url>git@github.com:lightbody/browsermob-proxy.git</url>
-      <tag>HEAD</tag>
-  </scm>
+        <tag>HEAD</tag>
+    </scm>
 
     <distributionManagement>
         <snapshotRepository>
@@ -61,23 +62,23 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <slf4j.version>1.7.24</slf4j.version>
+        <slf4j.version>1.7.25</slf4j.version>
         <selenium.version>2.53.1</selenium.version>
 
-        <jackson.version>2.8.7</jackson.version>
+        <jackson.version>2.8.9</jackson.version>
 
         <maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>
 
-        <log4j.version>2.8</log4j.version>
+        <log4j.version>2.8.2</log4j.version>
 
-        <groovy.version>2.4.8</groovy.version>
+        <groovy.version>2.4.12</groovy.version>
         <groovy-eclipse-batch.version>2.4.3-01</groovy-eclipse-batch.version>
 
-        <netty.version>4.0.44.Final</netty.version>
+        <netty.version>4.0.49.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.8.Final</netty-4.1.version>
+        <netty-4.1.version>4.1.13.Final</netty-4.1.version>
 
-        <bouncycastle.version>1.56</bouncycastle.version>
+        <bouncycastle.version>1.57</bouncycastle.version>
     </properties>
 
     <build>
@@ -211,7 +212,8 @@
             <dependency>
                 <groupId>com.google.guava</groupId>
                 <artifactId>guava</artifactId>
-                <version>20.0</version>
+                <!-- Remove the -android when dropping support for Java 7. -->
+                <version>22.0-android</version>
             </dependency>
 
             <dependency>
@@ -245,7 +247,7 @@
             <dependency>
                 <groupId>org.mockito</groupId>
                 <artifactId>mockito-core</artifactId>
-                <version>2.7.12</version>
+                <version>2.8.47</version>
             </dependency>
 
             <dependency>
@@ -272,7 +274,7 @@
             <dependency>
                 <groupId>net.lightbody.bmp</groupId>
                 <artifactId>littleproxy</artifactId>
-                <version>1.1.0-beta-bmp-16</version>
+                <version>1.1.0-beta-bmp-17</version>
             </dependency>
 
             <dependency>

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ public String getHost(HttpRequest modifiedRequest) {`
`102`	`102`	`String serverHost;`
`103`	`103`	`if (isHttps()) {`
`104`	`104`	`HostAndPort hostAndPort = HostAndPort.fromString(getHttpsRequestHostAndPort());`
`105`		`- serverHost = hostAndPort.getHostText();`
	`105`	`+ serverHost = hostAndPort.getHost();`
`106`	`106`	`} else {`
`107`	`107`	`serverHost = HttpUtil.getHostFromRequest(modifiedRequest);`
`108`	`108`	`}`
Original file line number	Diff line number	Diff line change
`@@ -276,7 +276,7 @@ public static String removeMatchingPort(String hostWithPort, int portNumber) {`
`276`	`276`	`HostAndPort parsedHostAndPort = HostAndPort.fromString(hostWithPort);`
`277`	`277`	`if (parsedHostAndPort.hasPort() && parsedHostAndPort.getPort() == portNumber) {`
`278`	`278`	`// HostAndPort.getHostText() strips brackets from ipv6 addresses, so reparse using fromHost`
`279`		`- return HostAndPort.fromHost(parsedHostAndPort.getHostText()).toString();`
	`279`	`+ return HostAndPort.fromHost(parsedHostAndPort.getHost()).toString();`
`280`	`280`	`} else {`
`281`	`281`	`return hostWithPort;`
`282`	`282`	`}`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ private static String parseHostHeader(HttpRequest httpRequest, boolean includePo`
`114`	`114`	`return hostAndPort;`
`115`	`115`	`} else {`
`116`	`116`	`HostAndPort parsedHostAndPort = HostAndPort.fromString(hostAndPort);`
`117`		`- return parsedHostAndPort.getHostText();`
	`117`	`+ return parsedHostAndPort.getHost();`
`118`	`118`	`}`
`119`	`119`	`} else {`
`120`	`120`	`return null;`