diff --git a/src/it/MCOMPILER-170/invoker.properties b/src/it/MCOMPILER-170/invoker.properties
index 9f346f93..868a2586 100644
--- a/src/it/MCOMPILER-170/invoker.properties
+++ b/src/it/MCOMPILER-170/invoker.properties
@@ -16,4 +16,3 @@
# under the License.
invoker.goals = clean compile -T4
-invoker.maven.version = 3.0+
diff --git a/src/it/MCOMPILER-275_separate-moduleinfo/invoker.properties b/src/it/MCOMPILER-275_separate-moduleinfo/invoker.properties
index 66f3f58e..028c62b2 100644
--- a/src/it/MCOMPILER-275_separate-moduleinfo/invoker.properties
+++ b/src/it/MCOMPILER-275_separate-moduleinfo/invoker.properties
@@ -17,5 +17,3 @@
invoker.java.version = 1.8+
invoker.toolchain.jdk.version=1.9
-# Due to toolchain support
-invoker.maven.version = 3.3.1+
\ No newline at end of file
diff --git a/src/it/MCOMPILER-298/invoker.properties b/src/it/MCOMPILER-298/invoker.properties
index 928055c1..b1a04637 100644
--- a/src/it/MCOMPILER-298/invoker.properties
+++ b/src/it/MCOMPILER-298/invoker.properties
@@ -15,5 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-invoker.java.version = 1.8+
invoker.goals = test
diff --git a/src/it/MCOMPILER-525/pom.xml b/src/it/MCOMPILER-525/pom.xml
index 48de91e9..ce4080ea 100644
--- a/src/it/MCOMPILER-525/pom.xml
+++ b/src/it/MCOMPILER-525/pom.xml
@@ -35,12 +35,12 @@
org.apache.maven.plugins
maven-jar-plugin
- 3.3.0
+ @version.maven-jar-plugin@
org.apache.maven.plugins
maven-antrun-plugin
- 3.1.0
+ @version.maven-antrun-plugin@
touch
diff --git a/src/it/mcompiler-120/invoker.properties b/src/it/mcompiler-120/invoker.properties
index 86f9130c..98a8e954 100644
--- a/src/it/mcompiler-120/invoker.properties
+++ b/src/it/mcompiler-120/invoker.properties
@@ -17,4 +17,3 @@
invoker.goals = clean compile
invoker.buildResult = failure
-invoker.java.version = 1.6+
diff --git a/src/it/multirelease-patterns/multimodule/multirelease/pom.xml b/src/it/multirelease-patterns/multimodule/multirelease/pom.xml
index 220864cd..d7af7c80 100644
--- a/src/it/multirelease-patterns/multimodule/multirelease/pom.xml
+++ b/src/it/multirelease-patterns/multimodule/multirelease/pom.xml
@@ -35,7 +35,7 @@
maven-assembly-plugin
- 3.1.0
+ @version.maven-assembly-plugin@
false
diff --git a/src/it/multirelease-patterns/multimodule/pom.xml b/src/it/multirelease-patterns/multimodule/pom.xml
index bf411e67..b4e48129 100644
--- a/src/it/multirelease-patterns/multimodule/pom.xml
+++ b/src/it/multirelease-patterns/multimodule/pom.xml
@@ -39,7 +39,7 @@
org.apache.maven.plugins
maven-surefire-plugin
- 2.21.0
+ @version.maven-surefire@
diff --git a/src/it/multirelease-patterns/multiproject/multirelease-base/pom.xml b/src/it/multirelease-patterns/multiproject/multirelease-base/pom.xml
index fbf2bcb0..6c5ad95b 100644
--- a/src/it/multirelease-patterns/multiproject/multirelease-base/pom.xml
+++ b/src/it/multirelease-patterns/multiproject/multirelease-base/pom.xml
@@ -92,7 +92,6 @@
org.apache.maven.plugins
maven-dependency-plugin
- 3.1.0
add-java9-supplement
diff --git a/src/it/multirelease-patterns/multiproject/pom.xml b/src/it/multirelease-patterns/multiproject/pom.xml
index 533282fd..79740d27 100644
--- a/src/it/multirelease-patterns/multiproject/pom.xml
+++ b/src/it/multirelease-patterns/multiproject/pom.xml
@@ -35,10 +35,20 @@
maven-compiler-plugin
@project.version@
+
+ org.apache.maven.plugins
+ maven-dependency-plugin
+ @version.maven-dependency-plugin@
+
+
+ org.apache.maven.plugins
+ maven-jar-plugin
+ @version.maven-jar-plugin@
+
org.apache.maven.plugins
maven-surefire-plugin
- 2.22.0
+ @version.maven-surefire@
diff --git a/src/it/multirelease-patterns/packaging-plugin/pom.xml b/src/it/multirelease-patterns/packaging-plugin/pom.xml
index 593d4a13..88fde2d5 100644
--- a/src/it/multirelease-patterns/packaging-plugin/pom.xml
+++ b/src/it/multirelease-patterns/packaging-plugin/pom.xml
@@ -33,7 +33,7 @@
org.apache.maven.plugins
maven-surefire-plugin
- 2.21.0
+ @version.maven-surefire@
true
@@ -56,7 +56,7 @@
org.apache.maven.plugins
maven-failsafe-plugin
- 2.21.0
+ @version.maven-surefire@
diff --git a/src/it/multirelease-patterns/singleproject-runtime/invoker.properties b/src/it/multirelease-patterns/singleproject-runtime/invoker.properties
index 318b31a7..a15f4d08 100644
--- a/src/it/multirelease-patterns/singleproject-runtime/invoker.properties
+++ b/src/it/multirelease-patterns/singleproject-runtime/invoker.properties
@@ -14,5 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-invoker.java.version = 1.8+
invoker.goals = verify
\ No newline at end of file
diff --git a/src/it/multirelease-patterns/singleproject-runtime/pom.xml b/src/it/multirelease-patterns/singleproject-runtime/pom.xml
index a5be9ce8..fb8647e3 100644
--- a/src/it/multirelease-patterns/singleproject-runtime/pom.xml
+++ b/src/it/multirelease-patterns/singleproject-runtime/pom.xml
@@ -38,10 +38,20 @@
1.8
+
+ org.apache.maven.plugins
+ maven-jar-plugin
+ @version.maven-jar-plugin@
+
+
+ org.apache.maven.plugins
+ maven-failsafe-plugin
+ @version.maven-surefire@
+
org.apache.maven.plugins
maven-surefire-plugin
- 2.21.0
+ @version.maven-surefire@
true
@@ -54,7 +64,6 @@
org.apache.maven.plugins
maven-failsafe-plugin
- 2.21.0
diff --git a/src/it/multirelease-patterns/singleproject-toolchains/invoker.properties b/src/it/multirelease-patterns/singleproject-toolchains/invoker.properties
index 3e89fdde..193b2ad7 100644
--- a/src/it/multirelease-patterns/singleproject-toolchains/invoker.properties
+++ b/src/it/multirelease-patterns/singleproject-toolchains/invoker.properties
@@ -16,5 +16,3 @@
# under the License.
invoker.goals = verify -Pmulti-jar
invoker.toolchain.jdk.version=1.9
-# Due to toolchain support
-invoker.maven.version = 3.3.1+
diff --git a/src/it/multirelease-patterns/singleproject-toolchains/pom.xml b/src/it/multirelease-patterns/singleproject-toolchains/pom.xml
index 154f8ae6..39197623 100644
--- a/src/it/multirelease-patterns/singleproject-toolchains/pom.xml
+++ b/src/it/multirelease-patterns/singleproject-toolchains/pom.xml
@@ -44,7 +44,7 @@
org.apache.maven.plugins
maven-toolchains-plugin
- 1.1
+ 3.1.0
@@ -114,7 +114,7 @@
org.apache.maven.plugins
maven-failsafe-plugin
- 2.21.0
+ @version.maven-surefire@
@@ -200,7 +200,7 @@
maven-surefire-plugin
- 2.21.0
+ @version.maven-surefire@
${env.JAVA_HOME}/bin/java
@@ -245,7 +245,7 @@
org.apache.maven.plugins
maven-jar-plugin
- 2.4
+ @version.maven-jar-plugin@
diff --git a/src/it/non-english-warnings/pom.xml b/src/it/non-english-warnings/pom.xml
index aaadacd1..efb74e80 100644
--- a/src/it/non-english-warnings/pom.xml
+++ b/src/it/non-english-warnings/pom.xml
@@ -43,7 +43,7 @@
org.apache.maven.plugins
maven-compiler-plugin
- @pom.version@
+ @project.version@
false
true
diff --git a/src/it/setup_annotation-verify-plugin/pom.xml b/src/it/setup_annotation-verify-plugin/pom.xml
index f6ae99b3..67e23117 100644
--- a/src/it/setup_annotation-verify-plugin/pom.xml
+++ b/src/it/setup_annotation-verify-plugin/pom.xml
@@ -32,7 +32,7 @@
org.apache.maven.plugin-tools
maven-plugin-annotations
- 3.3
+ @version.maven-plugin-tools@
provided
diff --git a/src/it/setup_jar_automodule/pom.xml b/src/it/setup_jar_automodule/pom.xml
index b20e48b2..8cac6607 100644
--- a/src/it/setup_jar_automodule/pom.xml
+++ b/src/it/setup_jar_automodule/pom.xml
@@ -44,7 +44,7 @@
org.apache.maven.plugins
maven-jar-plugin
- 3.0.2
+ @version.maven-jar-plugin@