Skip to content

Commit 594cb0f

Browse files
slawekjaranowskislawekjaranowski
committed
ITs improvement
- use setup project instead of mrm-m-p - use plugins version for ITs from parent
1 parent bf6a0f1 commit 594cb0f

File tree

7 files changed

+99
-143
lines changed

7 files changed

+99
-143
lines changed

‎pom.xml

+1-27
Original file line numberDiff line numberDiff line change
@@ -397,14 +397,11 @@
397397
<showVersion>true</showVersion>
398398
<preBuildHookScript>setup</preBuildHookScript>
399399
<postBuildHookScript>verify</postBuildHookScript>
400-
<settingsFile>src/it/mrm/settings.xml</settingsFile>
400+
<settingsFile>src/it/settings.xml</settingsFile>
401401
<properties>
402402
<maven.compiler.source>${mojo.java.target}</maven.compiler.source>
403403
<maven.compiler.target>${mojo.java.target}</maven.compiler.target>
404404
</properties>
405-
<filterProperties>
406-
<mrm.repository.url>${mrm.repository.url}</mrm.repository.url>
407-
</filterProperties>
408405
<scriptVariables>
409406
<projectVersion>${project.version}</projectVersion>
410407
</scriptVariables>
@@ -419,29 +416,6 @@
419416
</execution>
420417
</executions>
421418
</plugin>
422-
<plugin>
423-
<groupId>org.codehaus.mojo</groupId>
424-
<artifactId>mrm-maven-plugin</artifactId>
425-
<configuration>
426-
<repositories>
427-
<mockRepo>
428-
<source>src/it/mrm/repository</source>
429-
</mockRepo>
430-
<localRepo>
431-
<source>${project.build.directory}/local-repo</source>
432-
</localRepo>
433-
<proxyRepo />
434-
</repositories>
435-
</configuration>
436-
<executions>
437-
<execution>
438-
<goals>
439-
<goal>start</goal>
440-
<goal>stop</goal>
441-
</goals>
442-
</execution>
443-
</executions>
444-
</plugin>
445419
<plugin>
446420
<artifactId>maven-enforcer-plugin</artifactId>
447421
<executions>

‎src/it/projects/java_module-export/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
<plugin>
1818
<groupId>org.apache.maven.plugins</groupId>
1919
<artifactId>maven-compiler-plugin</artifactId>
20-
<version>3.8.0</version>
2120
<configuration>
2221
<release>9</release>
2322
</configuration>

‎src/it/projects/java_module-mainclass/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
<plugin>
1818
<groupId>org.apache.maven.plugins</groupId>
1919
<artifactId>maven-compiler-plugin</artifactId>
20-
<version>3.8.0</version>
2120
<configuration>
2221
<release>9</release>
2322
</configuration>

‎src/it/projects/java_module-module+mainclass/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
<plugin>
1818
<groupId>org.apache.maven.plugins</groupId>
1919
<artifactId>maven-compiler-plugin</artifactId>
20-
<version>3.8.0</version>
2120
<configuration>
2221
<source>9</source>
2322
<target>9</target>

‎src/it/projects/setup-parent/invoker.properties

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
invoker.goals = dependency:resolve-plugins install

‎src/it/mrm/repository/parent-0.1.pom renamed to ‎src/it/projects/setup-parent/pom.xml

