Skip to content
This repository was archived by the owner on Sep 8, 2022. It is now read-only.

Commit daa6f6d

Browse files
apegam-pvapegam-pv
committed
[jgitflow-maven-plugin] merging 'release/3.0.0' into 'master'
2 parents 4d4f4f1 + 41b05e2 commit daa6f6d

File tree

319 files changed

+5550
-1454
lines changed

Some content is hidden

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

319 files changed

+5550
-1454
lines changed

‎examples/baseline/pom.xml

+105
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
#%L
4+
wcm.io
5+
%%
6+
Copyright (C) 2017 wcm.io
7+
%%
8+
Licensed under the Apache License, Version 2.0 (the "License");
9+
you may not use this file except in compliance with the License.
10+
You may obtain a copy of the License at
11+
http://www.apache.org/licenses/LICENSE-2.0
12+
Unless required by applicable law or agreed to in writing, software
13+
distributed under the License is distributed on an "AS IS" BASIS,
14+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
See the License for the specific language governing permissions and
16+
limitations under the License.
17+
#L%
18+
-->
19+
<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/xsd/maven-4.0.0.xsd">
20+
<modelVersion>4.0.0</modelVersion>
21+
22+
<parent>
23+
<groupId>io.wcm.qa</groupId>
24+
<artifactId>io.wcm.qa.galenium.integration</artifactId>
25+
<version>3.0.0</version>
26+
<relativePath>../../integration</relativePath>
27+
</parent>
28+
29+
<name>Galenium Example Baseline</name>
30+
<groupId>io.wcm.qa</groupId>
31+
<artifactId>io.wcm.qa.galenium.examples.baseline</artifactId>
32+
<packaging>pom</packaging>
33+
<version>3.0.0</version>
34+
<description>Test automation example baseline.</description>
35+
36+
<properties>
37+
<galenium.generated.artifactIds>io.wcm.qa.galenium.examples.baseline</galenium.generated.artifactIds>
38+
<site.url.module.prefix>galenium/examples</site.url.module.prefix>
39+
</properties>
40+
41+
<dependencies>
42+
</dependencies>
43+
44+
<dependencyManagement>
45+
<dependencies>
46+
<dependency>
47+
<groupId>io.wcm.qa</groupId>
48+
<artifactId>io.wcm.qa.galenium.examples.samples</artifactId>
49+
<version>3.0.0</version>
50+
</dependency>
51+
</dependencies>
52+
</dependencyManagement>
53+
54+
55+
<build>
56+
<plugins>
57+
58+
<plugin>
59+
<groupId>org.codehaus.mojo</groupId>
60+
<artifactId>license-maven-plugin</artifactId>
61+
<configuration>
62+
<licenseName>apache_v2</licenseName>
63+
<addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage>
64+
<projectName>wcm.io.qa.galenium.example</projectName>
65+
<excludes>
66+
<exclude>**/*.json</exclude>
67+
<exclude>**/*.html</exclude>
68+
</excludes>
69+
</configuration>
70+
</plugin>
71+
72+
<!-- Skip UI tests -->
73+
<plugin>
74+
<groupId>org.apache.maven.plugins</groupId>
75+
<artifactId>maven-failsafe-plugin</artifactId>
76+
<configuration>
77+
<skip>true</skip>
78+
</configuration>
79+
</plugin>
80+
81+
</plugins>
82+
</build>
83+
84+
<profiles>
85+
86+
<profile>
87+
<id>site-for-ci</id>
88+
<activation>
89+
<property>
90+
<name>continuous-integration</name>
91+
<value>true</value>
92+
</property>
93+
</activation>
94+
95+
<distributionManagement>
96+
<site>
97+
<id>${site.deploy.id}</id>
98+
<url>${site.deploy.url}${site.url.module.prefix}</url>
99+
</site>
100+
</distributionManagement>
101+
</profile>
102+
103+
</profiles>
104+
105+
</project>

‎examples/pom.xml

+4-2
Original file line numberDiff line numberDiff line change
@@ -23,22 +23,24 @@
2323
<parent>
2424
<groupId>io.wcm.maven</groupId>
2525
<artifactId>io.wcm.maven.global-parent</artifactId>
26-
<version>26</version>
26+
<version>27</version>
2727
<relativePath />
2828
</parent>
2929

3030
<name>Galenium Examples</name>
3131
<groupId>io.wcm.qa</groupId>
3232
<artifactId>io.wcm.qa.galenium.examples</artifactId>
3333
<packaging>pom</packaging>
34-
<version>2.0.0</version>
34+
<version>3.0.0</version>
3535
<description>Test automation examples.</description>
3636

