chore(build): Refactor BuildService and separate Maven/Docker specifi…

…c parts.

This is part of a larger refactoring story described in #1115.

pom.xml

@@ -35,6 +35,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.version>3.3.9</maven.version>
+    <jmockit.version>1.40</jmockit.version>
   </properties>
 
   <dependencies>
@@ -192,7 +193,7 @@
     <dependency>
       <groupId>org.jmockit</groupId>
       <artifactId>jmockit</artifactId>
-      <version>1.40</version>
+      <version>${jmockit.version}</version>
       <scope>test</scope>
     </dependency>
 
@@ -509,6 +510,18 @@
               </execution>
             </executions>
           </plugin>
+
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <version>2.22.1</version>
+            <configuration>
+              <argLine>
+                -javaagent:${settings.localRepository}/org/jmockit/jmockit/${jmockit.version}/jmockit-${jmockit.version}.jar
+              </argLine>
+            </configuration>
+          </plugin>
+
         </plugins>
       </build>
     </profile>
@@ -560,7 +573,6 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-surefire-plugin</artifactId>
-            <version>2.19.1</version>
             <configuration>
               <systemPropertyVariables>
                 <!-- JaCoCo runtime must know where to dump coverage: -->

samples/cargo-jolokia/pom.xml

@@ -22,13 +22,13 @@
   <parent>
     <groupId>io.fabric8.dmp.samples</groupId>
     <artifactId>dmp-sample-parent</artifactId>
-    <version>0.27.2</version>
+    <version>0.27-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <groupId>io.fabric8</groupId>
   <artifactId>dmp-sample-cargo-jolokia</artifactId>
-  <version>0.27.2</version>
+  <version>0.27-SNAPSHOT</version>
 
   <url>http://www.jolokia.org</url>
 

samples/custom-net/pom.xml

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

samples/data-jolokia/pom.xml

@@ -22,12 +22,12 @@
   <parent>
     <groupId>io.fabric8.dmp.samples</groupId>
     <artifactId>dmp-sample-parent</artifactId>
-    <version>0.27.2</version>
+    <version>0.27-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>dmp-sample-data-jolokia</artifactId>
-  <version>0.27.2</version>
+  <version>0.27-SNAPSHOT</version>
   <!-- add custom lifecycle -->
   <packaging>docker</packaging>
 
@@ -37,7 +37,7 @@
     <server.version>8</server.version>
     <server.name>tomcat</server.name>
     <image>docker.io/fabric8/${server.name}-${server.version}:latest</image>
-    <jolokia.version>1.3.2</jolokia.version>
+    <jolokia.version>1.3.6</jolokia.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
   </properties>
@@ -96,7 +96,6 @@
               <alias>server</alias>
               <name>${image}</name>
               <run>
-                <namingStrategy>none</namingStrategy>
                 <volumes>
                   <from>
                     <image>data</image>
@@ -105,7 +104,7 @@
                 <env>
                   <CATALINA_OPTS>-Xmx32m</CATALINA_OPTS>
                   <!-- Base starts jolokia by default. With this, it can be disabled -->
-                  <JOLOKIA_OFF>1</JOLOKIA_OFF>
+                  <AB_OFF>1</AB_OFF>
                   <EMPTY_PROP></EMPTY_PROP>
                 </env>
                 <envPropertyFile>${project.basedir}/src/main/docker/environment.properties</envPropertyFile>
@@ -169,6 +168,9 @@
                   <descriptor>assembly.xml</descriptor>
                 </assembly>
               </build>
+              <run>
+                <containerNamePattern>%a-%t</containerNamePattern>
+              </run>
               <watch>
                 <interval>5000</interval>
                 <mode>both</mode>
@@ -255,7 +257,7 @@
                   <run>
                     <env>
                       <CATALINA_OPTS>-Xmx32m</CATALINA_OPTS>
-                      <JOLOKIA_OFF>1</JOLOKIA_OFF>
+                      <AB_OFF>1</AB_OFF>
                     </env>
                     <ports>
                       <!-- Port mappings: Container internal port (which must be exposed) will be
@@ -275,7 +277,7 @@
                     </wait>
                     <log>
                       <enabled>true</enabled>
-                      <prefix>TC</prefix>
+                      <prefix>TC></prefix>
                       <color>yellow</color>
                     </log>
                   </run>

samples/docker-compose/pom.xml

@@ -22,12 +22,12 @@
   <parent>
     <groupId>io.fabric8.dmp.samples</groupId>
     <artifactId>dmp-sample-parent</artifactId>
-    <version>0.27.2</version>
+    <version>0.27-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>dmp-sample-docker-compose</artifactId>
-  <version>0.27.2</version>
+  <version>0.27-SNAPSHOT</version>
 
   <url>http://www.jolokia.org</url>
 

