Skip to content

Commit ddf3029

Browse files
chontonrohanKanojia
chonton
authored and
rohanKanojia
committed
add sample
clean up poms
1 parent 8ca6c82 commit ddf3029

File tree

46 files changed

+1819
-1655
lines changed

Some content is hidden

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

46 files changed

+1819
-1655
lines changed

‎it/builder/app-image/pom.xml‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<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/maven-v4_0_0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44

55
<parent>
66
<groupId>io.fabric8.dmp.itests</groupId>
77
<artifactId>dmp-it-builder-parent</artifactId>
8-
<version>0.40-SNAPSHOT</version>
8+
<version>0.40.0-SNAPSHOT</version>
99
</parent>
1010

1111
<artifactId>dmp-it-builder-app-image</artifactId>
@@ -21,27 +21,6 @@
2121

2222
<build>
2323
<plugins>
24-
<plugin>
25-
<groupId>org.apache.maven.plugins</groupId>
26-
<artifactId>maven-assembly-plugin</artifactId>
27-
<executions>
28-
<execution>
29-
<id>build-context</id>
30-
<phase>generate-resources</phase>
31-
<goals>
32-
<goal>single</goal>
33-
</goals>
34-
<configuration>
35-
<finalName>context</finalName>
36-
<appendAssemblyId>false</appendAssemblyId>
37-
<attach>false</attach>
38-
<descriptors>
39-
<descriptor>src/assembly/context.xml</descriptor>
40-
</descriptors>
41-
</configuration>
42-
</execution>
43-
</executions>
44-
</plugin>
4524
<plugin>
4625
<groupId>io.fabric8</groupId>
4726
<artifactId>docker-maven-plugin</artifactId>
@@ -64,18 +43,39 @@
6443
<executions>
6544
<execution>
6645
<id>build-image</id>
67-
<phase>package</phase>
6846
<goals>
6947
<goal>build</goal>
7048
</goals>
49+
<phase>package</phase>
7150
</execution>
7251
<execution>
7352
<id>run</id>
74-
<phase>integration-test</phase>
7553
<goals>
7654
<goal>start</goal>
7755
<goal>stop</goal>
7856
</goals>
57+
<phase>integration-test</phase>
58+
</execution>
59+
</executions>
60+
</plugin>
61+
<plugin>
62+
<groupId>org.apache.maven.plugins</groupId>
63+
<artifactId>maven-assembly-plugin</artifactId>
64+
<executions>
65+
<execution>
66+
<id>build-context</id>
67+
<goals>
68+
<goal>single</goal>
69+
</goals>
70+
<phase>generate-resources</phase>
71+
<configuration>
72+
<finalName>context</finalName>
73+
<appendAssemblyId>false</appendAssemblyId>
74+
<attach>false</attach>
75+
<descriptors>
76+
<descriptor>src/assembly/context.xml</descriptor>
77+
</descriptors>
78+
</configuration>
7979
</execution>
8080
</executions>
8181
</plugin>

‎it/builder/app/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<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/maven-v4_0_0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44

55
<parent>
66
<groupId>io.fabric8.dmp.itests</groupId>
77
<artifactId>dmp-it-builder-parent</artifactId>
8-
<version>0.40-SNAPSHOT</version>
8+
<version>0.40.0-SNAPSHOT</version>
99
</parent>
1010

1111
<artifactId>dmp-it-builder-app</artifactId>
@@ -27,10 +27,10 @@
2727
<executions>
2828
<execution>
2929
<id>copy-from-builder</id>
30-
<phase>generate-resources</phase>
3130
<goals>
3231
<goal>copy</goal>
3332
</goals>
33+
<phase>generate-resources</phase>
3434
<configuration>
3535
<images>
3636
<image>
@@ -56,10 +56,10 @@
5656
<executions>
5757
<execution>
5858
<id>attach-artifact</id>
59-
<phase>package</phase>
6059
<goals>
6160
<goal>attach-artifact</goal>
6261
</goals>
62+
<phase>package</phase>
6363
<configuration>
6464
<artifacts>
6565
<artifact>

‎it/builder/builder-image/pom.xml‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,52 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<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/maven-v4_0_0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44

55
<parent>
66
<groupId>io.fabric8.dmp.itests</groupId>
77
<artifactId>dmp-it-builder-parent</artifactId>
8-
<version>0.40-SNAPSHOT</version>
8+
<version>0.40.0-SNAPSHOT</version>
99
</parent>
1010

1111
<artifactId>dmp-it-builder-builder-image</artifactId>
1212
<packaging>pom</packaging>
1313