3737
<properties>
3838
<site.url.module.prefix>galenium/examples</site.url.module.prefix>
3939
</properties>
4040

4141
<modules>
42+
<module>baseline</module>
43+
<module>samples</module>
4244
<module>specs</module>
4345
<module>tests</module>
4446
</modules>

‎examples/samples/pom.xml

+127
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,127 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
#%L
4+
wcm.io
5+
%%
6+
Copyright (C) 2017 wcm.io
7+
%%
8+
Licensed under the Apache License, Version 2.0 (the "License");
9+
you may not use this file except in compliance with the License.
10+
You may obtain a copy of the License at
11+
http://www.apache.org/licenses/LICENSE-2.0
12+
Unless required by applicable law or agreed to in writing, software
13+
distributed under the License is distributed on an "AS IS" BASIS,
14+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
See the License for the specific language governing permissions and
16+
limitations under the License.
17+
#L%
18+
-->
19+
<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/xsd/maven-4.0.0.xsd">
20+
<modelVersion>4.0.0</modelVersion>
21+
22+
<parent>
23+
<groupId>io.wcm.qa</groupId>
24+
<artifactId>io.wcm.qa.galenium.integration</artifactId>
25+
<version>3.0.0</version>
26+
<relativePath>../../integration</relativePath>
27+
</parent>
28+
29+
<name>Galenium Example Samples</name>
30+
<groupId>io.wcm.qa</groupId>
31+
<artifactId>io.wcm.qa.galenium.examples.samples</artifactId>
32+
<packaging>jar</packaging>
33+
<version>3.0.0</version>
34+
<description>Test automation example samples.</description>
35+
36+
<properties>
37+
<galenium.sampling.root>../tests/target/sampled</galenium.sampling.root>
38+
<site.url.module.prefix>galenium/examples</site.url.module.prefix>
39+
</properties>
40+
41+
<dependencies>
42+
43+
<dependency>
44+
<groupId>io.wcm.qa</groupId>
45+
<artifactId>io.wcm.qa.galenium.examples.tests</artifactId>
46+
<version>3.0.0</version>
47+
<type>pom</type>
48+
</dependency>
49+
50+
</dependencies>
51+
52+
<build>
53+
<plugins>
54+
55+
<plugin>
56+
<artifactId>maven-resources-plugin</artifactId>
57+
<executions>
58+
<execution>
59+
<id>fetch-samples-from-tests</id>
60+
<!-- here the phase you need -->
61+
<phase>generate-resources</phase>
62+
<goals>
63+
<goal>copy-resources</goal>
64+
</goals>
65+
<configuration>
66+
<outputDirectory>${basedir}/target/classes</outputDirectory>
67+
<resources>
68+
<resource>
69+
<directory>${galenium.sampling.root}</directory>
70+
<filtering>false</filtering>
71+
</resource>
72+
</resources>
73+
</configuration>
74+
</execution>
75+
</executions>
76+
</plugin>
77+
78+
<plugin>
79+
80+
<groupId>org.codehaus.mojo</groupId>
81+
<artifactId>license-maven-plugin</artifactId>
82+
<configuration>
83+
<licenseName>apache_v2</licenseName>
84+
<addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage>
85+
<projectName>wcm.io.qa.galenium.example</projectName>
86+
<excludes>
87+
<exclude>**/*.json</exclude>
88+
<exclude>**/*.html</exclude>
89+
</excludes>
90+
</configuration>
91+
</plugin>
92+
93+
<!-- Skip UI tests -->
94+
<plugin>
95+
<groupId>org.apache.maven.plugins</groupId>
96+
<artifactId>maven-failsafe-plugin</artifactId>
97+
<configuration>
98+
<skip>true</skip>
99+
</configuration>
100+
</plugin>
101+
102+
</plugins>
103+
</build>
104+
105+
<profiles>
106+
107+
108+
<profile>
109+
<id>site-for-ci</id>
110+
<activation>
111+
<property>
112+
<name>continuous-integration</name>
113+
<value>true</value>
114+
</property>
115+
</activation>
116+
117+
<distributionManagement>
118+
<site>
119+
<id>${site.deploy.id}</id>
120+
<url>${site.deploy.url}${site.url.module.prefix}</url>
121+
</site>
122+
</distributionManagement>
123+
</profile>
124+
125+
</profiles>
126+
127+
</project>

