Skip to content

Commit

Permalink
Upgrade project dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
asafalima committed Oct 21, 2018
1 parent 9d10399 commit 7cbdeb2
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 14 deletions.
21 changes: 11 additions & 10 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -121,11 +121,12 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<hk2-bridge.version>2.5.0-b57</hk2-bridge.version>
<jersey.version>2.26</jersey.version>
<jetty.version>9.4.7.v20170914</jetty.version>
<guice.version>4.1.0</guice.version>
<hk2-bridge.version>2.5.0-b62</hk2-bridge.version>
<jersey.version>2.27</jersey.version>
<jetty.version>9.4.12.v20180830</jetty.version>
<guice.version>4.2.1</guice.version>
<slf4j.version>1.7.25</slf4j.version>
<jackson.version>2.9.7</jackson.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -178,9 +179,9 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.mina</groupId>
<artifactId>mina-core</artifactId>
<version>2.0.16</version>
<groupId>me.alexpanov</groupId>
<artifactId>free-port-finder</artifactId>
<version>1.1.1</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -208,19 +209,19 @@
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
<version>2.8.9</version>
<version>${jackson.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.8.9</version>
<version>${jackson.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>2.8.9</version>
<version>${jackson.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/io/logz/guice/jersey/JerseyServerTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import io.logz.guice.jersey.resources.TestResource;
import io.logz.guice.jersey.resources.recursive.FooResource;
import io.logz.guice.jersey.supplier.JerseyServerSupplier;
import org.apache.mina.util.AvailablePortFinder;
import me.alexpanov.net.FreePortFinder;
import org.glassfish.jersey.server.ResourceConfig;
import org.junit.Test;

Expand Down Expand Up @@ -83,7 +83,7 @@ public void testContextPatchConfiguration() throws Exception {

@Test
public void testHostConfiguration() throws Exception {
int port = AvailablePortFinder.getNextAvailable();
int port = FreePortFinder.findFreeLocalPort();
String address = InetAddress.getLocalHost().getHostAddress();

JerseyConfigurationBuilder namedHostConfigurationBuilder = JerseyConfiguration.builder()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import io.logz.guice.jersey.JerseyServer;
import io.logz.guice.jersey.configuration.JerseyConfiguration;
import io.logz.guice.jersey.configuration.JerseyConfigurationBuilder;
import org.apache.mina.util.AvailablePortFinder;
import me.alexpanov.net.FreePortFinder;
import org.glassfish.jersey.server.ResourceConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand All @@ -29,7 +29,7 @@ public static void createServerAndTest(ResourceConfig resourceConfig, Tester tes
}

public static void createServerAndTest(JerseyConfigurationBuilder configurationBuilder, Tester tester) throws Exception {
int port = AvailablePortFinder.getNextAvailable();
int port = FreePortFinder.findFreeLocalPort();
configurationBuilder.addPort(port);
JerseyConfiguration configuration = configurationBuilder.build();

Expand Down

0 comments on commit 7cbdeb2

Please sign in to comment.