Skip to content

Enable japicmp in docker-java-api module #2279

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

Merged
eddumelendez merged 3 commits into from
Feb 2, 2024
Merged

Enable japicmp in docker-java-api module #2279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1082d5d
Enable japicmp in docker-java-api
eddumelendez Dec 20, 2023
86ca689
Revert "Use long rather than int for sizeRw and sizeRootFs (#2230)"
eddumelendez Dec 20, 2023
0065173
Merge branch 'main' into japicmp-docker-java-api
eddumelendez Feb 2, 2024
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
4 changes: 4 additions & 0 deletions docker-java-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,10 @@
</instructions>
</configuration>
</plugin>
<plugin>
<groupId>com.github.siom79.japicmp</groupId>
<artifactId>japicmp-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
8 changes: 4 additions & 4 deletions ...er-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,10 @@ public class InspectContainerResponse extends DockerObject {
private String id;

@JsonProperty("SizeRootFs")
private Long sizeRootFs;
private Integer sizeRootFs;

@JsonProperty("SizeRw")
private Long sizeRw;
private Integer sizeRw;

@JsonProperty("Image")
private String imageId;
Expand Down Expand Up @@ -124,11 +124,11 @@ public String getId() {
return id;
}

public Long getSizeRootFs() {
public Integer getSizeRootFs() {
return sizeRootFs;
}

public Long getSizeRw() {
public Integer getSizeRw() {
return sizeRw;
}

Expand Down
4 changes: 2 additions & 2 deletions docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,9 @@ public void inspectContainerWithSize() throws DockerException {
// TODO check swarm
if (isNotSwarm(dockerRule.getClient())) {
assertNotNull(containerInfo.getSizeRootFs());
assertTrue(containerInfo.getSizeRootFs().longValue() > 0L);
assertTrue(containerInfo.getSizeRootFs().intValue() > 0);
assertNotNull(containerInfo.getSizeRw());
assertTrue(containerInfo.getSizeRw().longValue() == 0L);
assertTrue(containerInfo.getSizeRw().intValue() == 0);
}
}

Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,13 +243,13 @@
<!-- use with "mvn -DskipTests clean verify" -->
<groupId>com.github.siom79.japicmp</groupId>
<artifactId>japicmp-maven-plugin</artifactId>
<version>0.18.2</version>
<version>0.18.3</version>
<configuration>
<oldVersion>
<dependency>
<groupId>com.github.docker-java</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>3.2.0</version>
<version>3.3.4</version>
<type>jar</type>
</dependency>
</oldVersion>
Expand Down