+92-91
Original file line numberDiff line numberDiff line change
@@ -1,91 +1,92 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<project
3-
xmlns="http://maven.apache.org/POM/4.0.0"
4-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
6-
7-
<modelVersion>4.0.0</modelVersion>
8-
9-
<groupId>org.codehaus.mojo.exec.it</groupId>
10-
<artifactId>parent</artifactId>
11-
<version>0.1</version>
12-
13-
<packaging>pom</packaging>
14-
15-
<name>exec-maven-plugin</name>
16-
<url>http://www.codehaus.org</url>
17-
18-
<licenses>
19-
<license>
20-
<name>Apache License 2</name>
21-
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
22-
<distribution>repo</distribution>
23-
</license>
24-
</licenses>
25-
26-
<properties>
27-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
28-
</properties>
29-
30-
<dependencyManagement>
31-
<dependencies>
32-
<dependency>
33-
<groupId>commons-io</groupId>
34-
<artifactId>commons-io</artifactId>
35-
<version>1.1</version>
36-
</dependency>
37-
</dependencies>
38-
</dependencyManagement>
39-
40-
<build>
41-
<pluginManagement>
42-
<plugins>
43-
<plugin>
44-
<groupId>org.apache.maven.plugins</groupId>
45-
<artifactId>maven-site-plugin</artifactId>
46-
<version>2.0.1</version>
47-
</plugin>
48-
<plugin>
49-
<groupId>org.apache.maven.plugins</groupId>
50-
<artifactId>maven-surefire-plugin</artifactId>
51-
<version>2.16</version>
52-
</plugin>
53-
<plugin>
54-
<groupId>org.apache.maven.plugins</groupId>
55-
<artifactId>maven-compiler-plugin</artifactId>
56-
<version>3.8.0</version>
57-
</plugin>
58-
<plugin>
59-
<groupId>org.apache.maven.plugins</groupId>
60-
<artifactId>maven-clean-plugin</artifactId>
61-
<version>2.5</version>
62-
</plugin>
63-
<plugin>
64-
<groupId>org.apache.maven.plugins</groupId>
65-
<artifactId>maven-assembly-plugin</artifactId>
66-
<version>2.4</version>
67-
</plugin>
68-
<plugin>
69-
<groupId>org.apache.maven.plugins</groupId>
70-
<artifactId>maven-jar-plugin</artifactId>
71-
<version>2.4</version>
72-
</plugin>
73-
<plugin>
74-
<groupId>org.apache.maven.plugins</groupId>
75-
<artifactId>maven-install-plugin</artifactId>
76-
<version>2.4</version>
77-
</plugin>
78-
<plugin>
79-
<groupId>org.apache.maven.plugins</groupId>
80-
<artifactId>maven-war-plugin</artifactId>
81-
<version>2.3</version>
82-
</plugin>
83-
<plugin>
84-
<groupId>org.apache.maven.plugins</groupId>
85-
<artifactId>maven-resources-plugin</artifactId>
86-
<version>2.6</version>
87-
</plugin>
88-
</plugins>
89-
</pluginManagement>
90-
</build>
91-
</project>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project
3+
xmlns="http://maven.apache.org/POM/4.0.0"
4+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
6+
7+
<modelVersion>4.0.0</modelVersion>
8+
9+
<groupId>org.codehaus.mojo.exec.it</groupId>
10+
<artifactId>parent</artifactId>
11+
<version>0.1</version>
12+
<packaging>pom</packaging>
13+
14+
<licenses>
15+
<license>
16+
<name>Apache License 2</name>
17+
<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
18+
<distribution>repo</distribution>
19+
</license>
20+
</licenses>
21+
22+
<properties>
23+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
24+
</properties>
25+
26+
<dependencyManagement>
27+
<dependencies>
28+
<dependency>
29+
<groupId>commons-io</groupId>
30+
<artifactId>commons-io</artifactId>
31+
<version>1.1</version>
32+
</dependency>
33+
</dependencies>
34+
</dependencyManagement>
35+
36+
<build>
37+
<pluginManagement>
38+
<plugins>
39+
<plugin>
40+
<groupId>org.apache.maven.plugins</groupId>
41+
<artifactId>maven-dependency-plugin</artifactId>
42+
<version>@maven-dependency-plugin.version@</version>
43+
</plugin>
44+
<plugin>
45+
<groupId>org.apache.maven.plugins</groupId>
46+
<artifactId>maven-site-plugin</artifactId>
47+
<version>@maven-site-plugin.version@</version>
48+
</plugin>
49+
<plugin>
50+
<groupId>org.apache.maven.plugins</groupId>
51+
<artifactId>maven-surefire-plugin</artifactId>
52+
<version>@maven-surefire-plugin.version@</version>
53+
</plugin>
54+
<plugin>
55+
<groupId>org.apache.maven.plugins</groupId>
56+
<artifactId>maven-compiler-plugin</artifactId>
57+
<version>@maven-compiler-plugin.version@</version>
58+
</plugin>
59+
<plugin>
60+
<groupId>org.apache.maven.plugins</groupId>
61+
<artifactId>maven-clean-plugin</artifactId>
62+
<version>@maven-clean-plugin.version@</version>
63+
</plugin>
64+
<plugin>
65+
<groupId>org.apache.maven.plugins</groupId>
66+
<artifactId>maven-assembly-plugin</artifactId>
67+
<version>@maven-assembly-plugin.version@</version>
68+
</plugin>
69+
<plugin>
70+
<groupId>org.apache.maven.plugins</groupId>
71+
<artifactId>maven-jar-plugin</artifactId>
72+
<version>@maven-jar-plugin.version@</version>
73+
</plugin>
74+
<plugin>
75+
<groupId>org.apache.maven.plugins</groupId>
76+
<artifactId>maven-install-plugin</artifactId>
77+
<version>@maven-install-plugin.version@</version>
78+
</plugin>
79+
<plugin>
80+
<groupId>org.apache.maven.plugins</groupId>
81+
<artifactId>maven-war-plugin</artifactId>
82+
<version>@maven-war-plugin.version@</version>
83+
</plugin>
84+
<plugin>
85+
<groupId>org.apache.maven.plugins</groupId>
86+
<artifactId>maven-resources-plugin</artifactId>
87+
<version>@maven-resources-plugin.version@</version>
88+
</plugin>
89+
</plugins>
90+
</pluginManagement>
91+
</build>
92+
</project>

