Skip to content

Commit 1d13e5b

Browse files
committed
Update versions
1 parent 906df7c commit 1d13e5b

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@
5858
<jdk.target>1.7</jdk.target>
5959

6060
<jersey.version>2.27</jersey.version>
61-
<jackson-jaxrs.version>2.6.7</jackson-jaxrs.version>
61+
<jackson-jaxrs.version>2.9.7</jackson-jaxrs.version>
6262
<httpclient.version>4.5.6</httpclient.version><!-- 4.5.1-4.5.2 broken -->
63-
<commons-compress.version>1.17</commons-compress.version>
63+
<commons-compress.version>1.18</commons-compress.version>
6464
<commons-codec.version>1.11</commons-codec.version>
6565
<commons-io.version>2.6</commons-io.version>
6666
<commons-lang.version>2.6</commons-lang.version>
@@ -72,7 +72,7 @@
7272

7373
<!-- test dependencies -->
7474
<logback.version>1.2.3</logback.version>
75-
<netty.version>4.1.27.Final</netty.version>
75+
<netty.version>4.1.31.Final</netty.version>
7676
<hamcrest.library.version>1.3</hamcrest.library.version>
7777
<hamcrest.jpa-matchers>1.8</hamcrest.jpa-matchers>
7878
<lambdaj.version>2.3.3</lambdaj.version>
@@ -164,7 +164,7 @@
164164
<dependency>
165165
<groupId>org.slf4j</groupId>
166166
<artifactId>jcl-over-slf4j</artifactId>
167-
<version>1.7.21</version>
167+
<version>${slf4j-api.version}</version>
168168
</dependency>
169169

170170
<dependency>

src/main/java/com/github/dockerjava/api/model/ServiceModeConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* @since {@link RemoteApiVersion#VERSION_1_24}
1515
*/
1616
public class ServiceModeConfig implements Serializable {
17-
public static final Long serialVersionUID = 1L;
17+
public static final long serialVersionUID = 1L;
1818

1919
/**
2020
* @since 1.24

src/test/java/com/github/dockerjava/api/model/VersionTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public class VersionTest {
2424
@Test
2525
public void testSerDer1() throws Exception {
2626
final ObjectMapper mapper = new ObjectMapper();
27-
final JavaType type = mapper.getTypeFactory().uncheckedSimpleType(Version.class);
27+
final JavaType type = mapper.getTypeFactory().constructType(Version.class);
2828

2929
final Version version = testRoundTrip(RemoteApiVersion.VERSION_1_22,
3030
"/version/1.json",
@@ -46,7 +46,7 @@ public void testSerDer1() throws Exception {
4646
@Test
4747
public void version_1_38() throws Exception {
4848
final ObjectMapper mapper = new ObjectMapper();
49-
final JavaType type = mapper.getTypeFactory().uncheckedSimpleType(Version.class);
49+
final JavaType type = mapper.getTypeFactory().constructType(Version.class);
5050

5151
final Version version = testRoundTrip(RemoteApiVersion.VERSION_1_38,
5252
"/version/lcow.json",

0 commit comments

Comments
 (0)