Home Original page

Repoint to shaded, imported jersey.repackaged guava (!) · docker-java/docker-java@f186971

File tree

4 files changed

lines changed

  • src/main/java/com/github/dockerjava

4 files changed

lines changed

Original file line numberDiff line numberDiff line change

@@ -1,12 +1,14 @@

11

package com.github.dockerjava.api.model;

22
3-

import com.google.common.base.Objects;

3+
44
55

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

66

import com.fasterxml.jackson.annotation.JsonProperty;

77
88

import java.io.Serializable;

99
10+

import jersey.repackaged.com.google.common.base.Objects;

11+
1012

/**

1113

* Represents an event stream

1214

*/

Original file line numberDiff line numberDiff line change

@@ -1,12 +1,12 @@

11

package com.github.dockerjava.api.model;

22
3-

import com.google.common.base.Objects;

4-
53

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

64

import com.fasterxml.jackson.annotation.JsonProperty;

75
86

import java.io.Serializable;

97
8+

import jersey.repackaged.com.google.common.base.Objects;

9+
1010

/**

1111

* Represents an item returned from push

1212

*/

Original file line numberDiff line numberDiff line change

@@ -1,6 +1,6 @@

11

package com.github.dockerjava.jaxrs;

22
3-

import com.google.common.collect.ImmutableList;

3+
44
55

import static javax.ws.rs.client.Entity.entity;

66

@@ -24,6 +24,8 @@

2424

import com.github.dockerjava.api.model.EventStreamItem;

2525

import com.github.dockerjava.api.model.PushEventStreamItem;

2626
27+

import jersey.repackaged.com.google.common.collect.ImmutableList;

28+
2729

public class BuildImageCmdExec extends AbstrDockerCmdExec<BuildImageCmd, BuildImageCmd.Response> implements BuildImageCmd.Exec {

2830
2931

private static final Logger LOGGER = LoggerFactory

Original file line numberDiff line numberDiff line change

@@ -1,6 +1,6 @@

11

package com.github.dockerjava.jaxrs;

22
3-

import com.google.common.collect.ImmutableList;

3+
44
55

import static javax.ws.rs.client.Entity.entity;

66

@@ -21,6 +21,8 @@

2121

import com.github.dockerjava.api.model.AuthConfig;

2222

import com.github.dockerjava.api.model.PushEventStreamItem;

2323
24+

// Shaded, but imported

25+

import jersey.repackaged.com.google.common.collect.ImmutableList;

2426
2527

public class PushImageCmdExec extends AbstrDockerCmdExec<PushImageCmd, Response> implements PushImageCmd.Exec {

2628