Skip to content

Commit 42077e8

Browse files
rhussrhuss
committed
chore(build): Refactor BuildService and separate Maven/Docker specific parts.
This is part of a larger refactoring story described in #1115.
1 parent 299f5c1 commit 42077e8

File tree

75 files changed

+1689
-1531
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+1689
-1531
lines changed

‎pom.xml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
<properties>
3636
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3737
<maven.version>3.3.9</maven.version>
38+
<jmockit.version>1.40</jmockit.version>
3839
</properties>
3940

4041
<dependencies>
@@ -192,7 +193,7 @@
192193
<dependency>
193194
<groupId>org.jmockit</groupId>
194195
<artifactId>jmockit</artifactId>
195-
<version>1.40</version>
196+
<version>${jmockit.version}</version>
196197
<scope>test</scope>
197198
</dependency>
198199

@@ -509,6 +510,18 @@
509510
</execution>
510511
</executions>
511512
</plugin>
513+
514+
<plugin>
515+
<groupId>org.apache.maven.plugins</groupId>
516+
<artifactId>maven-surefire-plugin</artifactId>
517+
<version>2.22.1</version>
518+
<configuration>
519+
<argLine>
520+
-javaagent:${settings.localRepository}/org/jmockit/jmockit/${jmockit.version}/jmockit-${jmockit.version}.jar
521+
</argLine>
522+
</configuration>
523+
</plugin>
524+
512525
</plugins>
513526
</build>
514527
</profile>
@@ -560,7 +573,6 @@
560573
<plugin>
561574
<groupId>org.apache.maven.plugins</groupId>
562575
<artifactId>maven-surefire-plugin</artifactId>
563-
<version>2.19.1</version>
564576
<configuration>
565577
<systemPropertyVariables>
566578
<!-- JaCoCo runtime must know where to dump coverage: -->

‎samples/cargo-jolokia/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@
2222
<parent>
2323
<groupId>io.fabric8.dmp.samples</groupId>
2424
<artifactId>dmp-sample-parent</artifactId>
25-
<version>0.27.2</version>
25+
<version>0.27-SNAPSHOT</version>
2626
<relativePath>../pom.xml</relativePath>
2727
</parent>
2828

2929
<groupId>io.fabric8</groupId>
3030
<artifactId>dmp-sample-cargo-jolokia</artifactId>
31-
<version>0.27.2</version>
31+
<version>0.27-SNAPSHOT</version>
3232

3333
<url>http://www.jolokia.org</url>
3434

‎samples/custom-net/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
<parent>
1414
<groupId>io.fabric8.dmp.samples</groupId>
1515
<artifactId>dmp-sample-parent</artifactId>
16-
<version>0.27.2</version>
16+
<version>0.27-SNAPSHOT</version>
1717
<relativePath>../pom.xml</relativePath>
1818
</parent>
1919

2020
<artifactId>dmp-custom-net</artifactId>
21-
<version>0.27.2</version>
21+
<version>0.27-SNAPSHOT</version>
2222

2323
<build>
2424
<plugins>

‎samples/data-jolokia/pom.xml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@
2222
<parent>
2323
<groupId>io.fabric8.dmp.samples</groupId>
2424
<artifactId>dmp-sample-parent</artifactId>
25-
<version>0.27.2</version>
25+
<version>0.27-SNAPSHOT</version>
2626
<relativePath>../pom.xml</relativePath>
2727
</parent>
2828

2929
<artifactId>dmp-sample-data-jolokia</artifactId>
30-
<version>0.27.2</version>
30+
<version>0.27-SNAPSHOT</version>
3131
<!-- add custom lifecycle -->
3232
<packaging>docker</packaging>
3333

