Resolve shading-related inheritance issues with BrowserWebDriverConta…

…iner This change makes docker-java NO LONGER SHADED into testcontainers core JAR
testcontainers · Apr 30, 2017 · c962b0f · c962b0f
1 parent 47f1959
commit c962b0f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -18,7 +18,8 @@
         <dependency>
             <groupId>com.github.docker-java</groupId>
             <artifactId>docker-java</artifactId>
-            <version>3.0.9</version>
+            <version>${docker-java.version}</version>
+            <scope>compile</scope>
             <exclusions>
                 <!-- replace with junixsocket -->
                 <exclusion>
@@ -151,10 +152,6 @@
                             <pattern>com.fasterxml.jackson</pattern>
                             <shadedPattern>org.testcontainers.shaded.com.fasterxml.jackson</shadedPattern>
                         </relocation>
-                        <relocation>
-                            <pattern>com.github.dockerjava</pattern>
-                            <shadedPattern>org.testcontainers.shaded.com.github.dockerjava</shadedPattern>
-                        </relocation>
                         <relocation>
                             <pattern>jersey.repackaged</pattern>
                             <shadedPattern>org.testcontainers.shaded.jersey.repackaged</shadedPattern>

diff --git a/modules/selenium/pom.xml b/modules/selenium/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
@@ -18,6 +19,12 @@
             <artifactId>testcontainers</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.github.docker-java</groupId>
+            <artifactId>docker-java</artifactId>
+            <version>${docker-java.version}</version>
+            <scope>provided</scope>
+        </dependency>
 
         <dependency>
             <groupId>com.google.guava</groupId>
@@ -39,6 +46,7 @@
             <groupId>org.mortbay.jetty</groupId>
             <artifactId>jetty</artifactId>
             <version>6.1.25</version>
+            <scope>test</scope>
         </dependency>
     </dependencies>
 

diff --git a/pom.xml b/pom.xml
@@ -157,6 +157,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <docker-java.version>3.0.9</docker-java.version>
     </properties>
 
     <modules>