You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sj...@apache.org on 2024/05/01 10:10:50 UTC

(maven-invoker-plugin) branch master updated: [MINVOKER-362] Use properties from parent for plugins versions in ITs

This is an automated email from the ASF dual-hosted git repository.

sjaranowski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-invoker-plugin.git


The following commit(s) were added to refs/heads/master by this push:
     new f121de5  [MINVOKER-362] Use properties from parent for plugins versions in ITs
f121de5 is described below

commit f121de51df7c9473293ac6cd130f72fe00587ace
Author: Slawomir Jaranowski <s....@gmail.com>
AuthorDate: Tue Apr 30 14:21:01 2024 +0200

    [MINVOKER-362] Use properties from parent for plugins versions in ITs
    
    by the way - replace pom.version with project.version
---
 pom.xml                                                   | 15 ---------------
 src/it/MINVOKER-191/plugin/pom.xml                        | 11 +++++++++++
 src/it/MINVOKER-191/pom.xml                               |  6 +++---
 src/it/MINVOKER-196_junit_report_file/pom.xml             |  4 ++--
 .../src/it/project_2/pom.xml                              |  2 +-
 src/it/MINVOKER-288-failed-setup-run/pom.xml              |  2 +-
 src/it/MINVOKER-288-failed-setup-verify/pom.xml           |  2 +-
 src/it/MINVOKER-289/pom.xml                               |  2 +-
 src/it/clone-clean/pom.xml                                |  2 +-
 src/it/clone-maven-plugin-packaging/pom.xml               |  2 +-
 src/it/fail-build-streamLogsOnFailures/pom.xml            |  2 +-
 src/it/fail-build-with-verify/pom.xml                     |  2 +-
 src/it/fail-build/pom.xml                                 |  2 +-
 src/it/fail-ignore-with-verify/pom.xml                    |  2 +-
 src/it/fail-ignore/pom.xml                                |  2 +-
 src/it/fail-noprojects_integration-test/pom.xml           |  2 +-
 src/it/fail-noprojects_run/pom.xml                        |  2 +-
 src/it/fail-noprojects_verify/pom.xml                     |  2 +-
 src/it/fail-postbuild/pom.xml                             |  2 +-
 src/it/fail-prebuild/pom.xml                              |  2 +-
 src/it/fail-run-postbuild/pom.xml                         |  2 +-
 src/it/install-extra-artifacts/pom.xml                    |  2 +-
 src/it/integration-test-never-fails/pom.xml               |  2 +-
 src/it/invocation-cmdline-exclude/pom.xml                 |  2 +-
 .../src/it/minvoker-140-executable/pom.xml                |  2 +-
 .../src/it/minvoker-140-ignorable/pom.xml                 |  2 +-
 src/it/invocation-debug/pom.xml                           |  4 ++--
 src/it/invocation-debug/src/it/minvoker-142/pom.xml       |  2 +-
 src/it/invocation-emptyproperty/pom.xml                   |  2 +-
 .../invocation-emptyproperty/src/it/minvoker-118/pom.xml  |  2 +-
 src/it/invocation-environmentvariable/pom.xml             |  4 ++--
 .../src/it/minvoker-145/pom.xml                           |  2 +-
 .../src/it/minvoker-255/pom.xml                           |  2 +-
 .../src/it/minvoker-273/pom.xml                           |  2 +-
 .../src/it/projects/group-1/sub-1/pom.xml                 |  2 +-
 .../src/it/projects/group-1/sub-2/pom.xml                 |  2 +-
 .../src/it/projects/group-2/sub-1/pom.xml                 |  2 +-
 .../src/it/projects/group-2/sub-2/pom.xml                 |  2 +-
 src/it/invocation-multiple/pom.xml                        | 14 +++++++-------
 src/it/invocation-multiple/src/it/project/pom.xml         | 12 ++++++------
 src/it/invocation-reactor-indirect/plugin/pom.xml         | 14 ++++++++++++++
 src/it/invocation-reactor-indirect/pom.xml                |  6 +++---
 src/it/invocation-spaces/pom.xml                          | 12 ++++++------
 .../src/it projects/project/spacy pom.xml                 | 10 +++++-----
 src/it/invoker-report/pom.xml                             |  2 +-
 src/it/local-repo-default/pom.xml                         |  2 +-
 src/it/local-repo-isolated/pom.xml                        |  2 +-
 src/it/local-repo-path/pom.xml                            |  4 ++--
 src/it/local-repo-url/pom.xml                             |  4 ++--
 src/it/not-clone-not-plugin/pom.xml                       |  2 +-
 src/it/pom-filtering-encoding/pom.xml                     |  4 ++--
 src/it/pom-filtering-encoding/src/it/latin-1/pom.xml      |  2 +-
 src/it/pom-filtering-encoding/src/it/utf-8/pom.xml        |  2 +-
 src/it/pom-filtering-reactor/pom.xml                      |  2 +-
 src/it/pom-filtering/pom.xml                              |  2 +-
 src/it/pom-filtering/src/it/project/pom.xml               |  2 +-
 src/it/pom-less-invocation/pom.xml                        |  2 +-
 src/it/postbuild-executed-only-once/pom.xml               |  4 ++--
 .../postbuild-executed-only-once/src/it/project/pom.xml   |  4 ++--
 src/it/project-cloning-reactor/pom.xml                    |  2 +-
 src/it/project-cloning/pom.xml                            |  2 +-
 src/it/project-setup/pom.xml                              |  2 +-
 src/it/script-accessibility/pom.xml                       |  2 +-
 src/it/script-additional-vars/pom.xml                     |  2 +-
 src/it/script-class-loading/pom.xml                       |  2 +-
 src/it/script-classpath-duplicates/pom.xml                |  2 +-
 src/it/script-global-vars/pom.xml                         |  2 +-
 src/it/script-interpreter-detection/pom.xml               |  2 +-
 src/it/selector-conditions/pom.xml                        |  2 +-
 src/it/selector-scripts/pom.xml                           |  2 +-
 src/it/settings-auto-exclude/pom.xml                      |  2 +-
 src/it/settings-inherit/pom.xml                           |  2 +-
 src/it/settings-inherit/src/it/project/pom.xml            |  2 +-
 src/it/settings-merge/pom.xml                             |  2 +-
 src/it/settings-merge/src/it/project/pom.xml              |  2 +-
 src/it/settings-merge_jdk9+/pom.xml                       |  4 ++--
 src/it/settings-merge_jdk9+/src/it/project/pom.xml        |  4 ++--
 src/it/settings-override/pom.xml                          |  2 +-
 src/it/settings-override/src/it/project/pom.xml           |  2 +-
 src/it/spaces-should-work_non-windows/pom.xml             |  2 +-
 .../src/it/minvoker-test/pom.xml                          |  2 +-
 src/it/spaces-should-work_windows/pom.xml                 |  2 +-
 .../src/it/minvoker-test/pom.xml                          |  2 +-
 src/it/special-characters-should-work/pom.xml             |  2 +-
 .../src/it/minvoker-test/pom.xml                          |  2 +-
 src/it/staging-dependencies-test-scope/pom.xml            |  2 +-
 src/it/staging-dependencies/pom.xml                       |  2 +-
 src/it/staging-pom/pom.xml                                |  4 ++--
 src/it/staging-reactor/mod1-parent/pom.xml                |  2 +-
 src/it/staging-reactor/mod2/pom.xml                       |  2 +-
 src/it/staging-reactor/mod3/pom.xml                       |  2 +-
 src/it/staging-reactor/pom.xml                            |  2 +-
 src/it/updateOnly/pom.xml                                 |  2 +-
 93 files changed, 150 insertions(+), 140 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5f25aec..bba9d2f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
