diff --git a/maven-enforcer-plugin/src/it/projects/MENFORCER-306/parent/pom.xml b/maven-enforcer-plugin/src/it/projects/MENFORCER-306/parent/pom.xml
index cdfd4c28..2cded366 100644
--- a/maven-enforcer-plugin/src/it/projects/MENFORCER-306/parent/pom.xml
+++ b/maven-enforcer-plugin/src/it/projects/MENFORCER-306/parent/pom.xml
@@ -55,52 +55,52 @@ under the License.
org.apache.maven.plugins
maven-clean-plugin
- 3.1.0
+ @version.maven-clean-plugin@
org.apache.maven.plugins
maven-install-plugin
- 2.5.2
+ @version.maven-install-plugin@
org.apache.maven.plugins
maven-site-plugin
- 3.7.1
+ @version.maven-site-plugin@
org.apache.maven.plugins
maven-deploy-plugin
- 2.8.2
+ @version.maven-deploy-plugin@
org.apache.maven.plugins
maven-compiler-plugin
- 3.7.0
+ @version.maven-compiler-plugin@
org.apache.maven.plugins
maven-plugin-plugin
- 3.5.2
+ @version.maven-plugin-tools@
org.apache.maven.plugins
maven-surefire-plugin
- 2.21.0
+ @version.maven-surefire@
org.apache.maven.plugins
maven-jar-plugin
- 3.1.0
+ @version.maven-jar-plugin@
org.apache.maven.plugins
maven-resources-plugin
- 3.1.0
+ @version.maven-resources-plugin@
org.apache.maven.plugins
maven-wrapper-plugin
- 3.0.1
+ @version.maven-wrapper-plugin@
diff --git a/maven-enforcer-plugin/src/it/projects/require-plugin-versions-expressions/pom.xml b/maven-enforcer-plugin/src/it/projects/require-plugin-versions-expressions/pom.xml
index 487b348b..60710f0c 100644
--- a/maven-enforcer-plugin/src/it/projects/require-plugin-versions-expressions/pom.xml
+++ b/maven-enforcer-plugin/src/it/projects/require-plugin-versions-expressions/pom.xml
@@ -36,47 +36,47 @@
org.apache.maven.plugins
maven-clean-plugin
- 2.5
+ @version.maven-clean-plugin@
org.apache.maven.plugins
maven-resources-plugin
- 2.6
+ @version.maven-resources-plugin@
org.apache.maven.plugins
maven-compiler-plugin
- 2.5.1
+ @version.maven-compiler-plugin@
org.apache.maven.plugins
maven-surefire-plugin
- 2.12.4
+ @version.maven-surefire@
org.apache.maven.plugins
maven-jar-plugin
- 2.4
+ @version.maven-jar-plugin@
org.apache.maven.plugins
maven-install-plugin
- 2.4
+ @version.maven-install-plugin@
org.apache.maven.plugins
maven-deploy-plugin
- 2.7
+ @version.maven-deploy-plugin@
org.apache.maven.plugins
maven-site-plugin
- 3.2
+ @version.maven-site-plugin@
org.apache.maven.plugins
maven-wrapper-plugin
- 3.0.1
+ @version.maven-wrapper-plugin@
${expressionplugin.groupId}
diff --git a/maven-enforcer-plugin/src/it/projects/require-plugin-versions-expressions2/module1/pom.xml b/maven-enforcer-plugin/src/it/projects/require-plugin-versions-expressions2/module1/pom.xml
index 8f124fe9..4f2857d0 100644
--- a/maven-enforcer-plugin/src/it/projects/require-plugin-versions-expressions2/module1/pom.xml
+++ b/maven-enforcer-plugin/src/it/projects/require-plugin-versions-expressions2/module1/pom.xml
@@ -35,9 +35,6 @@
1.8
1.8
- 3.1.1
- 3.13.0
- 3.0.0-M4
@@ -46,27 +43,27 @@
org.apache.maven.plugins
maven-antrun-plugin
- ${maven.antrun.plugin.version}
+ @version.maven-antrun-plugin@
org.apache.maven.plugins
maven-checkstyle-plugin
- ${checkstyle.plugin.version}
+ @version.maven-checkstyle-plugin@
org.apache.maven.plugins
maven-failsafe-plugin
- ${surefire.version}
+ @version.maven-surefire@
org.apache.maven.plugins
maven-pmd-plugin
- ${pmd.plugin.version}
+ @version.maven-pmd-plugin@
org.apache.maven.plugins
maven-surefire-plugin
- ${surefire.version}
+ @version.maven-surefire@
diff --git a/maven-enforcer-plugin/src/it/projects/require-plugin-versions-expressions2/pom.xml b/maven-enforcer-plugin/src/it/projects/require-plugin-versions-expressions2/pom.xml
index c4a0c350..1c806464 100644
--- a/maven-enforcer-plugin/src/it/projects/require-plugin-versions-expressions2/pom.xml
+++ b/maven-enforcer-plugin/src/it/projects/require-plugin-versions-expressions2/pom.xml
@@ -37,7 +37,6 @@
UTF-8
UTF-8
- 3.0.0
@@ -46,57 +45,57 @@
org.apache.maven.plugins
maven-clean-plugin
- 3.1.0
+ @version.maven-clean-plugin@
org.apache.maven.plugins
maven-compiler-plugin
- 3.8.1
+ @version.maven-compiler-plugin@
org.apache.maven.plugins
maven-dependency-plugin
- 3.1.2
+ @version.maven-dependency-plugin@
org.apache.maven.plugins
maven-deploy-plugin
- 3.0.0-M1
+ @version.maven-deploy-plugin@
org.apache.maven.plugins
maven-enforcer-plugin
- 3.0.0-M3
+ @project.version@
org.apache.maven.plugins
maven-install-plugin
- 3.0.0-M1
+ @version.maven-install-plugin@
org.apache.maven.plugins
maven-jar-plugin
- 3.2.0
+ @version.maven-jar-plugin@
org.apache.maven.plugins
maven-project-info-reports-plugin
- 3.1.0
+ @version.maven-project-info-reports-plugin@
org.apache.maven.plugins
maven-release-plugin
- 3.0.0-M1
+ @version.maven-release-plugin@
org.apache.maven.plugins
maven-site-plugin
- 3.9.1
+ @version.maven-site-plugin@
org.apache.maven.plugins
maven-wrapper-plugin
- 3.0.1
+ @version.maven-wrapper-plugin@
diff --git a/maven-enforcer-plugin/src/it/projects/require-plugin-versions-mm-ci-friendly/pom.xml b/maven-enforcer-plugin/src/it/projects/require-plugin-versions-mm-ci-friendly/pom.xml
index 90507997..3b95ee9e 100644
--- a/maven-enforcer-plugin/src/it/projects/require-plugin-versions-mm-ci-friendly/pom.xml
+++ b/maven-enforcer-plugin/src/it/projects/require-plugin-versions-mm-ci-friendly/pom.xml
@@ -40,47 +40,47 @@ under the License.
org.apache.maven.plugins
maven-clean-plugin
- 2.5
+ @version.maven-clean-plugin@
org.apache.maven.plugins
maven-resources-plugin
- 2.6
+ @version.maven-resources-plugin@
org.apache.maven.plugins
maven-compiler-plugin
- 2.5.1
+ @version.maven-compiler-plugin@
org.apache.maven.plugins
maven-surefire-plugin
- 2.12.4
+ @version.maven-surefire@
org.apache.maven.plugins
maven-jar-plugin
- 2.4
+ @version.maven-jar-plugin@
org.apache.maven.plugins
maven-install-plugin
- 2.4
+ @version.maven-install-plugin@
org.apache.maven.plugins
maven-deploy-plugin
- 2.7
+ @version.maven-deploy-plugin@
org.apache.maven.plugins
maven-site-plugin
- 3.2
+ @version.maven-site-plugin@
org.apache.maven.plugins
maven-wrapper-plugin
- 3.0.1
+ @version.maven-wrapper-plugin@
org.apache.maven.plugins
diff --git a/maven-enforcer-plugin/src/it/projects/require-plugin-versions-plugin-with-integration-test-lifecycle/pom.xml b/maven-enforcer-plugin/src/it/projects/require-plugin-versions-plugin-with-integration-test-lifecycle/pom.xml
index e114db2a..9f13b5c2 100644
--- a/maven-enforcer-plugin/src/it/projects/require-plugin-versions-plugin-with-integration-test-lifecycle/pom.xml
+++ b/maven-enforcer-plugin/src/it/projects/require-plugin-versions-plugin-with-integration-test-lifecycle/pom.xml
@@ -88,7 +88,7 @@
maven-resources-plugin
- 2.4.3
+ @version.maven-resources-plugin@
diff --git a/maven-enforcer-plugin/src/it/projects/require-plugin-versions-projectGAVexpressions/pom.xml b/maven-enforcer-plugin/src/it/projects/require-plugin-versions-projectGAVexpressions/pom.xml
index 757f7f76..8a1de402 100644
--- a/maven-enforcer-plugin/src/it/projects/require-plugin-versions-projectGAVexpressions/pom.xml
+++ b/maven-enforcer-plugin/src/it/projects/require-plugin-versions-projectGAVexpressions/pom.xml
@@ -36,47 +36,47 @@
org.apache.maven.plugins
maven-clean-plugin
- 2.5
+ @version.maven-clean-plugin@
org.apache.maven.plugins
maven-resources-plugin
- 2.6
+ @version.maven-resources-plugin@
org.apache.maven.plugins
maven-compiler-plugin
- 2.5.1
+ @version.maven-compiler-plugin@
org.apache.maven.plugins
maven-surefire-plugin
- 2.12.4
+ @version.maven-surefire@
org.apache.maven.plugins
maven-jar-plugin
- 2.4
+ @version.maven-jar-plugin@
org.apache.maven.plugins
maven-install-plugin
- 2.4
+ @version.maven-install-plugin@
org.apache.maven.plugins
maven-deploy-plugin
- 2.7
+ @version.maven-deploy-plugin@
org.apache.maven.plugins
maven-site-plugin
- 3.2
+ @version.maven-site-plugin@
org.apache.maven.plugins
maven-wrapper-plugin
- 3.0.1
+ @version.maven-wrapper-plugin@
diff --git a/maven-enforcer-plugin/src/it/projects/require-same-versions_with-dependencies-failure/pom.xml b/maven-enforcer-plugin/src/it/projects/require-same-versions_with-dependencies-failure/pom.xml
index 7550644f..7d57af38 100644
--- a/maven-enforcer-plugin/src/it/projects/require-same-versions_with-dependencies-failure/pom.xml
+++ b/maven-enforcer-plugin/src/it/projects/require-same-versions_with-dependencies-failure/pom.xml
@@ -54,12 +54,12 @@
org.apache.maven.plugins
maven-surefire-plugin
- 2.14
+ @version.maven-surefire@
org.apache.maven.plugins
maven-failsafe-plugin
- 2.14
+ @version.maven-surefire@
@@ -82,7 +82,7 @@
org.apache.maven.plugins
maven-surefire-report-plugin
- 2.14
+ @version.maven-surefire@
diff --git a/pom.xml b/pom.xml
index d1803f88..62a279a2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
org.apache.maven
maven-parent
- 39
+ 40
org.apache.maven.enforcer
@@ -84,6 +84,11 @@
2023-04-01T21:03:41Z
1.0.0.v20140518
+
+
+ 3.3.0
+ 3.21.0
+ 3.2.0
@@ -203,12 +208,6 @@
-
-
- org.apache.maven.plugins
- maven-invoker-plugin
- 3.5.1
-
org.apache.maven.plugins
maven-site-plugin