Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 001e67f

Browse filesBrowse files
steffenboesteffenboe
authored
Merge branch 'docker-java:main' into main
2 parents 0310c65 + 20f0831 commit 001e67f
Copy full SHA for 001e67f

File tree

Expand file treeCollapse file tree

7 files changed

+18
-7
lines changed
Filter options
Expand file treeCollapse file tree

7 files changed

+18
-7
lines changed

‎docker-java-api/pom.xml

Copy file name to clipboardExpand all lines: docker-java-api/pom.xml
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,14 @@
5050
<dependency>
5151
<groupId>org.junit.jupiter</groupId>
5252
<artifactId>junit-jupiter</artifactId>
53-
<version>5.12.1</version>
53+
<version>5.12.2</version>
5454
<scope>test</scope>
5555
</dependency>
5656

5757
<dependency>
5858
<groupId>com.tngtech.archunit</groupId>
5959
<artifactId>archunit-junit5</artifactId>
60-
<version>0.18.0</version>
60+
<version>1.4.1</version>
6161
<scope>test</scope>
6262
</dependency>
6363

‎docker-java-api/src/main/java/com/github/dockerjava/api/model/Capability.java

Copy file name to clipboardExpand all lines: docker-java-api/src/main/java/com/github/dockerjava/api/model/Capability.java
+9-1Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com.github.dockerjava.api.model;
22

3+
import com.fasterxml.jackson.annotation.JsonCreator;
4+
35
/**
46
* The Linux capabilities supported by Docker. The list of capabilities is defined in Docker's types.go, {@link #ALL} was added manually.
57
*
@@ -299,5 +301,11 @@ public enum Capability {
299301
/**
300302
* Trigger something that will wake up the system (set CLOCK_REALTIME_ALARM and CLOCK_BOOTTIME_ALARM timers).
301303
*/
302-
WAKE_ALARM
304+
WAKE_ALARM;
305+
306+
@JsonCreator
307+
public static Capability fromValue(String cap) {
308+
String result = !cap.startsWith("CAP_") ? cap : cap.split("_", 2)[1];
309+
return Capability.valueOf(result);
310+
}
303311
}

‎docker-java-transport-httpclient5/pom.xml

Copy file name to clipboardExpand all lines: docker-java-transport-httpclient5/pom.xml
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<dependency>
3030
<groupId>org.apache.httpcomponents.client5</groupId>
3131
<artifactId>httpclient5</artifactId>
32-
<version>5.4.3</version>
32+
<version>5.4.4</version>
3333
</dependency>
3434

3535
<dependency>

‎docker-java-transport-tck/pom.xml

Copy file name to clipboardExpand all lines: docker-java-transport-tck/pom.xml
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<dependency>
4747
<groupId>org.testcontainers</groupId>
4848
<artifactId>testcontainers</artifactId>
49-
<version>1.19.1</version>
49+
<version>1.21.0</version>
5050
</dependency>
5151

5252
<dependency>

‎docker-java/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java

Copy file name to clipboardExpand all lines: docker-java/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public DockerClient build() {
9494
} else {
9595
Logger log = LoggerFactory.getLogger(DockerClientBuilder.class);
9696
log.warn(
97-
"'dockerHttpClient' should be set." +
97+
"'dockerHttpClient' should be set. " +
9898
"Falling back to Jersey, will be an error in future releases."
9999
);
100100

‎docker-java/src/test/java/com/github/dockerjava/api/model/CapabilityTest.java

Copy file name to clipboardExpand all lines: docker-java/src/test/java/com/github/dockerjava/api/model/CapabilityTest.java
+3Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ public void serializeCapability() throws Exception {
1818
public void deserializeCapability() throws Exception {
1919
Capability capability = JSONTestHelper.getMapper().readValue("\"ALL\"", Capability.class);
2020
assertEquals(Capability.ALL, capability);
21+
22+
Capability compatibleCapability = JSONTestHelper.getMapper().readValue("\"CAP_ALL\"", Capability.class);
23+
assertEquals(Capability.ALL, compatibleCapability);
2124
}
2225

2326
@Test(expected = JsonMappingException.class)

‎pom.xml

Copy file name to clipboardExpand all lines: pom.xml
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868

6969
<bouncycastle.version>1.80</bouncycastle.version>
7070
<junixsocket.version>2.10.1</junixsocket.version>
71-
<guava.version>33.4.6-jre</guava.version> <!-- todo remove from project -->
71+
<guava.version>33.4.8-jre</guava.version> <!-- todo remove from project -->
7272

7373
<!-- test dependencies -->
7474
<logback.version>1.2.3</logback.version>

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.