Fix Windows Tests

+ fix path handling to be non-linux specific
+ cleanup path transformations

src/main/java/io/fabric8/maven/docker/assembly/BuildDirs.java

@@ -36,13 +36,13 @@ public class BuildDirs {
      * Constructor building up the the output directories
      *
      * @param imageName image name for the image to build
-     * @param params mojo params holding base and global outptput dir
+     * @param params mojo params holding base and global output dir
      */
     public BuildDirs(String imageName, MojoParameters params) {
         this.params = params;
         // Replace tag separator with a slash to avoid problems
         // with OSs which gets confused by colons.
-        this.buildTopDir = imageName != null ? imageName.replace(':', '/') : null;
+        this.buildTopDir = imageName != null ? imageName.replace(':', File.separatorChar).replace("/", File.separator) : null;
     }
 
     public File getOutputDirectory() {

src/main/java/io/fabric8/maven/docker/service/JibBuildService.java

@@ -149,4 +149,4 @@ static File getBuildTarArchive(ImageConfiguration imageConfiguration, MojoParame
         BuildDirs buildDirs = new BuildDirs(imageConfiguration.getName(), mojoParameters);
         return new File(buildDirs.getTemporaryRootDirectory(), ARCHIVE_FILE_NAME + "." + ArchiveCompression.none.getFileSuffix());
     }
-}
+}

src/main/java/io/fabric8/maven/docker/util/JibServiceUtil.java

@@ -99,7 +99,7 @@ public static void buildContainer(JibContainerBuilder jibContainerBuilder, TarIm
     }
 
     public static JibContainerBuilder containerFromImageConfiguration(String jibImageFormat,
-            ImageConfiguration imageConfiguration, Credential pullRegistryCredential) throws InvalidImageReferenceException {
+                                                                      ImageConfiguration imageConfiguration, Credential pullRegistryCredential) throws InvalidImageReferenceException {
         final JibContainerBuilder containerBuilder = Jib.from(getRegistryImage(getBaseImage(imageConfiguration), pullRegistryCredential))
                 .setFormat(getImageFormat(jibImageFormat));
         return populateContainerBuilderFromImageConfiguration(containerBuilder, imageConfiguration);
@@ -205,7 +205,7 @@ static Set<String> getAllImageTags(List<String> tags, String imageName) {
 
     static ImageFormat getImageFormat(String jibImageFormat) {
         if (jibImageFormat != null && jibImageFormat.toLowerCase().equalsIgnoreCase("oci")) {
-                return ImageFormat.OCI;
+            return ImageFormat.OCI;
         }
         return ImageFormat.Docker;
     }
@@ -357,4 +357,4 @@ private static String generateProgressBar(double progress) {
                 .append("% complete")
                 .toString();
     }
-}
+}

src/test/java/io/fabric8/maven/docker/access/DockerConnectionDetectorTest.java

@@ -24,7 +24,7 @@ public void testGetUrlFromEnvironment() throws MojoExecutionException, IOExcepti
         String dockerHost = System.getenv("DOCKER_HOST");
         if (dockerHost != null) {
             assertEquals(dockerHost.replaceFirst("^tcp:/",""), detector.detectConnectionParameter(null, null).getUrl().replaceFirst("^https?:/", ""));
-        } else if (System.getProperty("os.name").equalsIgnoreCase("Windows 10")) {
+        } else if (System.getProperty("os.name").contains("Windows")) {
         	try {
                 assertEquals("npipe:////./pipe/docker_engine", detector.detectConnectionParameter(null, null).getUrl());
             } catch (IllegalArgumentException expectedIfNoUnixSocket) {

src/test/java/io/fabric8/maven/docker/util/JibServiceUtilTest.java

@@ -159,4 +159,4 @@ private ImageConfiguration getSampleImageConfiguration() {
                 .buildConfig(bc)
                 .build();
     }
-}
+}