Skip to content

Update dependencies and replace deprecated guava usage #378

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update dependencies and replace deprecated guava usage #378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<github.global.server>github</github.global.server>
<netty.version>4.0.44.Final</netty.version>
<slf4j.version>1.7.24</slf4j.version>
<netty.version>4.0.49.Final</netty.version>
<slf4j.version>1.7.25</slf4j.version>
<java.version>1.7</java.version>
</properties>

Expand Down Expand Up @@ -177,7 +177,7 @@
<profile>
<id>netty-4.1</id>
<properties>
<netty.version>4.1.8.Final</netty.version>
<netty.version>4.1.13.Final</netty.version>
</properties>
</profile>
</profiles>
Expand All @@ -186,7 +186,9 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>20.0</version>
<!-- The -android version is the "official" non-Java 8 release of guava. Use the standard guava release once
LP drops support for Java 7. -->
<version>22.0-android</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -481,7 +483,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.6.0</version>
<version>3.6.1</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/littleshoot/proxy/impl/ProxyToServerConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -572,7 +572,7 @@ private void initializeConnectionFlow() {
.serverSslEngine()));
} else {
connectionFlow.then(serverConnection.EncryptChannel(proxyServer.getMitmManager()
.serverSslEngine(parsedHostAndPort.getHostText(), parsedHostAndPort.getPort())));
.serverSslEngine(parsedHostAndPort.getHost(), parsedHostAndPort.getPort())));
}

connectionFlow
Expand Down Expand Up @@ -958,7 +958,7 @@ public static InetSocketAddress addressFor(String hostAndPort, DefaultHttpProxyS
throw new UnknownHostException(hostAndPort);
}

String host = parsedHostAndPort.getHostText();
String host = parsedHostAndPort.getHost();
int port = parsedHostAndPort.getPortOrDefault(80);

return proxyServer.getServerResolver().resolve(host, port);
Expand Down