Skip to content

Commit

Permalink
[MINVOKER-362] Use properties from parent for plugins versions in ITs
Browse files Browse the repository at this point in the history
by the way - replace pom.version with project.version
  • Loading branch information
slawekjaranowski committed May 1, 2024
1 parent ee34dc2 commit f121de5
Show file tree
Hide file tree
Showing 93 changed files with 150 additions and 140 deletions.
15 changes: 0 additions & 15 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -375,21 +375,6 @@ under the License.
<profiles>
<profile>
<id>run-its</id>
<properties>
<!-- plugins versions used in IT tests -->
<antrunPluginVersion>3.1.0</antrunPluginVersion>
<cleanPluginVersion>3.2.0</cleanPluginVersion>
<compilerPluginVersion>3.11.0</compilerPluginVersion>
<enforcerPluginVersion>3.2.1</enforcerPluginVersion>
<helpPluginVersion>3.4.0</helpPluginVersion>
<installPluginVersion>3.1.1</installPluginVersion>
<jarPluginVersion>3.3.0</jarPluginVersion>
<pluginPluginVersion>3.8.1</pluginPluginVersion>
<resourcesPluginVersion>3.3.1</resourcesPluginVersion>
<sitePluginVersion>3.12.1</sitePluginVersion>
<sourcePluginVersion>3.2.1</sourcePluginVersion>
<surefirePluginVersion>3.0.0</surefirePluginVersion>
</properties>
<build>
<pluginManagement>
<plugins>
Expand Down
11 changes: 11 additions & 0 deletions src/it/MINVOKER-191/plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,17 @@ under the License.
</dependencies>

<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<configuration>
<goalPrefix>test</goalPrefix>
</configuration>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down
6 changes: 3 additions & 3 deletions src/it/MINVOKER-191/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,17 +49,17 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>@compilerPluginVersion@</version>
<version>@version.maven-compiler-plugin@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>@pluginPluginVersion@</version>
<version>@version.maven-plugin-tools@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>@resourcesPluginVersion@</version>
<version>@version.maven-resources-plugin@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down
4 changes: 2 additions & 2 deletions src/it/MINVOKER-196_junit_report_file/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,12 @@ under the License.
<!-- This triggers the download of a known version of this plugin which can then be safely invoked by the IT project -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>@resourcesPluginVersion@</version>
<version>@version.maven-resources-plugin@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
<version>@pom.version@</version>
<version>@project.version@</version>
<configuration>
<ignoreFailures>true</ignoreFailures>
<writeJunitReport>true</writeJunitReport>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ under the License.
<plugins>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>@resourcesPluginVersion@</version>
<version>@version.maven-resources-plugin@</version>
</plugin>
</plugins>
</build>
Expand Down
2 changes: 1 addition & 1 deletion src/it/MINVOKER-288-failed-setup-run/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
<version>@pom.version@</version>
<version>@project.version@</version>
<configuration>
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
<writeJunitReport>true</writeJunitReport>
Expand Down
2 changes: 1 addition & 1 deletion src/it/MINVOKER-288-failed-setup-verify/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
<version>@pom.version@</version>
<version>@project.version@</version>
<configuration>
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
<writeJunitReport>true</writeJunitReport>
Expand Down
2 changes: 1 addition & 1 deletion src/it/MINVOKER-289/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
<version>@pom.version@</version>
<version>@project.version@</version>
<configuration>
<writeJunitReport>true</writeJunitReport>
<debug>true</debug>
Expand Down
2 changes: 1 addition & 1 deletion src/it/clone-clean/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
<version>@pom.version@</version>
<version>@project.version@</version>
<configuration>
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
<cloneClean>true</cloneClean>
Expand Down
2 changes: 1 addition & 1 deletion src/it/clone-maven-plugin-packaging/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
<version>@pom.version@</version>
<version>@project.version@</version>
<configuration>
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
<cloneClean>true</cloneClean>
Expand Down
2 changes: 1 addition & 1 deletion src/it/fail-build-streamLogsOnFailures/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
<version>@pom.version@</version>
<version>@project.version@</version>
<configuration>
<writeJunitReport>true</writeJunitReport>
<debug>false</debug>
Expand Down
2 changes: 1 addition & 1 deletion src/it/fail-build-with-verify/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
<version>@pom.version@</version>
<version>@project.version@</version>
<configuration>
<debug>true</debug>
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
Expand Down
2 changes: 1 addition & 1 deletion src/it/fail-build/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
<version>@pom.version@</version>
<version>@project.version@</version>
<configuration>
<writeJunitReport>true</writeJunitReport>
<debug>true</debug>
Expand Down
2 changes: 1 addition & 1 deletion src/it/fail-ignore-with-verify/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
<version>@pom.version@</version>
<version>@project.version@</version>
<configuration>
<debug>true</debug>
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
Expand Down
2 changes: 1 addition & 1 deletion src/it/fail-ignore/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
<version>@pom.version@</version>
<version>@project.version@</version>
<configuration>
<debug>true</debug>
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
Expand Down
2 changes: 1 addition & 1 deletion src/it/fail-noprojects_integration-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
<version>@pom.version@</version>
<version>@project.version@</version>
<configuration>
<failIfNoProjects>true</failIfNoProjects>
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
Expand Down
2 changes: 1 addition & 1 deletion src/it/fail-noprojects_run/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
<version>@pom.version@</version>
<version>@project.version@</version>
<configuration>
<failIfNoProjects>true</failIfNoProjects>
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
Expand Down
2 changes: 1 addition & 1 deletion src/it/fail-noprojects_verify/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
<version>@pom.version@</version>
<version>@project.version@</version>
<configuration>
<failIfNoProjects>true</failIfNoProjects>
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
Expand Down
2 changes: 1 addition & 1 deletion src/it/fail-postbuild/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
<version>@pom.version@</version>
<version>@project.version@</version>
<configuration>
<debug>true</debug>
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
Expand Down
2 changes: 1 addition & 1 deletion src/it/fail-prebuild/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
<version>@pom.version@</version>
<version>@project.version@</version>
<configuration>
<debug>true</debug>
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
Expand Down
2 changes: 1 addition & 1 deletion src/it/fail-run-postbuild/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
<version>@pom.version@</version>
<version>@project.version@</version>
<configuration>
<debug>true</debug>
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
Expand Down
2 changes: 1 addition & 1 deletion src/it/install-extra-artifacts/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
<version>@pom.version@</version>
<version>@project.version@</version>
<configuration>
<localRepositoryPath>${project.build.directory}/it-repo</localRepositoryPath>
<extraArtifacts>
Expand Down
2 changes: 1 addition & 1 deletion src/it/integration-test-never-fails/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
<version>@pom.version@</version>
<version>@project.version@</version>
<configuration>
<debug>true</debug>
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
Expand Down
2 changes: 1 addition & 1 deletion src/it/invocation-cmdline-exclude/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ under the License.

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<enforcerPluginVersion>@enforcerPluginVersion@</enforcerPluginVersion>
<version.maven-enforcer-plugin>@version.maven-enforcer-plugin@</version.maven-enforcer-plugin>
</properties>