1414
<build>
1515
<plugins>
16+
<plugin>
17+
<groupId>io.fabric8</groupId>
18+
<artifactId>docker-maven-plugin</artifactId>
19+
<configuration>
20+
<images>
21+
<image>
22+
<name>${builder.image}</name>
23+
<build>
24+
<contextDir>${project.build.directory}/context</contextDir>
25+
<filter>false</filter>
26+
</build>
27+
</image>
28+
</images>
29+
</configuration>
30+
<executions>
31+
<execution>
32+
<id>build-image</id>
33+
<goals>
34+
<goal>build</goal>
35+
</goals>
36+
<phase>package</phase>
37+
</execution>
38+
</executions>
39+
</plugin>
1640
<plugin>
1741
<groupId>org.apache.maven.plugins</groupId>
1842
<artifactId>maven-assembly-plugin</artifactId>
1943
<executions>
2044
<execution>
2145
<id>build-rootfs</id>
22-
<phase>generate-resources</phase>
2346
<goals>
2447
<goal>single</goal>
2548
</goals>
49+
<phase>generate-resources</phase>
2650
<configuration>
2751
<finalName>rootfs</finalName>
2852
<appendAssemblyId>false</appendAssemblyId>
@@ -34,10 +58,10 @@
3458
</execution>
3559
<execution>
3660
<id>build-context</id>
37-
<phase>generate-resources</phase>
3861
<goals>
3962
<goal>single</goal>
4063
</goals>
64+
<phase>generate-resources</phase>
4165
<configuration>
4266
<finalName>context</finalName>
4367
<appendAssemblyId>false</appendAssemblyId>
@@ -49,30 +73,6 @@
4973
</execution>
5074
</executions>
5175
</plugin>
52-
<plugin>
53-
<groupId>io.fabric8</groupId>
54-
<artifactId>docker-maven-plugin</artifactId>
55-
<configuration>
56-
<images>
57-
<image>
58-
<name>${builder.image}</name>
59-
<build>
60-
<contextDir>${project.build.directory}/context</contextDir>
61-
<filter>false</filter>
62-
</build>
63-
</image>
64-
</images>
65-
</configuration>
66-
<executions>
67-
<execution>
68-
<id>build-image</id>
69-
<phase>package</phase>
70-
<goals>
71-
<goal>build</goal>
72-
</goals>
73-
</execution>
74-
</executions>
75-
</plugin>
7676
</plugins>
7777
</build>
7878
</project>

‎it/builder/pom.xml‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<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/maven-v4_0_0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44

55
<!--
@@ -28,56 +28,51 @@
2828
<parent>
2929
<groupId>io.fabric8.dmp.itests</groupId>
3030
<artifactId>dmp-it-parent</artifactId>
31-
<version>0.40-SNAPSHOT</version>
31+
<version>0.40.0-SNAPSHOT</version>
3232
<relativePath>../pom.xml</relativePath>
3333
</parent>
3434

3535
<artifactId>dmp-it-builder-parent</artifactId>
3636
<packaging>pom</packaging>
3737

38+
<modules>
39+
<module>app-image</module>
40+
<module>app</module>
41+
<module>builder-image</module>
42+
</modules>
43+
3844
<properties>
39-
<project.build.outputTimestamp>1970-01-01T00:00:00Z</project.build.outputTimestamp>
40-
<resource.delimiter>@</resource.delimiter>
45+
<app.image>${project.groupId}-dmp-it-builder:${project.version}</app.image>
4146
<build-helper-maven-plugin.version>3.2.0</build-helper-maven-plugin.version>
42-
<maven-assembly-plugin.version>3.3.0</maven-assembly-plugin.version>
43-
<docker.verbose>true</docker.verbose>
44-
<builder.output.fileName>dmp-it-builder-app.tar.gz</builder.output.fileName>
45-
<builder.output.file>/${builder.output.fileName}</builder.output.file>
4647
<builder.image>${project.groupId}-dmp-it-builder:${project.version}-builder</builder.image>
47-
<app.image>${project.groupId}-dmp-it-builder:${project.version}</app.image>
48+
<builder.output.file>/${builder.output.fileName}</builder.output.file>
49+
<builder.output.fileName>dmp-it-builder-app.tar.gz</builder.output.fileName>
50+
<docker.verbose>true</docker.verbose>
51+
<maven-assembly-plugin.version>3.3.0</maven-assembly-plugin.version>
52+
<project.build.outputTimestamp>1970-01-01T00:00:00Z</project.build.outputTimestamp>
53+
<resource.delimiter>@</resource.delimiter>
4854
</properties>
4955

5056
<dependencyManagement>
5157
<dependencies>
5258
<dependency>
5359
<groupId>io.fabric8.dmp.itests</groupId>
54-
<artifactId>dmp-it-builder-builder-image</artifactId>
60+
<artifactId>dmp-it-builder-app</artifactId>
5561
<version>${project.version}</version>
56-
<type>pom</type>
62+
<type>tar.gz</type>
5763
</dependency>
5864
<dependency>
5965
<groupId>io.fabric8.dmp.itests</groupId>
60-
<artifactId>dmp-it-builder-app</artifactId>
66+
<artifactId>dmp-it-builder-builder-image</artifactId>
6167
<version>${project.version}</version>
62-
<type>tar.gz</type>
68+
<type>pom</type>
6369
</dependency>
6470
</dependencies>
6571
</dependencyManagement>
6672

67-
<modules>
68-
<module>app-image</module>
69-
<module>app</module>
70-
<module>builder-image</module>
71-
</modules>
72-
7373
<build>
7474
<pluginManagement>
7575
<plugins>
76-
<plugin>
77-
<groupId>org.codehaus.mojo</groupId>
78-
<artifactId>build-helper-maven-plugin</artifactId>
79-
<version>${build-helper-maven-plugin.version}</version>
80-
</plugin>
8176
<plugin>
8277
<groupId>org.apache.maven.plugins</groupId>
8378
<artifactId>maven-assembly-plugin</artifactId>
@@ -92,6 +87,11 @@
9287
<overrideGroupName>root</overrideGroupName>
9388
</configuration>
9489
</plugin>
90+
<plugin>
91+
<groupId>org.codehaus.mojo</groupId>
92+
<artifactId>build-helper-maven-plugin</artifactId>
93+
<version>${build-helper-maven-plugin.version}</version>
94+
</plugin>
9595
</plugins>
9696
</pluginManagement>
9797
</build>

0 commit comments

Comments
 (0)