diff --git a/src/it/MINVOKER-191/plugin/pom.xml b/src/it/MINVOKER-191/plugin/pom.xml
index cf5b9fc..cae0b2b 100644
--- a/src/it/MINVOKER-191/plugin/pom.xml
+++ b/src/it/MINVOKER-191/plugin/pom.xml
@@ -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>
diff --git a/src/it/MINVOKER-191/pom.xml b/src/it/MINVOKER-191/pom.xml
index ee01722..1e2d886 100644
--- a/src/it/MINVOKER-191/pom.xml
+++ b/src/it/MINVOKER-191/pom.xml
@@ -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>
diff --git a/src/it/MINVOKER-196_junit_report_file/pom.xml b/src/it/MINVOKER-196_junit_report_file/pom.xml
index cb5ee64..b6d11cc 100644
--- a/src/it/MINVOKER-196_junit_report_file/pom.xml
+++ b/src/it/MINVOKER-196_junit_report_file/pom.xml
@@ -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>
diff --git a/src/it/MINVOKER-196_junit_report_file/src/it/project_2/pom.xml b/src/it/MINVOKER-196_junit_report_file/src/it/project_2/pom.xml
index 5634342..1268201 100644
--- a/src/it/MINVOKER-196_junit_report_file/src/it/project_2/pom.xml
+++ b/src/it/MINVOKER-196_junit_report_file/src/it/project_2/pom.xml
@@ -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>
diff --git a/src/it/MINVOKER-288-failed-setup-run/pom.xml b/src/it/MINVOKER-288-failed-setup-run/pom.xml
index af7aec2..6693409 100644
--- a/src/it/MINVOKER-288-failed-setup-run/pom.xml
+++ b/src/it/MINVOKER-288-failed-setup-run/pom.xml
@@ -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>
diff --git a/src/it/MINVOKER-288-failed-setup-verify/pom.xml b/src/it/MINVOKER-288-failed-setup-verify/pom.xml
index b1822dd..a2cdb0d 100644
--- a/src/it/MINVOKER-288-failed-setup-verify/pom.xml
+++ b/src/it/MINVOKER-288-failed-setup-verify/pom.xml
@@ -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>
diff --git a/src/it/MINVOKER-289/pom.xml b/src/it/MINVOKER-289/pom.xml
index 09da8e8..fa4868e 100644
--- a/src/it/MINVOKER-289/pom.xml
+++ b/src/it/MINVOKER-289/pom.xml
@@ -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>
diff --git a/src/it/clone-clean/pom.xml b/src/it/clone-clean/pom.xml
index c285924..ab2d269 100644
--- a/src/it/clone-clean/pom.xml
+++ b/src/it/clone-clean/pom.xml
@@ -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>
diff --git a/src/it/clone-maven-plugin-packaging/pom.xml b/src/it/clone-maven-plugin-packaging/pom.xml
index d3f9f85..d1b8ff4 100644
--- a/src/it/clone-maven-plugin-packaging/pom.xml
+++ b/src/it/clone-maven-plugin-packaging/pom.xml
@@ -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>
diff --git a/src/it/fail-build-streamLogsOnFailures/pom.xml b/src/it/fail-build-streamLogsOnFailures/pom.xml
index 49ec32d..3ef70b8 100644
--- a/src/it/fail-build-streamLogsOnFailures/pom.xml
+++ b/src/it/fail-build-streamLogsOnFailures/pom.xml
@@ -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>
diff --git a/src/it/fail-build-with-verify/pom.xml b/src/it/fail-build-with-verify/pom.xml
index 00ad863..dd67c09 100644
--- a/src/it/fail-build-with-verify/pom.xml
+++ b/src/it/fail-build-with-verify/pom.xml
@@ -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>
diff --git a/src/it/fail-build/pom.xml b/src/it/fail-build/pom.xml
index 10ec51d..f2de041 100644
--- a/src/it/fail-build/pom.xml
+++ b/src/it/fail-build/pom.xml
@@ -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>
diff --git a/src/it/fail-ignore-with-verify/pom.xml b/src/it/fail-ignore-with-verify/pom.xml
index c0e4c8d..8092137 100644
--- a/src/it/fail-ignore-with-verify/pom.xml
+++ b/src/it/fail-ignore-with-verify/pom.xml
@@ -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>
diff --git a/src/it/fail-ignore/pom.xml b/src/it/fail-ignore/pom.xml
index c34ec5d..d8aa363 100644
--- a/src/it/fail-ignore/pom.xml
+++ b/src/it/fail-ignore/pom.xml
@@ -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>
diff --git a/src/it/fail-noprojects_integration-test/pom.xml b/src/it/fail-noprojects_integration-test/pom.xml
index 494f086..e3ad38e 100644
--- a/src/it/fail-noprojects_integration-test/pom.xml
+++ b/src/it/fail-noprojects_integration-test/pom.xml
@@ -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>
diff --git a/src/it/fail-noprojects_run/pom.xml b/src/it/fail-noprojects_run/pom.xml
index 4af1ff5..c14cb50 100644
--- a/src/it/fail-noprojects_run/pom.xml
+++ b/src/it/fail-noprojects_run/pom.xml
@@ -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>
diff --git a/src/it/fail-noprojects_verify/pom.xml b/src/it/fail-noprojects_verify/pom.xml
index 312f4df..16b4583 100644
--- a/src/it/fail-noprojects_verify/pom.xml
+++ b/src/it/fail-noprojects_verify/pom.xml
@@ -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>
diff --git a/src/it/fail-postbuild/pom.xml b/src/it/fail-postbuild/pom.xml
index 4f6722f..2f8651f 100644
--- a/src/it/fail-postbuild/pom.xml
+++ b/src/it/fail-postbuild/pom.xml
@@ -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>
diff --git a/src/it/fail-prebuild/pom.xml b/src/it/fail-prebuild/pom.xml
index 29e464b..b5d5026 100644
--- a/src/it/fail-prebuild/pom.xml
+++ b/src/it/fail-prebuild/pom.xml
@@ -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>
diff --git a/src/it/fail-run-postbuild/pom.xml b/src/it/fail-run-postbuild/pom.xml
index 474fa36..cf806df 100644
--- a/src/it/fail-run-postbuild/pom.xml
+++ b/src/it/fail-run-postbuild/pom.xml
@@ -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>
diff --git a/src/it/install-extra-artifacts/pom.xml b/src/it/install-extra-artifacts/pom.xml
index 55da1fa..6329a7a 100644
--- a/src/it/install-extra-artifacts/pom.xml
+++ b/src/it/install-extra-artifacts/pom.xml
@@ -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>
diff --git a/src/it/integration-test-never-fails/pom.xml b/src/it/integration-test-never-fails/pom.xml
index 3d0a2a7..4d84b28 100644
--- a/src/it/integration-test-never-fails/pom.xml
+++ b/src/it/integration-test-never-fails/pom.xml
@@ -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>
diff --git a/src/it/invocation-cmdline-exclude/pom.xml b/src/it/invocation-cmdline-exclude/pom.xml
index 1041bdc..9db8d1d 100644
--- a/src/it/invocation-cmdline-exclude/pom.xml
+++ b/src/it/invocation-cmdline-exclude/pom.xml
@@ -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>
diff --git a/src/it/invocation-cmdline-exclude/src/it/minvoker-140-executable/pom.xml b/src/it/invocation-cmdline-exclude/src/it/minvoker-140-executable/pom.xml
index 071fd00..2236da0 100644
--- a/src/it/invocation-cmdline-exclude/src/it/minvoker-140-executable/pom.xml
+++ b/src/it/invocation-cmdline-exclude/src/it/minvoker-140-executable/pom.xml
@@ -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>
diff --git a/src/it/invocation-cmdline-exclude/src/it/minvoker-140-ignorable/pom.xml b/src/it/invocation-cmdline-exclude/src/it/minvoker-140-ignorable/pom.xml
index 72fb0bc..3209baf 100644
--- a/src/it/invocation-cmdline-exclude/src/it/minvoker-140-ignorable/pom.xml
+++ b/src/it/invocation-cmdline-exclude/src/it/minvoker-140-ignorable/pom.xml
@@ -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>
diff --git a/src/it/invocation-debug/pom.xml b/src/it/invocation-debug/pom.xml
index f3b3704..9f39fc0 100644
--- a/src/it/invocation-debug/pom.xml
+++ b/src/it/invocation-debug/pom.xml
@@ -33,7 +33,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>
@@ -41,7 +41,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>
           <goals>
             <goal>validate</goal>
