From 62a848f1b120c836882fbbd50a608eb42f78e244 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 21 Jan 2020 09:56:43 +0000 Subject: [PATCH] Register JNA's native library integration in LinuxSocketDomain See gh-19836 --- .../boot/cloudnativebuildpack/socket/LinuxDomainSocket.java | 6 ++++++ .../docker/DockerApiIntegrationTests.java | 3 --- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/socket/LinuxDomainSocket.java b/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/socket/LinuxDomainSocket.java index 557d204bb45..292d9607340 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/socket/LinuxDomainSocket.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/main/java/org/springframework/boot/cloudnativebuildpack/socket/LinuxDomainSocket.java @@ -22,6 +22,8 @@ import java.util.Arrays; import java.util.List; import com.sun.jna.LastErrorException; +import com.sun.jna.Native; +import com.sun.jna.Platform; import com.sun.jna.Structure; import org.springframework.util.Assert; @@ -33,6 +35,10 @@ import org.springframework.util.Assert; */ class LinuxDomainSocket extends DomainSocket { + static { + Native.register(Platform.C_LIBRARY_NAME); + } + LinuxDomainSocket(String path) throws IOException { super(path); } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/DockerApiIntegrationTests.java b/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/DockerApiIntegrationTests.java index cdd8048901e..fd77bfa1ff3 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/DockerApiIntegrationTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/DockerApiIntegrationTests.java @@ -19,8 +19,6 @@ package org.springframework.boot.cloudnativebuildpack.docker; import java.io.IOException; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.condition.DisabledOnOs; -import org.junit.jupiter.api.condition.OS; import org.springframework.boot.cloudnativebuildpack.docker.type.ImageReference; import org.springframework.boot.testsupport.testcontainers.DisabledIfDockerUnavailable; @@ -31,7 +29,6 @@ import org.springframework.boot.testsupport.testcontainers.DisabledIfDockerUnava * @author Phillip Webb */ @DisabledIfDockerUnavailable -@DisabledOnOs(OS.LINUX) class DockerApiIntegrationTests { private final DockerApi docker = new DockerApi();