diff --git a/maven-plugin-plugin/pom.xml b/maven-plugin-plugin/pom.xml
index 35d9b4e52..fc3fbb3a9 100644
--- a/maven-plugin-plugin/pom.xml
+++ b/maven-plugin-plugin/pom.xml
@@ -35,7 +35,7 @@
     in order to include them the resulting JAR. It is also used to generate a generic help goal.</description>
 
   <prerequisites>
-    <maven>${mavenVersion}</maven>
+    <maven>${maven3Version}</maven>
   </prerequisites>
 
   <properties>
@@ -106,7 +106,7 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-repository-metadata</artifactId>
-      <version>${mavenVersion}</version>
+      <version>${maven3Version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/maven-plugin-plugin/src/it/annotation-with-inheritance-from-deps/pom.xml b/maven-plugin-plugin/src/it/annotation-with-inheritance-from-deps/pom.xml
index 7361a7b21..06955f92e 100644
--- a/maven-plugin-plugin/src/it/annotation-with-inheritance-from-deps/pom.xml
+++ b/maven-plugin-plugin/src/it/annotation-with-inheritance-from-deps/pom.xml
@@ -42,13 +42,13 @@ under the License.
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>@mavenVersion@</version>
+      <version>@maven3Version@</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-core</artifactId>
-      <version>@mavenVersion@</version>
+      <version>@maven3Version@</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/pom.xml b/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/pom.xml
index d47d1546a..b2a50dd3c 100644
--- a/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/pom.xml
+++ b/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/pom.xml
@@ -41,13 +41,13 @@ under the License.
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>@mavenVersion@</version>
+      <version>@maven3Version@</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-core</artifactId>
-      <version>@mavenVersion@</version>
+      <version>@maven3Version@</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/maven-plugin-plugin/src/it/annotation-with-inheritance/pom.xml b/maven-plugin-plugin/src/it/annotation-with-inheritance/pom.xml
index 08aa04afd..5a7e08b1f 100644
--- a/maven-plugin-plugin/src/it/annotation-with-inheritance/pom.xml
+++ b/maven-plugin-plugin/src/it/annotation-with-inheritance/pom.xml
@@ -42,13 +42,13 @@ under the License.
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>@mavenVersion@</version>
+      <version>@maven3Version@</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-core</artifactId>
-      <version>@mavenVersion@</version>
+      <version>@maven3Version@</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/maven-plugin-plugin/src/it/asm-failure/pom.xml b/maven-plugin-plugin/src/it/asm-failure/pom.xml
index ffe0213aa..7853e8647 100644
--- a/maven-plugin-plugin/src/it/asm-failure/pom.xml
+++ b/maven-plugin-plugin/src/it/asm-failure/pom.xml
@@ -53,7 +53,7 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>@mavenVersion@</version>
+      <version>@maven3Version@</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/maven-plugin-plugin/src/it/help-basic-deprecated-annotation-only/pom.xml b/maven-plugin-plugin/src/it/help-basic-deprecated-annotation-only/pom.xml
index 5b48429cd..27898da40 100644
--- a/maven-plugin-plugin/src/it/help-basic-deprecated-annotation-only/pom.xml
+++ b/maven-plugin-plugin/src/it/help-basic-deprecated-annotation-only/pom.xml
@@ -39,7 +39,7 @@ under the License.
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>@mavenVersion@</version>
+      <version>@maven3Version@</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/maven-plugin-plugin/src/it/help-basic-jdk11/pom.xml b/maven-plugin-plugin/src/it/help-basic-jdk11/pom.xml
index d24a6c8a5..18200dc23 100644
--- a/maven-plugin-plugin/src/it/help-basic-jdk11/pom.xml
+++ b/maven-plugin-plugin/src/it/help-basic-jdk11/pom.xml
@@ -39,7 +39,7 @@ under the License.
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>@mavenVersion@</version>
+      <version>@maven3Version@</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/maven-plugin-plugin/src/it/help-basic/pom.xml b/maven-plugin-plugin/src/it/help-basic/pom.xml
index b964ad6d2..9759321df 100644
--- a/maven-plugin-plugin/src/it/help-basic/pom.xml
+++ b/maven-plugin-plugin/src/it/help-basic/pom.xml
@@ -39,7 +39,7 @@ under the License.
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>@mavenVersion@</version>
+      <version>@maven3Version@</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/maven-plugin-plugin/src/it/help-package/pom.xml b/maven-plugin-plugin/src/it/help-package/pom.xml
index 193af71f4..64848176e 100644
--- a/maven-plugin-plugin/src/it/help-package/pom.xml
+++ b/maven-plugin-plugin/src/it/help-package/pom.xml
@@ -39,7 +39,7 @@ under the License.
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>@mavenVersion@</version>
+      <version>@maven3Version@</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
diff --git a/maven-plugin-plugin/src/it/java-basic-annotations-jdk8/pom.xml b/maven-plugin-plugin/src/it/java-basic-annotations-jdk8/pom.xml
index 2d69b01c0..7a00d1c9f 100644
--- a/maven-plugin-plugin/src/it/java-basic-annotations-jdk8/pom.xml
+++ b/maven-plugin-plugin/src/it/java-basic-annotations-jdk8/pom.xml
@@ -46,13 +46,13 @@ under the License.
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>@mavenVersion@</version>
+      <version>@maven3Version@</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-core</artifactId>
-      <version>@mavenVersion@</version>
+      <version>@maven3Version@</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/maven-plugin-plugin/src/it/java-basic-annotations-jdkcurrent/pom.xml b/maven-plugin-plugin/src/it/java-basic-annotations-jdkcurrent/pom.xml
index 60f728af3..379bbbeea 100644
--- a/maven-plugin-plugin/src/it/java-basic-annotations-jdkcurrent/pom.xml
+++ b/maven-plugin-plugin/src/it/java-basic-annotations-jdkcurrent/pom.xml
@@ -42,13 +42,13 @@ under the License.
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>@mavenVersion@</version>
+      <version>@maven3Version@</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-core</artifactId>
-      <version>@mavenVersion@</version>
+      <version>@maven3Version@</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/maven-plugin-plugin/src/it/java-basic-annotations/pom.xml b/maven-plugin-plugin/src/it/java-basic-annotations/pom.xml
index a30a4ddb9..70868c9a4 100644
--- a/maven-plugin-plugin/src/it/java-basic-annotations/pom.xml
+++ b/maven-plugin-plugin/src/it/java-basic-annotations/pom.xml
@@ -42,13 +42,13 @@ under the License.
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>@mavenVersion@</version>
+      <version>@maven3Version@</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-core</artifactId>
-      <version>@mavenVersion@</version>
+      <version>@maven3Version@</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/maven-plugin-plugin/src/it/java-basic/pom.xml b/maven-plugin-plugin/src/it/java-basic/pom.xml
index 11a0edc24..e948c448a 100644
--- a/maven-plugin-plugin/src/it/java-basic/pom.xml
+++ b/maven-plugin-plugin/src/it/java-basic/pom.xml
@@ -42,13 +42,13 @@ under the License.
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>@mavenVersion@</version>
+      <version>@maven3Version@</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-core</artifactId>
-      <version>@mavenVersion@</version>
+      <version>@maven3Version@</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
diff --git a/maven-plugin-plugin/src/it/mplugin-223/pom.xml b/maven-plugin-plugin/src/it/mplugin-223/pom.xml
index 3c59fbc1a..e0b942dd6 100644
--- a/maven-plugin-plugin/src/it/mplugin-223/pom.xml
+++ b/maven-plugin-plugin/src/it/mplugin-223/pom.xml
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>@mavenVersion@</version>
+      <version>@maven3Version@</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/maven-plugin-plugin/src/it/mplugin-272_java8/pom.xml b/maven-plugin-plugin/src/it/mplugin-272_java8/pom.xml
index a6b042896..e499dde4a 100644
--- a/maven-plugin-plugin/src/it/mplugin-272_java8/pom.xml
+++ b/maven-plugin-plugin/src/it/mplugin-272_java8/pom.xml
@@ -31,7 +31,7 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>@mavenVersion@</version>
+      <version>@maven3Version@</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/maven-plugin-plugin/src/it/mplugin-299_no-configuration/pom.xml b/maven-plugin-plugin/src/it/mplugin-299_no-configuration/pom.xml
index 6c3ea2945..58a327cfb 100644
--- a/maven-plugin-plugin/src/it/mplugin-299_no-configuration/pom.xml
+++ b/maven-plugin-plugin/src/it/mplugin-299_no-configuration/pom.xml
@@ -39,7 +39,7 @@ under the License.
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>@mavenVersion@</version>
+      <version>@maven3Version@</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/maven-plugin-plugin/src/it/mplugin-305_defaultMojoDependencies/pom.xml b/maven-plugin-plugin/src/it/mplugin-305_defaultMojoDependencies/pom.xml
index 60d1c48bf..cc050563b 100644
--- a/maven-plugin-plugin/src/it/mplugin-305_defaultMojoDependencies/pom.xml
+++ b/maven-plugin-plugin/src/it/mplugin-305_defaultMojoDependencies/pom.xml
@@ -36,7 +36,7 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>@mavenVersion@</version>
+      <version>@maven3Version@</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/maven-plugin-plugin/src/it/mplugin-305_emptyMojoDependencies/pom.xml b/maven-plugin-plugin/src/it/mplugin-305_emptyMojoDependencies/pom.xml
index a5363a2e0..2396917b9 100644
--- a/maven-plugin-plugin/src/it/mplugin-305_emptyMojoDependencies/pom.xml
+++ b/maven-plugin-plugin/src/it/mplugin-305_emptyMojoDependencies/pom.xml
@@ -36,7 +36,7 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>@mavenVersion@</version>
+      <version>@maven3Version@</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/maven-plugin-plugin/src/it/mplugin-305_singleMojoDependencies/pom.xml b/maven-plugin-plugin/src/it/mplugin-305_singleMojoDependencies/pom.xml
index dea284dcf..9a55ca8af 100644
--- a/maven-plugin-plugin/src/it/mplugin-305_singleMojoDependencies/pom.xml
+++ b/maven-plugin-plugin/src/it/mplugin-305_singleMojoDependencies/pom.xml
@@ -36,7 +36,7 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>@mavenVersion@</version>
+      <version>@maven3Version@</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/maven-plugin-plugin/src/it/mplugin-324_javadoc/pom.xml b/maven-plugin-plugin/src/it/mplugin-324_javadoc/pom.xml
index 389d7b071..a8cdb8fb1 100644
--- a/maven-plugin-plugin/src/it/mplugin-324_javadoc/pom.xml
+++ b/maven-plugin-plugin/src/it/mplugin-324_javadoc/pom.xml
@@ -39,7 +39,7 @@ under the License.
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>@mavenVersion@</version>
+      <version>@maven3Version@</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/maven-plugin-plugin/src/it/mplugin-363_help-reproducible/pom.xml b/maven-plugin-plugin/src/it/mplugin-363_help-reproducible/pom.xml
index 6759ca18d..4d1778343 100644
--- a/maven-plugin-plugin/src/it/mplugin-363_help-reproducible/pom.xml
+++ b/maven-plugin-plugin/src/it/mplugin-363_help-reproducible/pom.xml
@@ -39,7 +39,7 @@ under the License.
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>@mavenVersion@</version>
+      <version>@maven3Version@</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/maven-plugin-plugin/src/it/mplugin-370-maven-deps-scope-bad/pom.xml b/maven-plugin-plugin/src/it/mplugin-370-maven-deps-scope-bad/pom.xml
index 517fa0177..3c286168d 100644
--- a/maven-plugin-plugin/src/it/mplugin-370-maven-deps-scope-bad/pom.xml
+++ b/maven-plugin-plugin/src/it/mplugin-370-maven-deps-scope-bad/pom.xml
@@ -41,7 +41,7 @@ under the License.
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>@mavenVersion@</version>
+      <version>@maven3Version@</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff --git a/maven-plugin-plugin/src/it/mplugin-370-maven-deps-scope-good/pom.xml b/maven-plugin-plugin/src/it/mplugin-370-maven-deps-scope-good/pom.xml
index 599488a52..ed11c5a91 100644
--- a/maven-plugin-plugin/src/it/mplugin-370-maven-deps-scope-good/pom.xml
+++ b/maven-plugin-plugin/src/it/mplugin-370-maven-deps-scope-good/pom.xml
@@ -47,7 +47,7 @@ under the License.
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>@mavenVersion@</version>
+      <version>@maven3Version@</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/maven-plugin-plugin/src/it/mplugin-372-annotation-with-inheritance-from-provided-deps/pom.xml b/maven-plugin-plugin/src/it/mplugin-372-annotation-with-inheritance-from-provided-deps/pom.xml
index 502732187..4cf223916 100644
--- a/maven-plugin-plugin/src/it/mplugin-372-annotation-with-inheritance-from-provided-deps/pom.xml
+++ b/maven-plugin-plugin/src/it/mplugin-372-annotation-with-inheritance-from-provided-deps/pom.xml
@@ -42,13 +42,13 @@ under the License.
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>@mavenVersion@</version>
+      <version>@maven3Version@</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-core</artifactId>
-      <version>@mavenVersion@</version>
+      <version>@maven3Version@</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/maven-plugin-plugin/src/it/mplugin-382-exclude-provided-dependency/pom.xml b/maven-plugin-plugin/src/it/mplugin-382-exclude-provided-dependency/pom.xml
index 7ec23225a..3aa462bc3 100644
--- a/maven-plugin-plugin/src/it/mplugin-382-exclude-provided-dependency/pom.xml
+++ b/maven-plugin-plugin/src/it/mplugin-382-exclude-provided-dependency/pom.xml
@@ -40,7 +40,7 @@ under the License.
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>@mavenVersion@</version>
+      <version>@maven3Version@</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/maven-plugin-plugin/src/it/mplugin-390/pom.xml b/maven-plugin-plugin/src/it/mplugin-390/pom.xml
index bb0aeccbe..9ffd6fe50 100644
--- a/maven-plugin-plugin/src/it/mplugin-390/pom.xml
+++ b/maven-plugin-plugin/src/it/mplugin-390/pom.xml
@@ -40,7 +40,7 @@ under the License.
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>@mavenVersion@</version>
+      <version>@maven3Version@</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/maven-plugin-plugin/src/it/packaging-jar/pom.xml b/maven-plugin-plugin/src/it/packaging-jar/pom.xml
index 174467dc8..84538dec5 100644
--- a/maven-plugin-plugin/src/it/packaging-jar/pom.xml
+++ b/maven-plugin-plugin/src/it/packaging-jar/pom.xml
@@ -41,7 +41,7 @@ under the License.
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>@mavenVersion@</version>
+      <version>@maven3Version@</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/maven-plugin-plugin/src/it/skip/pom.xml b/maven-plugin-plugin/src/it/skip/pom.xml
index aae11e5e8..6fae0911c 100644
--- a/maven-plugin-plugin/src/it/skip/pom.xml
+++ b/maven-plugin-plugin/src/it/skip/pom.xml
@@ -40,7 +40,7 @@ under the License.
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>@mavenVersion@</version>
+      <version>@maven3Version@</version>
     </dependency>
   </dependencies>
 
diff --git a/maven-plugin-plugin/src/it/source-encoding/latin-1/pom.xml b/maven-plugin-plugin/src/it/source-encoding/latin-1/pom.xml
index 7775a2f07..80decef10 100644
--- a/maven-plugin-plugin/src/it/source-encoding/latin-1/pom.xml
+++ b/maven-plugin-plugin/src/it/source-encoding/latin-1/pom.xml
@@ -40,7 +40,7 @@ under the License.
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>@mavenVersion@</version>
+      <version>@maven3Version@</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
diff --git a/maven-plugin-plugin/src/it/source-encoding/utf-8/pom.xml b/maven-plugin-plugin/src/it/source-encoding/utf-8/pom.xml
index 015c2d94c..261567dbc 100644
--- a/maven-plugin-plugin/src/it/source-encoding/utf-8/pom.xml
+++ b/maven-plugin-plugin/src/it/source-encoding/utf-8/pom.xml
@@ -40,7 +40,7 @@ under the License.
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>@mavenVersion@</version>
+      <version>@maven3Version@</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
diff --git a/maven-plugin-report-plugin/pom.xml b/maven-plugin-report-plugin/pom.xml
index 722641076..fc779668b 100644
--- a/maven-plugin-report-plugin/pom.xml
+++ b/maven-plugin-report-plugin/pom.xml
@@ -34,7 +34,7 @@
   <description>The Plugin Report Plugin is used to create reports about the plugin being built.</description>
 
   <prerequisites>
-    <maven>${mavenVersion}</maven>
+    <maven>${maven3Version}</maven>
   </prerequisites>
 
   <properties>
diff --git a/maven-plugin-report-plugin/src/it/fix-maven-since-3.x/antsample-maven-plugin/pom.xml b/maven-plugin-report-plugin/src/it/fix-maven-since-3.x/antsample-maven-plugin/pom.xml
index be4bb174e..a529d616c 100644
--- a/maven-plugin-report-plugin/src/it/fix-maven-since-3.x/antsample-maven-plugin/pom.xml
+++ b/maven-plugin-report-plugin/src/it/fix-maven-since-3.x/antsample-maven-plugin/pom.xml
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>@mavenVersion@</version>
+      <version>@maven3Version@</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
diff --git a/maven-plugin-report-plugin/src/it/fix-maven-since-3.x/javasample-maven-plugin/pom.xml b/maven-plugin-report-plugin/src/it/fix-maven-since-3.x/javasample-maven-plugin/pom.xml
index bb3e1779f..99a0b8e7f 100644
--- a/maven-plugin-report-plugin/src/it/fix-maven-since-3.x/javasample-maven-plugin/pom.xml
+++ b/maven-plugin-report-plugin/src/it/fix-maven-since-3.x/javasample-maven-plugin/pom.xml
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>@mavenVersion@</version>
+      <version>@maven3Version@</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
diff --git a/maven-plugin-report-plugin/src/it/mplugin-191/pom.xml b/maven-plugin-report-plugin/src/it/mplugin-191/pom.xml
index 0e870e7a1..f060f2d63 100644
--- a/maven-plugin-report-plugin/src/it/mplugin-191/pom.xml
+++ b/maven-plugin-report-plugin/src/it/mplugin-191/pom.xml
@@ -43,7 +43,7 @@ under the License.
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>@mavenVersion@</version>
+      <version>@maven3Version@</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
diff --git a/maven-plugin-report-plugin/src/it/mplugin-319_report-since/pom.xml b/maven-plugin-report-plugin/src/it/mplugin-319_report-since/pom.xml
index d3a7eb7a2..922537674 100644
--- a/maven-plugin-report-plugin/src/it/mplugin-319_report-since/pom.xml
+++ b/maven-plugin-report-plugin/src/it/mplugin-319_report-since/pom.xml
@@ -36,7 +36,7 @@ under the License.
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>@mavenVersion@</version>
+      <version>@maven3Version@</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
diff --git a/maven-plugin-report-plugin/src/it/mplugin-394_report-encoding/pom.xml b/maven-plugin-report-plugin/src/it/mplugin-394_report-encoding/pom.xml
index a2edf9955..71b280838 100644
--- a/maven-plugin-report-plugin/src/it/mplugin-394_report-encoding/pom.xml
+++ b/maven-plugin-report-plugin/src/it/mplugin-394_report-encoding/pom.xml
@@ -43,7 +43,7 @@ under the License.
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>@mavenVersion@</version>
+      <version>@maven3Version@</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/maven-plugin-report-plugin/src/it/plugin-info-jdk-default-version/pom.xml b/maven-plugin-report-plugin/src/it/plugin-info-jdk-default-version/pom.xml
index 9789d6508..7ef059ac5 100644
--- a/maven-plugin-report-plugin/src/it/plugin-info-jdk-default-version/pom.xml
+++ b/maven-plugin-report-plugin/src/it/plugin-info-jdk-default-version/pom.xml
@@ -36,7 +36,7 @@ under the License.
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>@mavenVersion@</version>
+      <version>@maven3Version@</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
diff --git a/maven-plugin-report-plugin/src/it/plugin-info-jdk/pom.xml b/maven-plugin-report-plugin/src/it/plugin-info-jdk/pom.xml
index 20130c55d..4772fd3da 100644
--- a/maven-plugin-report-plugin/src/it/plugin-info-jdk/pom.xml
+++ b/maven-plugin-report-plugin/src/it/plugin-info-jdk/pom.xml
@@ -36,7 +36,7 @@ under the License.
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>@mavenVersion@</version>
+      <version>@maven3Version@</version>
     </dependency>
   </dependencies>
 
diff --git a/maven-plugin-report-plugin/src/it/plugin-report-annotations/pom.xml b/maven-plugin-report-plugin/src/it/plugin-report-annotations/pom.xml
index 0c5087a51..864caed1f 100644
--- a/maven-plugin-report-plugin/src/it/plugin-report-annotations/pom.xml
+++ b/maven-plugin-report-plugin/src/it/plugin-report-annotations/pom.xml
@@ -40,19 +40,19 @@ under the License.
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>@mavenVersion@</version>
+      <version>@maven3Version@</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-artifact</artifactId>
-      <version>@mavenVersion@</version>
+      <version>@maven3Version@</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-core</artifactId>
-      <version>@mavenVersion@</version>
+      <version>@maven3Version@</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/maven-plugin-report-plugin/src/it/plugin-report-detect-requirements-history/pom.xml b/maven-plugin-report-plugin/src/it/plugin-report-detect-requirements-history/pom.xml
index a032447e3..51b08ae90 100644
--- a/maven-plugin-report-plugin/src/it/plugin-report-detect-requirements-history/pom.xml
+++ b/maven-plugin-report-plugin/src/it/plugin-report-detect-requirements-history/pom.xml
@@ -41,7 +41,7 @@ under the License.
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>@mavenVersion@</version>
+      <version>@maven3Version@</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/maven-plugin-report-plugin/src/it/plugin-report-requirements-history/pom.xml b/maven-plugin-report-plugin/src/it/plugin-report-requirements-history/pom.xml
index 88bba2a8c..b0082ccb9 100644
--- a/maven-plugin-report-plugin/src/it/plugin-report-requirements-history/pom.xml
+++ b/maven-plugin-report-plugin/src/it/plugin-report-requirements-history/pom.xml
@@ -41,7 +41,7 @@ under the License.
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>@mavenVersion@</version>
+      <version>@maven3Version@</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/maven-plugin-report-plugin/src/it/plugin-report-with-javadoc-links/pom.xml b/maven-plugin-report-plugin/src/it/plugin-report-with-javadoc-links/pom.xml
index 11f88cfb6..439d392fb 100644
--- a/maven-plugin-report-plugin/src/it/plugin-report-with-javadoc-links/pom.xml
+++ b/maven-plugin-report-plugin/src/it/plugin-report-with-javadoc-links/pom.xml
@@ -39,7 +39,7 @@ under the License.
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>@mavenVersion@</version>
+      <version>@maven3Version@</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -51,13 +51,13 @@ under the License.
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-artifact</artifactId>
-      <version>@mavenVersion@</version>
+      <version>@maven3Version@</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-core</artifactId>
-      <version>@mavenVersion@</version>
+      <version>@maven3Version@</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/maven-plugin-report-plugin/src/it/plugin-report/pom.xml b/maven-plugin-report-plugin/src/it/plugin-report/pom.xml
index 43f0afd73..ae23b4892 100644
--- a/maven-plugin-report-plugin/src/it/plugin-report/pom.xml
+++ b/maven-plugin-report-plugin/src/it/plugin-report/pom.xml
@@ -42,19 +42,19 @@ under the License.
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>@mavenVersion@</version>
+      <version>@maven3Version@</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-artifact</artifactId>
-      <version>@mavenVersion@</version>
+      <version>@maven3Version@</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-core</artifactId>
-      <version>@mavenVersion@</version>
+      <version>@maven3Version@</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/pom.xml b/pom.xml
index 54a0e83ef..96efaaf74 100644
--- a/pom.xml
+++ b/pom.xml
@@ -93,7 +93,7 @@
     <javaVersion>8</javaVersion>
     <pluginTestingHarnessVersion>3.3.0</pluginTestingHarnessVersion>
     <maven4Version>4.0.0-alpha-4</maven4Version>
-    <mavenVersion>3.2.5</mavenVersion>
+    <maven3Version>3.2.5</maven3Version>
     <slf4jVersion>1.7.36</slf4jVersion>
     <antVersion>1.10.14</antVersion>
     <maven.site.path>plugin-tools-archives/plugin-tools-LATEST</maven.site.path>
@@ -161,27 +161,27 @@
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-model</artifactId>
-        <version>${mavenVersion}</version>
+        <version>${maven3Version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-plugin-api</artifactId>
-        <version>${mavenVersion}</version>
+        <version>${maven3Version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-core</artifactId>
-        <version>${mavenVersion}</version>
+        <version>${maven3Version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-artifact</artifactId>
-        <version>${mavenVersion}</version>
+        <version>${maven3Version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-settings</artifactId>
-        <version>${mavenVersion}</version>
+        <version>${maven3Version}</version>
       </dependency>
       <!-- shared -->
       <dependency>