diff --git a/src/it/invocation-debug/src/it/minvoker-142/pom.xml b/src/it/invocation-debug/src/it/minvoker-142/pom.xml
index 2716f59..20b989a 100644
--- a/src/it/invocation-debug/src/it/minvoker-142/pom.xml
+++ b/src/it/invocation-debug/src/it/minvoker-142/pom.xml
@@ -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>
diff --git a/src/it/invocation-emptyproperty/pom.xml b/src/it/invocation-emptyproperty/pom.xml
index f22733f..73a19d7 100644
--- a/src/it/invocation-emptyproperty/pom.xml
+++ b/src/it/invocation-emptyproperty/pom.xml
@@ -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>
diff --git a/src/it/invocation-emptyproperty/src/it/minvoker-118/pom.xml b/src/it/invocation-emptyproperty/src/it/minvoker-118/pom.xml
index f125d61..881f48e 100644
--- a/src/it/invocation-emptyproperty/src/it/minvoker-118/pom.xml
+++ b/src/it/invocation-emptyproperty/src/it/minvoker-118/pom.xml
@@ -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>
diff --git a/src/it/invocation-environmentvariable/pom.xml b/src/it/invocation-environmentvariable/pom.xml
index 94f697d..5ae2691 100644
--- a/src/it/invocation-environmentvariable/pom.xml
+++ b/src/it/invocation-environmentvariable/pom.xml
@@ -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>
diff --git a/src/it/invocation-environmentvariable/src/it/minvoker-145/pom.xml b/src/it/invocation-environmentvariable/src/it/minvoker-145/pom.xml
index dbf5577..bee9cf8 100644
--- a/src/it/invocation-environmentvariable/src/it/minvoker-145/pom.xml
+++ b/src/it/invocation-environmentvariable/src/it/minvoker-145/pom.xml
@@ -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>
diff --git a/src/it/invocation-environmentvariable/src/it/minvoker-255/pom.xml b/src/it/invocation-environmentvariable/src/it/minvoker-255/pom.xml
index f89d646..c04a02c 100644
--- a/src/it/invocation-environmentvariable/src/it/minvoker-255/pom.xml
+++ b/src/it/invocation-environmentvariable/src/it/minvoker-255/pom.xml
@@ -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>
diff --git a/src/it/invocation-environmentvariable/src/it/minvoker-273/pom.xml b/src/it/invocation-environmentvariable/src/it/minvoker-273/pom.xml
index d6f15f3..300c1bd 100644
--- a/src/it/invocation-environmentvariable/src/it/minvoker-273/pom.xml
+++ b/src/it/invocation-environmentvariable/src/it/minvoker-273/pom.xml
@@ -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>
diff --git a/src/it/invocation-group-properties/src/it/projects/group-1/sub-1/pom.xml b/src/it/invocation-group-properties/src/it/projects/group-1/sub-1/pom.xml
index cd69388..7089190 100644
--- a/src/it/invocation-group-properties/src/it/projects/group-1/sub-1/pom.xml
+++ b/src/it/invocation-group-properties/src/it/projects/group-1/sub-1/pom.xml
@@ -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>
diff --git a/src/it/invocation-group-properties/src/it/projects/group-1/sub-2/pom.xml b/src/it/invocation-group-properties/src/it/projects/group-1/sub-2/pom.xml
index c428365..9df94cb 100644
--- a/src/it/invocation-group-properties/src/it/projects/group-1/sub-2/pom.xml
+++ b/src/it/invocation-group-properties/src/it/projects/group-1/sub-2/pom.xml
@@ -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>
diff --git a/src/it/invocation-group-properties/src/it/projects/group-2/sub-1/pom.xml b/src/it/invocation-group-properties/src/it/projects/group-2/sub-1/pom.xml
index cd69388..7089190 100644
--- a/src/it/invocation-group-properties/src/it/projects/group-2/sub-1/pom.xml
+++ b/src/it/invocation-group-properties/src/it/projects/group-2/sub-1/pom.xml
@@ -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>
diff --git a/src/it/invocation-group-properties/src/it/projects/group-2/sub-2/pom.xml b/src/it/invocation-group-properties/src/it/projects/group-2/sub-2/pom.xml
index 555a925..757cd41 100644
--- a/src/it/invocation-group-properties/src/it/projects/group-2/sub-2/pom.xml
+++ b/src/it/invocation-group-properties/src/it/projects/group-2/sub-2/pom.xml
@@ -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>
diff --git a/src/it/invocation-multiple/pom.xml b/src/it/invocation-multiple/pom.xml
index 7a01a72..2fbc535 100644
--- a/src/it/invocation-multiple/pom.xml
+++ b/src/it/invocation-multiple/pom.xml
@@ -32,12 +32,12 @@ under the License.
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <mavenVersion>@mavenVersion@</mavenVersion>
-    <compilerPluginVersion>@compilerPluginVersion@</compilerPluginVersion>
-    <installPluginVersion>@installPluginVersion@</installPluginVersion>
-    <jarPluginVersion>@jarPluginVersion@</jarPluginVersion>
-    <pluginPluginVersion>@pluginPluginVersion@</pluginPluginVersion>
-    <resourcesPluginVersion>@resourcesPluginVersion@</resourcesPluginVersion>
-    <surefirePluginVersion>@surefirePluginVersion@</surefirePluginVersion>
+    <version.maven-compiler-plugin>@version.maven-compiler-plugin@</version.maven-compiler-plugin>
+    <version.maven-install-plugin>@version.maven-install-plugin@</version.maven-install-plugin>
+    <version.maven-jar-plugin>@version.maven-jar-plugin@</version.maven-jar-plugin>
+    <version.maven-plugin-tools>@version.maven-plugin-tools@</version.maven-plugin-tools>
+    <version.maven-resources-plugin>@version.maven-resources-plugin@</version.maven-resources-plugin>
+    <version.maven-surefire>@version.maven-surefire@</version.maven-surefire>
   </properties>
 
   <build>
