Upgrade to jnr-unixsocket 0.15

fabric8io · Dec 17, 2016 · 7afec26 · 7afec26
1 parent 9fea9df
commit 7afec26
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 305 deletions.
diff --git a/doc/changelog.md b/doc/changelog.md
@@ -2,7 +2,7 @@
 
 * **0.18.2** 
   - Better log message when waiting for URL (#640)
-
+  - Update to jnr-unixsocket 0.15
 
 * **0.18.1** (2016-11-17)
   - Renamed `basedir` and `exportBasedir` in an `<assembly>` configuration to `targetDir` and `exportTargetDir` since this better reflects the purpose, i.e. the target in the Docker image to which the assembly is copied. The old name is still recognized but deprecated. 

diff --git a/pom.xml b/pom.xml
@@ -107,7 +107,7 @@
     <dependency>
       <groupId>com.github.jnr</groupId>
       <artifactId>jnr-unixsocket</artifactId>
-      <version>0.12</version>
+      <version>0.15</version>
     </dependency>
 
     <dependency>

diff --git a/src/main/java/io/fabric8/maven/docker/access/hc/unix/UnixConnectionSocketFactory.java b/src/main/java/io/fabric8/maven/docker/access/hc/unix/UnixConnectionSocketFactory.java
@@ -7,6 +7,7 @@
 
 import io.fabric8.maven.docker.access.hc.util.AbstractNativeSocketFactory;
 import jnr.unixsocket.UnixSocketAddress;
+import jnr.unixsocket.UnixSocketChannel;
 import org.apache.http.protocol.HttpContext;
 
 final class UnixConnectionSocketFactory extends AbstractNativeSocketFactory {
@@ -17,7 +18,7 @@ final class UnixConnectionSocketFactory extends AbstractNativeSocketFactory {
 
     @Override
     public Socket createSocket(HttpContext context) throws IOException {
-        return new UnixSocket();
+        return new jnr.unixsocket.UnixSocket(UnixSocketChannel.open());
     }
 
     @Override

diff --git a/src/main/java/io/fabric8/maven/docker/access/hc/unix/UnixSocket.java b/src/main/java/io/fabric8/maven/docker/access/hc/unix/UnixSocket.java