Skip to content

Commit 5141df7

Browse files
committed
HBX-3128: Avoid use of Maven invoker plugin while performing functional testing
- Reorganize 'pom.xml' file Signed-off-by: Koen Aers <[email protected]>
1 parent 62fe076 commit 5141df7

File tree

1 file changed

+24
-20
lines changed

1 file changed

+24
-20
lines changed

maven/pom.xml

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
<dependency>
4848
<groupId>jakarta.xml.bind</groupId>
4949
<artifactId>jakarta.xml.bind-api</artifactId>
50-
</dependency>
50+
</dependency>
5151
<dependency>
5252
<groupId>org.junit.jupiter</groupId>
5353
<artifactId>junit-jupiter-engine</artifactId>
@@ -124,17 +124,17 @@
124124
<id>default-descriptor</id>
125125
<phase>process-classes</phase>
126126
<configuration>
127-
<goalPrefix>hibernate-tools</goalPrefix>
128-
</configuration>
127+
<goalPrefix>hibernate-tools</goalPrefix>
128+
</configuration>
129129
</execution>
130130
<execution>
131131
<id>help-goal</id>
132132
<goals>
133133
<goal>helpmojo</goal>
134134
</goals>
135135
<configuration>
136-
<goalPrefix>hibernate-tools</goalPrefix>
137-
</configuration>
136+
<goalPrefix>hibernate-tools</goalPrefix>
137+
</configuration>
138138
</execution>
139139
</executions>
140140
</plugin>
@@ -185,19 +185,6 @@
185185
</execution>
186186
</executions>
187187
</plugin>
188-
<!-- Run the integration tests -->
189-
<plugin>
190-
<groupId>org.apache.maven.plugins</groupId>
191-
<artifactId>maven-failsafe-plugin</artifactId>
192-
<executions>
193-
<execution>
194-
<goals>
195-
<goal>integration-test</goal>
196-
<goal>verify</goal>
197-
</goals>
198-
</execution>
199-
</executions>
200-
</plugin>
201188
<!-- add the integration test source folder -->
202189
<plugin>
203190
<groupId>org.codehaus.mojo</groupId>
@@ -215,6 +202,7 @@
215202
</sources>
216203
</configuration>
217204
</execution>
205+
<!-- add the examples as test resources -->
218206
<execution>
219207
<id>add-test-resource</id>
220208
<phase>generate-test-resources</phase>
@@ -235,6 +223,8 @@
235223
</execution>
236224
</executions>
237225
</plugin>
226+
<!-- filter the pom.xml files of the examples to replace the
227+
h2 and hibernate versions for the integration tests -->
238228
<plugin>
239229
<groupId>org.apache.maven.plugins</groupId>
240230
<artifactId>maven-resources-plugin</artifactId>
@@ -256,16 +246,30 @@
256246
</resource>
257247
</resources>
258248
<delimiters>
259-
<delimiter>${*}</delimiter>
249+
<delimiter>${h2.version}</delimiter>
250+
<delimiter>${hibernate.version}</delimiter>
260251
</delimiters>
261252
</configuration>
262253
</execution>
263254
</executions>
264255
</plugin>
256+
<!-- Run the integration tests -->
257+
<plugin>
258+
<groupId>org.apache.maven.plugins</groupId>
259+
<artifactId>maven-failsafe-plugin</artifactId>
260+
<executions>
261+
<execution>
262+
<goals>
263+
<goal>integration-test</goal>
264+
<goal>verify</goal>
265+
</goals>
266+
</execution>
267+
</executions>
268+
</plugin>
265269
</plugins>
266270
</build>
267271

268-
<reporting>
272+
<reporting>
269273
<plugins>
270274
<plugin>
271275
<artifactId>maven-project-info-reports-plugin</artifactId>

0 commit comments

Comments
 (0)