@@ -45,7 +45,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>
diff --git a/src/it/invocation-multiple/src/it/project/pom.xml b/src/it/invocation-multiple/src/it/project/pom.xml
index 3c43664..4746a6e 100644
--- a/src/it/invocation-multiple/src/it/project/pom.xml
+++ b/src/it/invocation-multiple/src/it/project/pom.xml
@@ -47,7 +47,7 @@ under the License.
     <plugins>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>@compilerPluginVersion@</version>
+        <version>@version.maven-compiler-plugin@</version>
         <configuration>
           <source>${maven.compiler.source}</source>
           <target>${maven.compiler.target}</target>
@@ -55,23 +55,23 @@ under the License.
       </plugin>
       <plugin>
         <artifactId>maven-install-plugin</artifactId>
-        <version>@installPluginVersion@</version>
+        <version>@version.maven-install-plugin@</version>
       </plugin>
       <plugin>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>@jarPluginVersion@</version>
+        <version>@version.maven-jar-plugin@</version>
       </plugin>
       <plugin>
         <artifactId>maven-plugin-plugin</artifactId>
-        <version>@pluginPluginVersion@</version>
+        <version>@version.maven-plugin-tools@</version>
       </plugin>
       <plugin>
         <artifactId>maven-resources-plugin</artifactId>
-        <version>@resourcesPluginVersion@</version>
+        <version>@version.maven-resources-plugin@</version>
       </plugin>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>@surefirePluginVersion@</version>
+        <version>@version.maven-surefire@</version>
       </plugin>
     </plugins>
   </build>
