Skip to content

Commit 492b074

Browse files
KostyaShaKostyaSha
authored
Merge pull request docker-java#1133 from KostyaSha/updDeps
Update versions
2 parents 906df7c + ab1a069 commit 492b074

9 files changed

Lines changed: 17 additions & 17 deletions

File tree

‎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/command/InspectContainerResponseTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public void roundTrip_full() throws IOException {
6868
public void roundTrip_full_healthcheck() throws IOException {
6969

7070
final ObjectMapper mapper = new ObjectMapper();
71-
final JavaType type = mapper.getTypeFactory().uncheckedSimpleType(InspectContainerResponse.class);
71+
final JavaType type = mapper.getTypeFactory().constructType(InspectContainerResponse.class);
7272

7373
final InspectContainerResponse response = testRoundTrip(RemoteApiVersion.VERSION_1_24,
7474
"/containers/inspect/1.json",
@@ -139,7 +139,7 @@ public void roundTrip_empty() throws IOException {
139139
public void inspect_windows_container() throws IOException {
140140

141141
final ObjectMapper mapper = new ObjectMapper();
142-
final JavaType type = mapper.getTypeFactory().uncheckedSimpleType(InspectContainerResponse.class);
142+
final JavaType type = mapper.getTypeFactory().constructType(InspectContainerResponse.class);
143143

144144
final InspectContainerResponse response = testRoundTrip(RemoteApiVersion.VERSION_1_38,
145145
"/containers/inspect/lcow.json",

‎src/test/java/com/github/dockerjava/api/command/InspectExecResponseTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public class InspectExecResponseTest {
2121
@Test
2222
public void test_1_22_SerDer1() throws Exception {
2323
final ObjectMapper mapper = new ObjectMapper();
24-
final JavaType type = mapper.getTypeFactory().uncheckedSimpleType(InspectExecResponse.class);
24+
final JavaType type = mapper.getTypeFactory().constructType(InspectExecResponse.class);
2525

2626
final InspectExecResponse execResponse = testRoundTrip(RemoteApiVersion.VERSION_1_22,
2727
"/exec/ID/1.json",

‎src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public void defaultServerAddress() throws Exception {
2525
@Test
2626
public void serderDocs1() throws IOException {
2727
final ObjectMapper mapper = new ObjectMapper();
28-
final JavaType type = mapper.getTypeFactory().uncheckedSimpleType(AuthConfig.class);
28+
final JavaType type = mapper.getTypeFactory().constructType(AuthConfig.class);
2929

3030
final AuthConfig authConfig = testRoundTrip(RemoteApiVersion.VERSION_1_22,
3131
"/other/AuthConfig/docs1.json",
@@ -47,7 +47,7 @@ public void serderDocs1() throws IOException {
4747
@Test
4848
public void serderDocs2() throws IOException {
4949
final ObjectMapper mapper = new ObjectMapper();
50-
final JavaType type = mapper.getTypeFactory().uncheckedSimpleType(AuthConfig.class);
50+
final JavaType type = mapper.getTypeFactory().constructType(AuthConfig.class);
5151

5252
final AuthConfig authConfig = testRoundTrip(RemoteApiVersion.VERSION_1_22,
5353
"/other/AuthConfig/docs2.json",
@@ -66,7 +66,7 @@ public void serderDocs2() throws IOException {
6666
@Test
6767
public void compatibleWithIdentitytoken() throws IOException {
6868
final ObjectMapper mapper = new ObjectMapper();
69-
final JavaType type = mapper.getTypeFactory().uncheckedSimpleType(AuthConfig.class);
69+
final JavaType type = mapper.getTypeFactory().constructType(AuthConfig.class);
7070
final AuthConfig authConfig = testRoundTrip(RemoteApiVersion.VERSION_1_23,
7171
"/other/AuthConfig/docs1.json",
7272
type
@@ -83,7 +83,7 @@ public void compatibleWithIdentitytoken() throws IOException {
8383
@Test
8484
public void shouldNotFailWithStackOrchestratorInConfig() throws IOException {
8585
final ObjectMapper mapper = new ObjectMapper();
86-
final JavaType type = mapper.getTypeFactory().uncheckedSimpleType(AuthConfig.class);
86+
final JavaType type = mapper.getTypeFactory().constructType(AuthConfig.class);
8787
final AuthConfig authConfig = testRoundTrip(RemoteApiVersion.VERSION_1_25,
8888
"/other/AuthConfig/orchestrators.json",
8989
type

‎src/test/java/com/github/dockerjava/api/model/EventsTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public class EventsTest {
2424
@Test
2525
public void serderDocs1() throws IOException {
2626
final ObjectMapper mapper = new ObjectMapper();
27-
final JavaType type = mapper.getTypeFactory().uncheckedSimpleType(Event.class);
27+
final JavaType type = mapper.getTypeFactory().constructType(Event.class);
2828

2929
final Event event = testRoundTrip(RemoteApiVersion.VERSION_1_24,
3030
"/events/docs1.json",

‎src/test/java/com/github/dockerjava/api/model/StatisticsTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public class StatisticsTest {
2323
@Test
2424
public void serderJson1() throws IOException {
2525
final ObjectMapper mapper = new ObjectMapper();
26-
final JavaType type = mapper.getTypeFactory().uncheckedSimpleType(Statistics.class);
26+
final JavaType type = mapper.getTypeFactory().constructType(Statistics.class);
2727

2828
final Statistics statistics = testRoundTrip(RemoteApiVersion.VERSION_1_27,
2929
"containers/container/stats/stats1.json",

‎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",

‎src/test/java/com/github/dockerjava/cmd/UpdateContainerCmdIT.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public void updateContainer() throws DockerException, IOException {
8484
@Test
8585
public void serDerDocs1() throws IOException {
8686
final ObjectMapper mapper = new ObjectMapper();
87-
final JavaType type = mapper.getTypeFactory().uncheckedSimpleType(UpdateContainerCmdImpl.class);
87+
final JavaType type = mapper.getTypeFactory().constructType(UpdateContainerCmdImpl.class);
8888

8989
final UpdateContainerCmdImpl upd = testRoundTrip(VERSION_1_22,
9090
"/containers/container/update/docs.json",

0 commit comments

Comments
 (0)