@@ -37,7 +37,7 @@
3737
<server.version>8</server.version>
3838
<server.name>tomcat</server.name>
3939
<image>docker.io/fabric8/${server.name}-${server.version}:latest</image>
40-
<jolokia.version>1.3.2</jolokia.version>
40+
<jolokia.version>1.3.6</jolokia.version>
4141
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4242
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
4343
</properties>
@@ -96,7 +96,6 @@
9696
<alias>server</alias>
9797
<name>${image}</name>
9898
<run>
99-
<namingStrategy>none</namingStrategy>
10099
<volumes>
101100
<from>
102101
<image>data</image>
@@ -105,7 +104,7 @@
105104
<env>
106105
<CATALINA_OPTS>-Xmx32m</CATALINA_OPTS>
107106
<!-- Base starts jolokia by default. With this, it can be disabled -->
108-
<JOLOKIA_OFF>1</JOLOKIA_OFF>
107+
<AB_OFF>1</AB_OFF>
109108
<EMPTY_PROP></EMPTY_PROP>
110109
</env>
111110
<envPropertyFile>${project.basedir}/src/main/docker/environment.properties</envPropertyFile>
@@ -169,6 +168,9 @@
169168
<descriptor>assembly.xml</descriptor>
170169
</assembly>
171170
</build>
171+
<run>
172+
<containerNamePattern>%a-%t</containerNamePattern>
173+
</run>
172174
<watch>
173175
<interval>5000</interval>
174176
<mode>both</mode>
@@ -255,7 +257,7 @@
255257
<run>
256258
<env>
257259
<CATALINA_OPTS>-Xmx32m</CATALINA_OPTS>
258-
<JOLOKIA_OFF>1</JOLOKIA_OFF>
260+
<AB_OFF>1</AB_OFF>
259261
</env>
260262
<ports>
261263
<!-- Port mappings: Container internal port (which must be exposed) will be
@@ -275,7 +277,7 @@
275277
</wait>
276278
<log>
277279
<enabled>true</enabled>
278-
<prefix>TC</prefix>
280+
<prefix>TC></prefix>
279281
<color>yellow</color>
280282
</log>
281283
</run>

‎samples/docker-compose/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@
2222
<parent>
2323
<groupId>io.fabric8.dmp.samples</groupId>
2424
<artifactId>dmp-sample-parent</artifactId>
25-
<version>0.27.2</version>
25+
<version>0.27-SNAPSHOT</version>
2626
<relativePath>../pom.xml</relativePath>
2727
</parent>
2828

2929
<artifactId>dmp-sample-docker-compose</artifactId>
30-
<version>0.27.2</version>
30+
<version>0.27-SNAPSHOT</version>
3131

3232
<url>http://www.jolokia.org</url>
3333

‎samples/dockerfile/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
<parent>
1313
<groupId>io.fabric8.dmp.samples</groupId>
1414
<artifactId>dmp-sample-parent</artifactId>
15-
<version>0.27.2</version>
15+
<version>0.27-SNAPSHOT</version>
1616
<relativePath>../pom.xml</relativePath>
1717
</parent>
1818

1919
<artifactId>dockerfile</artifactId>
20-
<version>0.27.2</version>
20+
<version>0.27-SNAPSHOT</version>
2121
<packaging>war</packaging>
2222
<name>dmp-sample-dockerfile</name>
2323

‎samples/dockerignore/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
<parent>
1111
<groupId>io.fabric8.dmp.samples</groupId>
1212
<artifactId>dmp-sample-parent</artifactId>
13-
<version>0.27.2</version>
13+
<version>0.27-SNAPSHOT</version>
1414
<relativePath>../pom.xml</relativePath>
1515
</parent>
1616

1717
<artifactId>dmp-sample-dockerignore</artifactId>
18-
<version>0.27.2</version>
18+
<version>0.27-SNAPSHOT</version>
1919
<packaging>docker-build</packaging>
2020

2121
<build>

‎samples/healthcheck/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
<parent>
1313
<groupId>io.fabric8.dmp.samples</groupId>
1414
<artifactId>dmp-sample-parent</artifactId>
15-
<version>0.27.2</version>
15+
<version>0.27-SNAPSHOT</version>
1616
<relativePath>../pom.xml</relativePath>
1717
</parent>
1818

1919
<artifactId>dmp-sample-healthcheck</artifactId>
20-
<version>0.27.2</version>
20+
<version>0.27-SNAPSHOT</version>
2121

2222

2323
<build>

‎samples/helloworld/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
<parent>
1313
<groupId>io.fabric8.dmp.samples</groupId>
1414
<artifactId>dmp-sample-parent</artifactId>
15-
<version>0.27.2</version>
15+
<version>0.27-SNAPSHOT</version>
1616
<relativePath>../pom.xml</relativePath>
1717
</parent>
1818

1919

2020
<artifactId>dmp-sample-helloworld</artifactId>
21-
<version>0.27.2</version>
21+
<version>0.27-SNAPSHOT</version>
2222
<packaging>jar</packaging>
2323
<name>dmp-sample-helloworld</name>
2424

‎samples/log/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313
<parent>
1414
<groupId>io.fabric8.dmp.samples</groupId>
1515
<artifactId>dmp-sample-parent</artifactId>
16-
<version>0.27.2</version>
16+
<version>0.27-SNAPSHOT</version>
1717
<relativePath>../pom.xml</relativePath>
1818
</parent>
1919

2020

2121
<groupId>io.fabric8</groupId>
2222
<artifactId>dmp-sample-log</artifactId>
23-
<version>0.27.2</version>
23+
<version>0.27-SNAPSHOT</version>
2424

2525
<build>
2626
<plugins>

0 commit comments

Comments
 (0)