diff --git a/src/it/invocation-reactor-indirect/plugin/pom.xml b/src/it/invocation-reactor-indirect/plugin/pom.xml
index f443bff..76c4d84 100644
--- a/src/it/invocation-reactor-indirect/plugin/pom.xml
+++ b/src/it/invocation-reactor-indirect/plugin/pom.xml
@@ -37,4 +37,18 @@ under the License.
       <version>2.0</version>
     </dependency>
   </dependencies>
+
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-plugin-plugin</artifactId>
+          <configuration>
+            <goalPrefix>test</goalPrefix>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
 </project>
diff --git a/src/it/invocation-reactor-indirect/pom.xml b/src/it/invocation-reactor-indirect/pom.xml
index e99c651..c6e7a59 100644
--- a/src/it/invocation-reactor-indirect/pom.xml
+++ b/src/it/invocation-reactor-indirect/pom.xml
@@ -48,17 +48,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>
diff --git a/src/it/invocation-spaces/pom.xml b/src/it/invocation-spaces/pom.xml
index cbe1b12..7a594b9 100644
--- a/src/it/invocation-spaces/pom.xml
+++ b/src/it/invocation-spaces/pom.xml
@@ -31,11 +31,11 @@ under the License.
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <compilerPluginVersion>@compilerPluginVersion@</compilerPluginVersion>
-    <installPluginVersion>@installPluginVersion@</installPluginVersion>
-    <jarPluginVersion>@jarPluginVersion@</jarPluginVersion>
-    <resourcesPluginVersion>@resourcesPluginVersion@</resourcesPluginVersion>
-    <surefirePluginVersion>@surefirePluginVersion@</surefirePluginVersion>
+    <version.maven-compiler-plugin>@version.maven-compiler-plugin@</version.maven-compiler-plugin>
+    <version.maven-install-plugin>@version.maven-install-plugin@</version.maven-install-plugin>
+    <version.maven-jar-plugin>@version.maven-jar-plugin@</version.maven-jar-plugin>
+    <version.maven-resources-plugin>@version.maven-resources-plugin@</version.maven-resources-plugin>
+    <version.maven-surefire>@version.maven-surefire@</version.maven-surefire>
   </properties>
 
   <build>
@@ -43,7 +43,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>
           <projectsDirectory>src/it projects</projectsDirectory>
diff --git a/src/it/invocation-spaces/src/it projects/project/spacy pom.xml b/src/it/invocation-spaces/src/it projects/project/spacy pom.xml
index 3463817..98454b0 100644
--- a/src/it/invocation-spaces/src/it projects/project/spacy pom.xml	
+++ b/src/it/invocation-spaces/src/it projects/project/spacy pom.xml	
@@ -41,21 +41,21 @@ 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-install-plugin</artifactId>
-        <version>@installPluginVersion@</version>
+        <version>@version.maven-install-plugin@</version>
       </plugin>
       <plugin>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>@jarPluginVersion@</version>
+        <version>@version.maven-jar-plugin@</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-resources-plugin</artifactId>
-        <version>@resourcesPluginVersion@</version>
+        <version>@version.maven-resources-plugin@</version>
         <configuration>
           <encoding>${project.build.sourceEncoding}</encoding>
         </configuration>
@@ -63,7 +63,7 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>@surefirePluginVersion@</version>
+        <version>@version.maven-surefire@</version>
       </plugin>
     </plugins>
   </build>
diff --git a/src/it/invoker-report/pom.xml b/src/it/invoker-report/pom.xml
index dbc9908..a886450 100644
--- a/src/it/invoker-report/pom.xml
+++ b/src/it/invoker-report/pom.xml
@@ -63,7 +63,7 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
-        <version>@sitePluginVersion@</version>
+        <version>@version.maven-site-plugin@</version>
       </plugin>
     </plugins>
   </build>
diff --git a/src/it/local-repo-default/pom.xml b/src/it/local-repo-default/pom.xml
index b601efb..16b8edf 100644
--- a/src/it/local-repo-default/pom.xml
+++ b/src/it/local-repo-default/pom.xml
@@ -41,7 +41,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}/its</cloneProjectsTo>
           <pomIncludes>
diff --git a/src/it/local-repo-isolated/pom.xml b/src/it/local-repo-isolated/pom.xml
index a2e2f8e..f7cac4f 100644
--- a/src/it/local-repo-isolated/pom.xml
+++ b/src/it/local-repo-isolated/pom.xml
@@ -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>
           <pomIncludes>
diff --git a/src/it/local-repo-path/pom.xml b/src/it/local-repo-path/pom.xml
index 7edfa61..0977b50 100644
--- a/src/it/local-repo-path/pom.xml
+++ b/src/it/local-repo-path/pom.xml
@@ -41,7 +41,7 @@ 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-clean-plugin</artifactId>
-        <version>@cleanPluginVersion@</version>
+        <version>@version.maven-clean-plugin@</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -56,7 +56,7 @@ under the License.
           <goals>
             <!-- Maven 4 require strict checksum by default, so relax here -->
             <goal>-c</goal>
-            <goal>org.apache.maven.plugins:maven-clean-plugin:@cleanPluginVersion@:clean</goal>
+            <goal>org.apache.maven.plugins:maven-clean-plugin:@version.maven-clean-plugin@:clean</goal>
           </goals>
         </configuration>
         <executions>
diff --git a/src/it/local-repo-url/pom.xml b/src/it/local-repo-url/pom.xml
index cb3e8a8..fb776de 100644
--- a/src/it/local-repo-url/pom.xml
+++ b/src/it/local-repo-url/pom.xml
@@ -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>
           <localRepositoryPath>${project.build.directory}/it-repo</localRepositoryPath>
           <settingsFile>src/it/settings.xml</settingsFile>
diff --git a/src/it/not-clone-not-plugin/pom.xml b/src/it/not-clone-not-plugin/pom.xml
index 4cf525c..1e293ce 100644
--- a/src/it/not-clone-not-plugin/pom.xml
+++ b/src/it/not-clone-not-plugin/pom.xml
@@ -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/>
           <pomIncludes>
