Add a partial fix for #259

where the logline pattern was bogus, in the case a frames returns
multiple lines at once.

I.e. it fixes this issue #259 (comment)

doc/changelog.md

@@ -1,8 +1,11 @@
 # ChangeLog
 
+* **0.15.14** (2016-07-29)
+  - Pattern match fix for multiline log output. Related to ([#259](https://github.com/fabric8io/docker-maven-plugin/issues/259))
+
 * **0.15.13** (2016-07-29)
-  - Add <securityOpts> for running containers in special security contexts (#524)
-  - Add support for multiples network aliases (#466)
+  - Add <securityOpts> for running containers in special security contexts ([#524](https://github.com/fabric8io/docker-maven-plugin/issues/524))
+  - Add support for multiples network aliases ([#466](https://github.com/fabric8io/docker-maven-plugin/issues/466))
 
 * **0.15.12** (2016-07-25)
   - API and documentation updates

samples/custom-net/pom.xml

@@ -13,12 +13,12 @@
   <parent>
     <groupId>io.fabric8</groupId>
     <artifactId>dmp-sample-parent</artifactId>
-    <version>0.15.13</version>
+    <version>0.15.14</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>dmp-custom-net</artifactId>
-  <version>0.15.13</version>
+  <version>0.15.14</version>
 
   <build>
     <plugins>

samples/data-jolokia-demo/pom.xml

@@ -22,13 +22,13 @@
   <parent>
     <groupId>io.fabric8</groupId>
     <artifactId>dmp-sample-parent</artifactId>
-    <version>0.15.13</version>
+    <version>0.15.14</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <groupId>io.fabric8</groupId>
   <artifactId>docker-jolokia-demo</artifactId>
-  <version>0.15.13</version>
+  <version>0.15.14</version>
   <!-- add custom lifecycle -->
   <packaging>docker</packaging>
 

samples/dockerignore/pom.xml

@@ -10,12 +10,12 @@
   <parent>
     <groupId>io.fabric8</groupId>
     <artifactId>dmp-sample-parent</artifactId>
-    <version>0.15.13</version>
+    <version>0.15.14</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>dmp-sample-dockerignore</artifactId>
-  <version>0.15.13</version>
+  <version>0.15.14</version>
   <packaging>docker-build</packaging>
 
   <build>

samples/net/pom.xml

@@ -16,12 +16,12 @@
   <parent>
     <groupId>io.fabric8</groupId>
     <artifactId>dmp-sample-parent</artifactId>
-    <version>0.15.13</version>
+    <version>0.15.14</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>dmp-sample-net</artifactId>
-  <version>0.15.13</version>
+  <version>0.15.14</version>
 
   <profiles>
     <profile>

samples/pom.xml

@@ -21,7 +21,7 @@
 
   <groupId>io.fabric8</groupId>
   <artifactId>dmp-sample-parent</artifactId>
-  <version>0.15.13</version>
+  <version>0.15.14</version>
   <packaging>pom</packaging>
 
   <url>http://www.jolokia.org</url>

samples/properties/pom.xml

@@ -10,12 +10,12 @@
   <parent>
     <groupId>io.fabric8</groupId>
     <artifactId>dmp-sample-parent</artifactId>
-    <version>0.15.13</version>
+    <version>0.15.14</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>dmp-sample-properties</artifactId>
-  <version>0.15.13</version>
+  <version>0.15.14</version>
   <packaging>docker-build</packaging>
 
   <build>

src/main/java/io/fabric8/maven/docker/access/log/LogRequestor.java

@@ -1,5 +1,5 @@
 package io.fabric8.maven.docker.access.log;/*
- * 
+ *
  * Copyright 2014 Roland Huss
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -44,7 +44,7 @@
 public class LogRequestor extends Thread implements LogGetHandle {
 
     // Patter for matching log entries
-    private static final Pattern LOG_LINE = Pattern.compile("^\\[?([^\\s\\]]*)]?\\s+(.*)\\s*$");
+    static final Pattern LOG_LINE = Pattern.compile("^\\[?([^\\s\\]]*)]?\\s+(.*)\\s*$", Pattern.DOTALL);
     private final HttpClient client;
 
     private final String containerId;
@@ -58,7 +58,7 @@ public class LogRequestor extends Thread implements LogGetHandle {
     private HttpUriRequest request;
 
     private final UrlBuilder urlBuilder;
-    
+
     /**
      * Create a helper object for requesting log entries synchronously ({@link #fetchLogs()}) or asynchronously ({@link #start()}.
      *
@@ -70,7 +70,7 @@ public class LogRequestor extends Thread implements LogGetHandle {
     public LogRequestor(HttpClient client, UrlBuilder urlBuilder, String containerId, LogCallback callback) {
         this.client = client;
         this.containerId = containerId;
-        
+
         this.urlBuilder = urlBuilder;
 
         this.callback = callback;

src/test/java/io/fabric8/maven/docker/access/log/LogRequestorTest.java

@@ -9,6 +9,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
+import java.util.regex.Matcher;
 
 import com.google.common.base.Charsets;
 import io.fabric8.maven.docker.access.UrlBuilder;
@@ -27,6 +28,7 @@
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertTrue;
 
 public class LogRequestorTest {
     private static final String containerId = RandomStringUtils.randomAlphabetic(64);
@@ -201,6 +203,13 @@ public void testMessageWithExtraBytes() throws Exception {
         }};
     }
 
+    @Test
+    public void checkMutlilinePattern() {
+        String line = "2016-07-15T20:34:06.024029849Z remote: Compressing objects:   4% (1/23)           \n" +
+                      "remote: Compressing objects:   8% (2/23)           \n";
+        Matcher matcher = LogRequestor.LOG_LINE.matcher(line);;
+        assertTrue(matcher.matches());
+    }
     private void setupMocks(final InputStream inputStream) throws Exception {
         new Expectations() {{
             RequestUtil.newGet(anyString);
@@ -291,4 +300,6 @@ private static ByteBuffer messageToBuffer(Streams stream, String message) throws
     private static String logMessage(String message) {
         return String.format("[2015-08-05T12:34:56Z] %s", message);
     }
+
+
 }