samples/dockerfile/pom.xml

@@ -12,12 +12,12 @@
   <parent>
     <groupId>io.fabric8.dmp.samples</groupId>
     <artifactId>dmp-sample-parent</artifactId>
-    <version>0.27.2</version>
+    <version>0.27-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>dockerfile</artifactId>
-  <version>0.27.2</version>
+  <version>0.27-SNAPSHOT</version>
   <packaging>war</packaging>
   <name>dmp-sample-dockerfile</name>
 

samples/dockerignore/pom.xml

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

samples/healthcheck/pom.xml

@@ -12,12 +12,12 @@
   <parent>
     <groupId>io.fabric8.dmp.samples</groupId>
     <artifactId>dmp-sample-parent</artifactId>
-    <version>0.27.2</version>
+    <version>0.27-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>dmp-sample-healthcheck</artifactId>
-  <version>0.27.2</version>
+  <version>0.27-SNAPSHOT</version>
 
 
   <build>

samples/helloworld/pom.xml

@@ -12,13 +12,13 @@
   <parent>
     <groupId>io.fabric8.dmp.samples</groupId>
     <artifactId>dmp-sample-parent</artifactId>
-    <version>0.27.2</version>
+    <version>0.27-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
 
   <artifactId>dmp-sample-helloworld</artifactId>
-  <version>0.27.2</version>
+  <version>0.27-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>dmp-sample-helloworld</name>
 

samples/log/pom.xml

@@ -13,14 +13,14 @@
   <parent>
     <groupId>io.fabric8.dmp.samples</groupId>
     <artifactId>dmp-sample-parent</artifactId>
-    <version>0.27.2</version>
+    <version>0.27-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
 
   <groupId>io.fabric8</groupId>
   <artifactId>dmp-sample-log</artifactId>
-  <version>0.27.2</version>
+  <version>0.27-SNAPSHOT</version>
 
   <build>
     <plugins>

samples/multi-wait/pom.xml

@@ -3,12 +3,12 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.fabric8</groupId>
   <artifactId>dmp-sample-multi-wait</artifactId>
-  <version>0.27.2</version>
+  <version>0.27-SNAPSHOT</version>
   <!-- Sample exhibiting connection error described in https://github.com/fabric8io/docker-maven-plugin/issues/574 -->
  <parent>
     <groupId>io.fabric8.dmp.samples</groupId>
     <artifactId>dmp-sample-parent</artifactId>
-    <version>0.27.2</version>
+    <version>0.27-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <build>

samples/net/pom.xml

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

samples/pom.xml

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

samples/properties/pom.xml

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

samples/run-java/pom.xml

@@ -7,14 +7,14 @@
   <parent>
     <groupId>io.fabric8.dmp.samples</groupId>
     <artifactId>dmp-sample-parent</artifactId>
-    <version>0.27.2</version>
+    <version>0.27-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <groupId>io.fabric8.dmp.samples</groupId>
   <artifactId>dmp-sample-run-java</artifactId>
   <packaging>jar</packaging>
-  <version>0.27.2</version>
+  <version>0.27-SNAPSHOT</version>
 
   <build>
 

samples/smallest/pom.xml

@@ -4,13 +4,13 @@
   <parent>
     <groupId>io.fabric8.dmp.samples</groupId>
     <artifactId>dmp-sample-parent</artifactId>
-    <version>0.27.2</version>
+    <version>0.27-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <groupId>fabric8io</groupId>
   <artifactId>dmp-sample-smallest</artifactId>
-  <version>0.27.2</version>
+  <version>0.27-SNAPSHOT</version>
 
   <build>
     <plugins>

samples/volume/pom.xml

@@ -15,12 +15,12 @@
   <parent>
     <groupId>io.fabric8.dmp.samples</groupId>
     <artifactId>dmp-sample-parent</artifactId>
-    <version>0.27.2</version>
+    <version>0.27-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>dmp-sample-volume</artifactId>
-  <version>0.27.2</version>
+  <version>0.27-SNAPSHOT</version>
 
   <build>
     <plugins>

samples/zero-config/pom.xml

@@ -7,15 +7,15 @@
   <parent>
     <groupId>io.fabric8.dmp.samples</groupId>
     <artifactId>dmp-sample-parent</artifactId>
-    <version>0.27.2</version>
+    <version>0.27-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
 
   <groupId>io.fabric8.dmp.samples</groupId>
   <artifactId>demp-sample-zero-config</artifactId>
   <packaging>jar</packaging>
-  <version>0.27.2</version>
+  <version>0.27-SNAPSHOT</version>
 
   <properties>
     <jar_file>${project.build.directory}/${project.build.finalName}.jar</jar_file>