diff --git a/src/it/pom-filtering-encoding/pom.xml b/src/it/pom-filtering-encoding/pom.xml
index 431c256..d07c139 100644
--- a/src/it/pom-filtering-encoding/pom.xml
+++ b/src/it/pom-filtering-encoding/pom.xml
@@ -30,7 +30,7 @@ under the License.
   <description>Test to check for proper handling of file encoding during POM filtering.</description>
 
   <properties>
-    <resourcesPluginVersion>@resourcesPluginVersion@</resourcesPluginVersion>
+    <version.maven-resources-plugin>@version.maven-resources-plugin@</version.maven-resources-plugin>
   </properties>
 
   <build>
@@ -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>
diff --git a/src/it/pom-filtering-encoding/src/it/latin-1/pom.xml b/src/it/pom-filtering-encoding/src/it/latin-1/pom.xml
index 65fae35..236d1bd 100644
--- a/src/it/pom-filtering-encoding/src/it/latin-1/pom.xml
+++ b/src/it/pom-filtering-encoding/src/it/latin-1/pom.xml
@@ -47,7 +47,7 @@ under the License.
     <plugins>
       <plugin>
         <artifactId>maven-resources-plugin</artifactId>
-        <version>@resourcesPluginVersion@</version>
+        <version>@version.maven-resources-plugin@</version>
       </plugin>
     </plugins>
   </build>
diff --git a/src/it/pom-filtering-encoding/src/it/utf-8/pom.xml b/src/it/pom-filtering-encoding/src/it/utf-8/pom.xml
index 8d3d0de..069c1c2 100644
--- a/src/it/pom-filtering-encoding/src/it/utf-8/pom.xml
+++ b/src/it/pom-filtering-encoding/src/it/utf-8/pom.xml
@@ -47,7 +47,7 @@ under the License.
     <plugins>
       <plugin>
         <artifactId>maven-resources-plugin</artifactId>
-        <version>@resourcesPluginVersion@</version>
+        <version>@version.maven-resources-plugin@</version>
       </plugin>
     </plugins>
   </build>
diff --git a/src/it/pom-filtering-reactor/pom.xml b/src/it/pom-filtering-reactor/pom.xml
index 79dac5f..a64957b 100644
--- a/src/it/pom-filtering-reactor/pom.xml
+++ b/src/it/pom-filtering-reactor/pom.xml
@@ -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>
           <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
diff --git a/src/it/pom-filtering/pom.xml b/src/it/pom-filtering/pom.xml
index 8fcb6dd..047e5a5 100644
--- a/src/it/pom-filtering/pom.xml
+++ b/src/it/pom-filtering/pom.xml
@@ -34,7 +34,7 @@ under the License.
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <propertyFromPropertiesSection>PROPERTY-FROM-PROPERTIES-SECTION</propertyFromPropertiesSection>
     <itProperty>FAILED</itProperty>
-    <resourcesPluginVersion>@resourcesPluginVersion@</resourcesPluginVersion>
+    <version.maven-resources-plugin>@version.maven-resources-plugin@</version.maven-resources-plugin>
   </properties>
 
   <build>
diff --git a/src/it/pom-filtering/src/it/project/pom.xml b/src/it/pom-filtering/src/it/project/pom.xml
index b273ae7..cc98e82 100644
--- a/src/it/pom-filtering/src/it/project/pom.xml
+++ b/src/it/pom-filtering/src/it/project/pom.xml
@@ -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>
diff --git a/src/it/pom-less-invocation/pom.xml b/src/it/pom-less-invocation/pom.xml
index a9458c4..4b5eda2 100644
--- a/src/it/pom-less-invocation/pom.xml
+++ b/src/it/pom-less-invocation/pom.xml
@@ -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>
           <pomIncludes>
diff --git a/src/it/postbuild-executed-only-once/pom.xml b/src/it/postbuild-executed-only-once/pom.xml
index 9624cfb..3a7cabb 100644
--- a/src/it/postbuild-executed-only-once/pom.xml
+++ b/src/it/postbuild-executed-only-once/pom.xml
@@ -31,8 +31,8 @@ under the License.
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <compilerPluginVersion>@compilerPluginVersion@</compilerPluginVersion>
-    <surefirePluginVersion>@surefirePluginVersion@</surefirePluginVersion>
+    <version.maven-compiler-plugin>@version.maven-compiler-plugin@</version.maven-compiler-plugin>
+    <version.maven-surefire>@version.maven-surefire@</version.maven-surefire>
   </properties>
 
   <build>
diff --git a/src/it/postbuild-executed-only-once/src/it/project/pom.xml b/src/it/postbuild-executed-only-once/src/it/project/pom.xml
index 9cc053a..1f0fb33 100644
--- a/src/it/postbuild-executed-only-once/src/it/project/pom.xml
+++ b/src/it/postbuild-executed-only-once/src/it/project/pom.xml
@@ -49,12 +49,12 @@ 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-surefire-plugin</artifactId>
-          <version>@surefirePluginVersion@</version>
+          <version>@version.maven-surefire@</version>
           <configuration>
             <systemPropertyVariables>
               <create_touch_file>${create_touch_file}</create_touch_file>
diff --git a/src/it/project-cloning-reactor/pom.xml b/src/it/project-cloning-reactor/pom.xml
index 7da94c9..c186bc8 100644
--- a/src/it/project-cloning-reactor/pom.xml
+++ b/src/it/project-cloning-reactor/pom.xml
@@ -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>
           <pomIncludes>
diff --git a/src/it/project-cloning/pom.xml b/src/it/project-cloning/pom.xml
index 1b7e908..c1be5b8 100644
--- a/src/it/project-cloning/pom.xml
+++ b/src/it/project-cloning/pom.xml
@@ -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>
           <pomIncludes>