<build>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>@enforcerPluginVersion@</version>
<version>@version.maven-enforcer-plugin@</version>
<executions>
<execution>
<goals>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>@enforcerPluginVersion@</version>
<version>@version.maven-enforcer-plugin@</version>
<executions>
<execution>
<goals>
Expand Down
4 changes: 2 additions & 2 deletions src/it/invocation-debug/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,15 @@ under the License.

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<enforcerPluginVersion>@enforcerPluginVersion@</enforcerPluginVersion>
<version.maven-enforcer-plugin>@version.maven-enforcer-plugin@</version.maven-enforcer-plugin>
</properties>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
<version>@pom.version@</version>
<version>@project.version@</version>
<configuration>
<goals>
<goal>validate</goal>
Expand Down
2 changes: 1 addition & 1 deletion src/it/invocation-debug/src/it/minvoker-142/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>@enforcerPluginVersion@</version>
<version>@version.maven-enforcer-plugin@</version>
<executions>
<execution>
<goals>
Expand Down
2 changes: 1 addition & 1 deletion src/it/invocation-emptyproperty/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ under the License.

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<enforcerPluginVersion>@enforcerPluginVersion@</enforcerPluginVersion>
<version.maven-enforcer-plugin>@version.maven-enforcer-plugin@</version.maven-enforcer-plugin>
</properties>

<build>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>@enforcerPluginVersion@</version>
<version>@version.maven-enforcer-plugin@</version>
<executions>
<execution>
<goals>
Expand Down
4 changes: 2 additions & 2 deletions src/it/invocation-environmentvariable/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ under the License.

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<enforcerPluginVersion>@enforcerPluginVersion@</enforcerPluginVersion>
<helpPluginVersion>@helpPluginVersion@</helpPluginVersion>
<version.maven-enforcer-plugin>@version.maven-enforcer-plugin@</version.maven-enforcer-plugin>
<version.maven-help-plugin>@version.maven-help-plugin@</version.maven-help-plugin>
</properties>

<build>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>@enforcerPluginVersion@</version>
<version>@version.maven-enforcer-plugin@</version>
<executions>
<execution>
<goals>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>@enforcerPluginVersion@</version>
<version>@version.maven-enforcer-plugin@</version>
<executions>
<execution>
<goals>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-help-plugin</artifactId>
<version>@helpPluginVersion@</version>
<version>@version.maven-help-plugin@</version>
<executions>
<execution>
<phase>validate</phase>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>@enforcerPluginVersion@</version>
<version>@version.maven-enforcer-plugin@</version>
<executions>
<execution>
<id>enforce</id>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>@enforcerPluginVersion@</version>
<version>@version.maven-enforcer-plugin@</version>
<executions>
<execution>
<id>enforce</id>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>@enforcerPluginVersion@</version>
<version>@version.maven-enforcer-plugin@</version>
<executions>
<execution>
<id>enforce</id>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>@enforcerPluginVersion@</version>
<version>@version.maven-enforcer-plugin@</version>
<executions>
<execution>
<id>enforce</id>
Expand Down
Loading

0 comments on commit f121de5

Please sign in to comment.