‎src/it/mrm/settings.xml renamed to ‎src/it/settings.xml

+5-22
Original file line numberDiff line numberDiff line change
@@ -20,46 +20,30 @@ under the License.
2020
-->
2121

2222
<settings>
23-
<mirrors>
24-
<mirror>
25-
<id>mrm-maven-plugin</id>
26-
<name>Mock Repository Manager</name>
27-
<url>@mrm.repository.url@</url>
28-
<mirrorOf>*</mirrorOf>
29-
</mirror>
30-
</mirrors>
3123
<profiles>
3224
<profile>
3325
<id>it-repo</id>
3426
<repositories>
3527
<repository>
36-
<id>snapshots</id>
37-
<url>@mrm.repository.url@</url>
28+
<id>local.central</id>
29+
<url>@localRepositoryUrl@</url>
3830
<releases>
3931
<enabled>true</enabled>
40-
<checksumPolicy>ignore</checksumPolicy>
41-
<updatePolicy>never</updatePolicy>
4232
</releases>
4333
<snapshots>
4434
<enabled>true</enabled>
45-
<checksumPolicy>ignore</checksumPolicy>
46-
<updatePolicy>always</updatePolicy>
4735
</snapshots>
4836
</repository>
4937
</repositories>
5038
<pluginRepositories>
5139
<pluginRepository>
52-
<id>snapshots</id>
53-
<url>@mrm.repository.url@</url>
40+
<id>local.central</id>
41+
<url>@localRepositoryUrl@</url>
5442
<releases>
5543
<enabled>true</enabled>
56-
<checksumPolicy>ignore</checksumPolicy>
57-
<updatePolicy>never</updatePolicy>
5844
</releases>
5945
<snapshots>
6046
<enabled>true</enabled>
61-
<checksumPolicy>ignore</checksumPolicy>
62-
<updatePolicy>always</updatePolicy>
6347
</snapshots>
6448
</pluginRepository>
6549
</pluginRepositories>
@@ -68,5 +52,4 @@ under the License.
6852
<activeProfiles>
6953
<activeProfile>it-repo</activeProfile>
7054
</activeProfiles>
71-
72-
</settings>
55+
</settings>

0 commit comments

Comments
 (0)