diff --git a/src/it/project-setup/pom.xml b/src/it/project-setup/pom.xml
index 0922bba..ae3a507 100644
--- a/src/it/project-setup/pom.xml
+++ b/src/it/project-setup/pom.xml
@@ -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>
           <setupIncludes>
diff --git a/src/it/script-accessibility/pom.xml b/src/it/script-accessibility/pom.xml
index 808cf00..340e291 100644
--- a/src/it/script-accessibility/pom.xml
+++ b/src/it/script-accessibility/pom.xml
@@ -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>
           <pomIncludes>
             <pomInclude>*/pom.xml</pomInclude>
diff --git a/src/it/script-additional-vars/pom.xml b/src/it/script-additional-vars/pom.xml
index fbafe4f..ed4bd55 100644
--- a/src/it/script-additional-vars/pom.xml
+++ b/src/it/script-additional-vars/pom.xml
@@ -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>
           <pomIncludes>
             <pomInclude>*/pom.xml</pomInclude>
diff --git a/src/it/script-class-loading/pom.xml b/src/it/script-class-loading/pom.xml
index d3c3c11..64d29df 100644
--- a/src/it/script-class-loading/pom.xml
+++ b/src/it/script-class-loading/pom.xml
@@ -48,7 +48,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>
           <pomIncludes>
diff --git a/src/it/script-classpath-duplicates/pom.xml b/src/it/script-classpath-duplicates/pom.xml
index 20a1926..589db48 100644
--- a/src/it/script-classpath-duplicates/pom.xml
+++ b/src/it/script-classpath-duplicates/pom.xml
@@ -54,7 +54,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>
           <addTestClassPath>true</addTestClassPath>
           <debug>true</debug>
diff --git a/src/it/script-global-vars/pom.xml b/src/it/script-global-vars/pom.xml
index 585b5b1..ea98fdc 100644
--- a/src/it/script-global-vars/pom.xml
+++ b/src/it/script-global-vars/pom.xml
@@ -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>
           <pomIncludes>
             <pomInclude>*/pom.xml</pomInclude>
diff --git a/src/it/script-interpreter-detection/pom.xml b/src/it/script-interpreter-detection/pom.xml
index b5d5ee1..672b525 100644
--- a/src/it/script-interpreter-detection/pom.xml
+++ b/src/it/script-interpreter-detection/pom.xml
@@ -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}/its</cloneProjectsTo>
           <debug>true</debug>
diff --git a/src/it/selector-conditions/pom.xml b/src/it/selector-conditions/pom.xml
index c73a245..c30863f 100644
--- a/src/it/selector-conditions/pom.xml
+++ b/src/it/selector-conditions/pom.xml
@@ -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>
 
diff --git a/src/it/selector-scripts/pom.xml b/src/it/selector-scripts/pom.xml
index c3be520..206f5ac 100644
--- a/src/it/selector-scripts/pom.xml
+++ b/src/it/selector-scripts/pom.xml
@@ -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}/its</cloneProjectsTo>
           <debug>true</debug>
diff --git a/src/it/settings-auto-exclude/pom.xml b/src/it/settings-auto-exclude/pom.xml
index c3491c6..240402d 100644
--- a/src/it/settings-auto-exclude/pom.xml
+++ b/src/it/settings-auto-exclude/pom.xml
@@ -47,7 +47,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>
           <pomIncludes>
             <!-- intended to select all immediate sub directories but will also match the settings.xml -->
diff --git a/src/it/settings-inherit/pom.xml b/src/it/settings-inherit/pom.xml
index f979416..7f60df1 100644
--- a/src/it/settings-inherit/pom.xml
+++ b/src/it/settings-inherit/pom.xml
@@ -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>
diff --git a/src/it/settings-inherit/src/it/project/pom.xml b/src/it/settings-inherit/src/it/project/pom.xml
index 42a3f4c..5ad2dc6 100644
--- a/src/it/settings-inherit/src/it/project/pom.xml
+++ b/src/it/settings-inherit/src/it/project/pom.xml
@@ -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>
             <id>enforce-property</id>
diff --git a/src/it/settings-merge/pom.xml b/src/it/settings-merge/pom.xml
index 26df7c7..acf4864 100644
--- a/src/it/settings-merge/pom.xml
+++ b/src/it/settings-merge/pom.xml
@@ -32,7 +32,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>
diff --git a/src/it/settings-merge/src/it/project/pom.xml b/src/it/settings-merge/src/it/project/pom.xml
index 1058edb..5262cf3 100644
--- a/src/it/settings-merge/src/it/project/pom.xml
+++ b/src/it/settings-merge/src/it/project/pom.xml
@@ -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>
             <id>verify-properties</id>
diff --git a/src/it/settings-merge_jdk9+/pom.xml b/src/it/settings-merge_jdk9+/pom.xml
index 72ca04f..b7bb9e0 100644
--- a/src/it/settings-merge_jdk9+/pom.xml
+++ b/src/it/settings-merge_jdk9+/pom.xml
@@ -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>
diff --git a/src/it/settings-merge_jdk9+/src/it/project/pom.xml b/src/it/settings-merge_jdk9+/src/it/project/pom.xml
index f2ab455..9c67cce 100644
--- a/src/it/settings-merge_jdk9+/src/it/project/pom.xml
+++ b/src/it/settings-merge_jdk9+/src/it/project/pom.xml
@@ -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>
             <id>verify-properties</id>
@@ -64,7 +64,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>
             <id>effective-settings</id>