‎examples/specs/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@
2323
<parent>
2424
<groupId>io.wcm.qa</groupId>
2525
<artifactId>io.wcm.qa.galenium.integration.specs</artifactId>
26-
<version>2.0.0</version>
26+
<version>3.0.0</version>
2727
<relativePath>../../integration/specs</relativePath>
2828
</parent>
2929

3030
<name>Galenium Example Specs</name>
3131
<groupId>io.wcm.qa</groupId>
3232
<artifactId>io.wcm.qa.galenium.examples.specs</artifactId>
3333
<packaging>jar</packaging>
34-
<version>2.0.0</version>
34+
<version>3.0.0</version>
3535
<description>Test automation example Galen specs.</description>
3636

3737
<properties>
@@ -48,7 +48,7 @@
4848
<configuration>
4949
<licenseName>apache_v2</licenseName>
5050
<addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage>
51-
<projectName>wcm.io.qa.galenium.example</projectName>
51+
<projectName>io.wcm.qa.galenium.example</projectName>
5252
<excludes>
5353
<exclude>**/*.json</exclude>
5454
<exclude>**/*.html</exclude>

‎examples/tests/pom.xml

+44-3
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,20 @@
2323
<parent>
2424
<groupId>io.wcm.qa</groupId>
2525
<artifactId>io.wcm.qa.galenium.integration.ui-tests</artifactId>
26-
<version>2.0.0</version>
26+
<version>3.0.0</version>
2727
<relativePath>../../integration/ui-tests</relativePath>
2828
</parent>
2929

3030
<name>Galenium Example Tests</name>
3131
<groupId>io.wcm.qa</groupId>
3232
<artifactId>io.wcm.qa.galenium.examples.tests</artifactId>
3333
<packaging>jar</packaging>
34-
<version>2.0.0</version>
34+
<version>3.0.0</version>
3535
<description>Test automation example tests.</description>
3636

3737
<properties>
3838
<galenium.generated.artifactIds>io.wcm.qa.galenium.examples.specs</galenium.generated.artifactIds>
39+
<galenium.sampling.artifactIds>io.wcm.qa.galenium.examples.sampling</galenium.sampling.artifactIds>
3940
<site.url.module.prefix>galenium/examples</site.url.module.prefix>
4041
</properties>
4142

@@ -44,11 +45,30 @@
4445
<dependency>
4546
<groupId>io.wcm.qa</groupId>
4647
<artifactId>io.wcm.qa.galenium.examples.specs</artifactId>
47-
<version>2.0.0</version>
48+
<version>3.0.0</version>
49+
</dependency>
50+
51+
<dependency>
52+
<groupId>io.wcm.qa</groupId>
53+
<artifactId>io.wcm.qa.galenium.examples.baseline</artifactId>
54+
<version>3.0.0</version>
55+
<type>pom</type>
4856
</dependency>
4957

5058
</dependencies>
5159

60+
<dependencyManagement>
61+
<dependencies>
62+
<dependency>
63+
<groupId>io.wcm.qa</groupId>
64+
<artifactId>io.wcm.qa.galenium.examples.baseline</artifactId>
65+
<version>3.0.0</version>
66+
<scope>import</scope>
67+
<type>pom</type>
68+
</dependency>
69+
</dependencies>
70+
</dependencyManagement>
71+
5272
<build>
5373
<plugins>
5474

@@ -97,6 +117,27 @@
97117
</configuration>
98118
</plugin>
99119

120+
<plugin>
121+
<groupId>org.apache.maven.plugins</groupId>
122+
<artifactId>maven-dependency-plugin</artifactId>
123+
<executions>
124+
<execution>
125+
<id>unpack-baseline</id>
126+
<goals>
127+
<goal>unpack-dependencies</goal>
128+
</goals>
129+
<phase>generate-resources</phase>
130+
<configuration>
131+
<includeArtifactIds>${galenium.sampling.artifactIds}</includeArtifactIds>
132+
<outputDirectory>${project.build.directory}/test-classes</outputDirectory>
133+
<includes>**/*</includes>
134+
<excludeTransitive>false</excludeTransitive>
135+
<overWriteReleases>true</overWriteReleases>
136+
<overWriteSnapshots>true</overWriteSnapshots>
137+
</configuration>
138+
</execution>
139+
</executions>
140+
</plugin>
100141

101142
</plugins>
102143
</build>

0 commit comments

Comments
 (0)