wip

Marcus Linke · Marcus Linke · commit 42b55de455ef · 2016-12-14T21:56:25.000+01:00
diff --git a/pom.xml b/pom.xml
@@ -244,18 +244,12 @@
 			<artifactId>netty-handler-proxy</artifactId>
 			<version>${netty.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>io.netty</groupId>
-			<artifactId>netty-transport-native-epoll</artifactId>
-			<version>${netty.version}</version>
-			<classifier>linux-x86_64</classifier>
-			<exclusions>
-				<exclusion>
-					<groupId>io.netty</groupId>
-					<artifactId>netty-transport-native-unix-common</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
+<!-- 		<dependency> -->
+<!-- 			<groupId>io.netty</groupId> -->
+<!-- 			<artifactId>netty-transport-native-epoll</artifactId> -->
+<!-- 			<version>${netty.version}</version> -->
+<!-- 			<classifier>linux-x86_64</classifier> -->
+<!-- 		</dependency> -->
 		<dependency>
 			<groupId>io.netty</groupId>
 			<artifactId>netty-transport-native-kqueue</artifactId>
@@ -304,13 +298,13 @@
 	</distributionManagement>
 
 	<build>
-		<extensions>
-			<extension>
-				<groupId>kr.motd.maven</groupId>
-				<artifactId>os-maven-plugin</artifactId>
-				<version>1.4.0.Final</version>
-			</extension>
-		</extensions>
+<!-- 		<extensions> -->
+<!-- 			<extension> -->
+<!-- 				<groupId>kr.motd.maven</groupId> -->
+<!-- 				<artifactId>os-maven-plugin</artifactId> -->
+<!-- 				<version>1.5.0.Final</version> -->
+<!-- 			</extension> -->
+<!-- 		</extensions> -->
 		<pluginManagement>
 			<plugins>
 
diff --git a/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java b/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
@@ -224,9 +224,9 @@ public EventLoopGroup init(Bootstrap bootstrap, DockerClientConfig dockerClientC
                 new DefaultThreadFactory(threadPrefix));
 
             bootstrap.group(nioEventLoopGroup).channel(KQueueDomainSocketChannel.class)
-                    .handler(new ChannelInitializer<SocketChannel>() {
+                    .handler(new ChannelInitializer<KQueueDomainSocketChannel>() {
                         @Override
-                        protected void initChannel(final SocketChannel channel) throws Exception {
+                        protected void initChannel(final KQueueDomainSocketChannel channel) throws Exception {
                             channel.pipeline().addLast(new LoggingHandler(getClass()));
                             channel.pipeline().addLast(new HttpClientCodec());
                         }
diff --git a/src/test/java/com/github/dockerjava/netty/exec/AuthCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/AuthCmdExecTest.java
@@ -46,6 +46,7 @@ public void testAuth() throws Exception {
 
     @Test(expectedExceptions = UnauthorizedException.class)
     public void testAuthInvalid() throws Exception {
-        DockerClientBuilder.getInstance(config("garbage")).build().authCmd().exec();
+        DockerClientBuilder.getInstance(config("garbage")).withDockerCmdExecFactory(dockerCmdExecFactory)
+                .build().authCmd().exec();
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,7 @@ public void testAuth() throws Exception {`
`46`	`46`
`47`	`47`	`@Test(expectedExceptions = UnauthorizedException.class)`
`48`	`48`	`public void testAuthInvalid() throws Exception {`
`49`		`- DockerClientBuilder.getInstance(config("garbage")).build().authCmd().exec();`
	`49`	`+ DockerClientBuilder.getInstance(config("garbage")).withDockerCmdExecFactory(dockerCmdExecFactory)`
	`50`	`+ .build().authCmd().exec();`
`50`	`51`	`}`
`51`	`52`	`}`