diff --git a/src/it/settings-override/pom.xml b/src/it/settings-override/pom.xml
index e5818e6..60cc800 100644
--- a/src/it/settings-override/pom.xml
+++ b/src/it/settings-override/pom.xml
@@ -32,7 +32,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>
diff --git a/src/it/settings-override/src/it/project/pom.xml b/src/it/settings-override/src/it/project/pom.xml
index 505aaea..d84fbfe 100644
--- a/src/it/settings-override/src/it/project/pom.xml
+++ b/src/it/settings-override/src/it/project/pom.xml
@@ -37,7 +37,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>verify-properties</id>
diff --git a/src/it/spaces-should-work_non-windows/pom.xml b/src/it/spaces-should-work_non-windows/pom.xml
index af9fbf0..d9858db 100644
--- a/src/it/spaces-should-work_non-windows/pom.xml
+++ b/src/it/spaces-should-work_non-windows/pom.xml
@@ -34,7 +34,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>
diff --git a/src/it/spaces-should-work_non-windows/src/it/minvoker-test/pom.xml b/src/it/spaces-should-work_non-windows/src/it/minvoker-test/pom.xml
index 2716f59..20b989a 100644
--- a/src/it/spaces-should-work_non-windows/src/it/minvoker-test/pom.xml
+++ b/src/it/spaces-should-work_non-windows/src/it/minvoker-test/pom.xml
@@ -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>
diff --git a/src/it/spaces-should-work_windows/pom.xml b/src/it/spaces-should-work_windows/pom.xml
index af9fbf0..d9858db 100644
--- a/src/it/spaces-should-work_windows/pom.xml
+++ b/src/it/spaces-should-work_windows/pom.xml
@@ -34,7 +34,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>
diff --git a/src/it/spaces-should-work_windows/src/it/minvoker-test/pom.xml b/src/it/spaces-should-work_windows/src/it/minvoker-test/pom.xml
index 2716f59..20b989a 100644
--- a/src/it/spaces-should-work_windows/src/it/minvoker-test/pom.xml
+++ b/src/it/spaces-should-work_windows/src/it/minvoker-test/pom.xml
@@ -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>
diff --git a/src/it/special-characters-should-work/pom.xml b/src/it/special-characters-should-work/pom.xml
index 6f61208..218c7c7 100644
--- a/src/it/special-characters-should-work/pom.xml
+++ b/src/it/special-characters-should-work/pom.xml
@@ -33,7 +33,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>
diff --git a/src/it/special-characters-should-work/src/it/minvoker-test/pom.xml b/src/it/special-characters-should-work/src/it/minvoker-test/pom.xml
index 2716f59..20b989a 100644
--- a/src/it/special-characters-should-work/src/it/minvoker-test/pom.xml
+++ b/src/it/special-characters-should-work/src/it/minvoker-test/pom.xml
@@ -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>
diff --git a/src/it/staging-dependencies-test-scope/pom.xml b/src/it/staging-dependencies-test-scope/pom.xml
index b130f77..8118f99 100644
--- a/src/it/staging-dependencies-test-scope/pom.xml
+++ b/src/it/staging-dependencies-test-scope/pom.xml
@@ -52,7 +52,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>
           <scope>test</scope>
diff --git a/src/it/staging-dependencies/pom.xml b/src/it/staging-dependencies/pom.xml
index 72e92ce..9f2c462 100644
--- a/src/it/staging-dependencies/pom.xml
+++ b/src/it/staging-dependencies/pom.xml
@@ -94,7 +94,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>
         </configuration>
diff --git a/src/it/staging-pom/pom.xml b/src/it/staging-pom/pom.xml
index e9582c6..db20423 100644
--- a/src/it/staging-pom/pom.xml
+++ b/src/it/staging-pom/pom.xml
@@ -47,7 +47,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>
         </configuration>
@@ -63,7 +63,7 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
-        <version>@sitePluginVersion@</version>
+        <version>@version.maven-site-plugin@</version>
       </plugin>
     </plugins>
   </build>
diff --git a/src/it/staging-reactor/mod1-parent/pom.xml b/src/it/staging-reactor/mod1-parent/pom.xml
index 7bfcffa..d961392 100644
--- a/src/it/staging-reactor/mod1-parent/pom.xml
+++ b/src/it/staging-reactor/mod1-parent/pom.xml
@@ -40,7 +40,7 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
-        <version>@sitePluginVersion@</version>
+        <version>@version.maven-site-plugin@</version>
       </plugin>
     </plugins>
   </build>
diff --git a/src/it/staging-reactor/mod2/pom.xml b/src/it/staging-reactor/mod2/pom.xml
index 38208b6..e6f4e67 100644
--- a/src/it/staging-reactor/mod2/pom.xml
+++ b/src/it/staging-reactor/mod2/pom.xml
@@ -44,7 +44,7 @@ under the License.
     <plugins>
       <plugin>
         <artifactId>maven-source-plugin</artifactId>
-        <version>@sourcePluginVersion@</version>
+        <version>@version.maven-source-plugin@</version>
         <executions>
           <execution>
             <id>attach-resources</id>
diff --git a/src/it/staging-reactor/mod3/pom.xml b/src/it/staging-reactor/mod3/pom.xml
index 13f90a1..3622d98 100644
--- a/src/it/staging-reactor/mod3/pom.xml
+++ b/src/it/staging-reactor/mod3/pom.xml
@@ -44,7 +44,7 @@ under the License.
     <plugins>
       <plugin>
         <artifactId>maven-source-plugin</artifactId>
-        <version>@sourcePluginVersion@</version>
+        <version>@version.maven-source-plugin@</version>
         <executions>
           <execution>
             <id>attach-resources</id>
diff --git a/src/it/staging-reactor/pom.xml b/src/it/staging-reactor/pom.xml
index 62ae2f3..4642012 100644
--- a/src/it/staging-reactor/pom.xml
+++ b/src/it/staging-reactor/pom.xml
@@ -46,7 +46,7 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
-        <version>@sitePluginVersion@</version>
+        <version>@version.maven-site-plugin@</version>
       </plugin>
     </plugins>
   </build>
diff --git a/src/it/updateOnly/pom.xml b/src/it/updateOnly/pom.xml
index 0b8d1f4..86be0b6 100644
--- a/src/it/updateOnly/pom.xml
+++ b/src/it/updateOnly/pom.xml
@@ -42,7 +42,7 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antrun-plugin</artifactId>
-        <version>@antrunPluginVersion@</version>
+        <version>@version.maven-antrun-plugin@</version>
         <executions>
           <execution>
             <phase>initialize</phase>