diff --git a/core-it-suite/src/test/resources-filtered/bootstrap.txt b/core-it-suite/src/test/resources-filtered/bootstrap.txt
index e043c2617..cc445a699 100644
--- a/core-it-suite/src/test/resources-filtered/bootstrap.txt
+++ b/core-it-suite/src/test/resources-filtered/bootstrap.txt
@@ -6,6 +6,7 @@
#5
com.google.code.findbugs:jsr305:1.3.9
com.google.guava:guava:10.0.1
+com.google.guava:guava:16.0.1
com.thoughtworks.qdox:qdox:2.0-M9
com.typesafe:config:1.4.2
commons-codec:commons-codec:1.15
diff --git a/core-it-suite/src/test/resources/mng-2135/plugin/pom.xml b/core-it-suite/src/test/resources/mng-2135/plugin/pom.xml
index b61457d85..8b1e1b4b7 100644
--- a/core-it-suite/src/test/resources/mng-2135/plugin/pom.xml
+++ b/core-it-suite/src/test/resources/mng-2135/plugin/pom.xml
@@ -39,4 +39,18 @@ under the License.
3.8.6
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-plugin-plugin
+
+ plugin
+
+
+
+
+
diff --git a/core-it-suite/src/test/resources/mng-3396/plugin/plugin/pom.xml b/core-it-suite/src/test/resources/mng-3396/plugin/plugin/pom.xml
index 1b7c0fe94..ae3e8eab9 100644
--- a/core-it-suite/src/test/resources/mng-3396/plugin/plugin/pom.xml
+++ b/core-it-suite/src/test/resources/mng-3396/plugin/plugin/pom.xml
@@ -32,4 +32,18 @@
1.0
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-plugin-plugin
+
+ plugin
+
+
+
+
+
diff --git a/core-it-suite/src/test/resources/mng-3441/pom.xml b/core-it-suite/src/test/resources/mng-3441/pom.xml
index 5313b8f22..cb9853e15 100644
--- a/core-it-suite/src/test/resources/mng-3441/pom.xml
+++ b/core-it-suite/src/test/resources/mng-3441/pom.xml
@@ -20,4 +20,18 @@
3.8.6
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-plugin-plugin
+
+ test-artifact
+
+
+
+
+
diff --git a/core-it-suite/src/test/resources/mng-3498/maven-mng3498-plugin/pom.xml b/core-it-suite/src/test/resources/mng-3498/maven-mng3498-plugin/pom.xml
index 2db3af807..8811b743a 100644
--- a/core-it-suite/src/test/resources/mng-3498/maven-mng3498-plugin/pom.xml
+++ b/core-it-suite/src/test/resources/mng-3498/maven-mng3498-plugin/pom.xml
@@ -38,4 +38,18 @@ under the License.
test
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-plugin-plugin
+
+ plugin
+
+
+
+
+
diff --git a/core-it-suite/src/test/resources/mng-3536/plugin/pom.xml b/core-it-suite/src/test/resources/mng-3536/plugin/pom.xml
index 97eca28e1..08ebd54af 100644
--- a/core-it-suite/src/test/resources/mng-3536/plugin/pom.xml
+++ b/core-it-suite/src/test/resources/mng-3536/plugin/pom.xml
@@ -36,4 +36,18 @@ under the License.
2.0.9
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-plugin-plugin
+
+ plugin
+
+
+
+
+
diff --git a/core-it-suite/src/test/resources/mng-3652/test-plugin/pom.xml b/core-it-suite/src/test/resources/mng-3652/test-plugin/pom.xml
index b0ed1fc3a..19d133d59 100644
--- a/core-it-suite/src/test/resources/mng-3652/test-plugin/pom.xml
+++ b/core-it-suite/src/test/resources/mng-3652/test-plugin/pom.xml
@@ -32,4 +32,18 @@
3.4.2
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-plugin-plugin
+
+ plugin
+
+
+
+
+
diff --git a/core-it-suite/src/test/resources/mng-3684/maven-mng3684-plugin/pom.xml b/core-it-suite/src/test/resources/mng-3684/maven-mng3684-plugin/pom.xml
index 7dd02ff4f..c17353d74 100644
--- a/core-it-suite/src/test/resources/mng-3684/maven-mng3684-plugin/pom.xml
+++ b/core-it-suite/src/test/resources/mng-3684/maven-mng3684-plugin/pom.xml
@@ -35,4 +35,18 @@
2.0.4.1
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-plugin-plugin
+
+ plugin
+
+
+
+
+
diff --git a/core-it-suite/src/test/resources/mng-3693/maven-mng3693-plugin/pom.xml b/core-it-suite/src/test/resources/mng-3693/maven-mng3693-plugin/pom.xml
index d56f2899e..1859de6ce 100644
--- a/core-it-suite/src/test/resources/mng-3693/maven-mng3693-plugin/pom.xml
+++ b/core-it-suite/src/test/resources/mng-3693/maven-mng3693-plugin/pom.xml
@@ -25,4 +25,18 @@
2.0.9
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-plugin-plugin
+
+ plugin
+
+
+
+
+
diff --git a/core-it-suite/src/test/resources/mng-3694/maven-mng3694-plugin/pom.xml b/core-it-suite/src/test/resources/mng-3694/maven-mng3694-plugin/pom.xml
index ba8825b6c..a0919db87 100644
--- a/core-it-suite/src/test/resources/mng-3694/maven-mng3694-plugin/pom.xml
+++ b/core-it-suite/src/test/resources/mng-3694/maven-mng3694-plugin/pom.xml
@@ -25,4 +25,18 @@
2.0.9
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-plugin-plugin
+
+ plugin
+
+
+
+
+
diff --git a/core-it-suite/src/test/resources/mng-3703/maven-mng3703-plugin/pom.xml b/core-it-suite/src/test/resources/mng-3703/maven-mng3703-plugin/pom.xml
index a508c3ba5..eef5881d7 100644
--- a/core-it-suite/src/test/resources/mng-3703/maven-mng3703-plugin/pom.xml
+++ b/core-it-suite/src/test/resources/mng-3703/maven-mng3703-plugin/pom.xml
@@ -30,4 +30,18 @@
2.0.4.1
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-plugin-plugin
+
+ plugin
+
+
+
+
+
diff --git a/core-it-suite/src/test/resources/mng-3710/original-model/plugins/maven-mng3710-directInvoke-plugin/pom.xml b/core-it-suite/src/test/resources/mng-3710/original-model/plugins/maven-mng3710-directInvoke-plugin/pom.xml
index bffc7d46c..b44afc028 100644
--- a/core-it-suite/src/test/resources/mng-3710/original-model/plugins/maven-mng3710-directInvoke-plugin/pom.xml
+++ b/core-it-suite/src/test/resources/mng-3710/original-model/plugins/maven-mng3710-directInvoke-plugin/pom.xml
@@ -19,4 +19,18 @@
test
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-plugin-plugin
+
+ plugin
+
+
+
+
+
diff --git a/core-it-suite/src/test/resources/mng-3710/original-model/plugins/maven-mng3710-originalModel-plugin/pom.xml b/core-it-suite/src/test/resources/mng-3710/original-model/plugins/maven-mng3710-originalModel-plugin/pom.xml
index e28acb454..bc05d9f96 100644
--- a/core-it-suite/src/test/resources/mng-3710/original-model/plugins/maven-mng3710-originalModel-plugin/pom.xml
+++ b/core-it-suite/src/test/resources/mng-3710/original-model/plugins/maven-mng3710-originalModel-plugin/pom.xml
@@ -24,4 +24,18 @@
2.0.9
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-plugin-plugin
+
+ plugin
+
+
+
+
+
diff --git a/core-it-suite/src/test/resources/mng-3710/pom-inheritance/maven-mng3710-pomInheritance-plugin/pom.xml b/core-it-suite/src/test/resources/mng-3710/pom-inheritance/maven-mng3710-pomInheritance-plugin/pom.xml
index acf650e4c..ad31d4f62 100644
--- a/core-it-suite/src/test/resources/mng-3710/pom-inheritance/maven-mng3710-pomInheritance-plugin/pom.xml
+++ b/core-it-suite/src/test/resources/mng-3710/pom-inheritance/maven-mng3710-pomInheritance-plugin/pom.xml
@@ -19,4 +19,18 @@
test
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-plugin-plugin
+
+ plugin
+
+
+
+
+
diff --git a/core-it-suite/src/test/resources/mng-3716/maven-mng3716-plugin/pom.xml b/core-it-suite/src/test/resources/mng-3716/maven-mng3716-plugin/pom.xml
index 8fd9c3b0e..fdcfbc605 100644
--- a/core-it-suite/src/test/resources/mng-3716/maven-mng3716-plugin/pom.xml
+++ b/core-it-suite/src/test/resources/mng-3716/maven-mng3716-plugin/pom.xml
@@ -20,4 +20,18 @@
test
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-plugin-plugin
+
+ plugin
+
+
+
+
+
diff --git a/core-it-suite/src/test/resources/mng-3723/maven-mng3723-plugin/pom.xml b/core-it-suite/src/test/resources/mng-3723/maven-mng3723-plugin/pom.xml
index f14331c77..da83a1987 100644
--- a/core-it-suite/src/test/resources/mng-3723/maven-mng3723-plugin/pom.xml
+++ b/core-it-suite/src/test/resources/mng-3723/maven-mng3723-plugin/pom.xml
@@ -25,4 +25,18 @@
2.0.9
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-plugin-plugin
+
+ plugin
+
+
+
+
+
diff --git a/core-it-suite/src/test/resources/mng-3724/maven-mng3724-plugin/pom.xml b/core-it-suite/src/test/resources/mng-3724/maven-mng3724-plugin/pom.xml
index c7f2357d2..30842308d 100644
--- a/core-it-suite/src/test/resources/mng-3724/maven-mng3724-plugin/pom.xml
+++ b/core-it-suite/src/test/resources/mng-3724/maven-mng3724-plugin/pom.xml
@@ -25,4 +25,18 @@
2.0.9
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-plugin-plugin
+
+ plugin
+
+
+
+
+
diff --git a/core-it-suite/src/test/resources/mng-3729/maven-mng3729-plugin/pom.xml b/core-it-suite/src/test/resources/mng-3729/maven-mng3729-plugin/pom.xml
index d1ab6d792..73295a4bd 100644
--- a/core-it-suite/src/test/resources/mng-3729/maven-mng3729-plugin/pom.xml
+++ b/core-it-suite/src/test/resources/mng-3729/maven-mng3729-plugin/pom.xml
@@ -20,4 +20,18 @@
test
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-plugin-plugin
+
+ plugin
+
+
+
+
+
diff --git a/core-it-suite/src/test/resources/mng-3740/projects.v1/maven-mng3740-plugin/pom.xml b/core-it-suite/src/test/resources/mng-3740/projects.v1/maven-mng3740-plugin/pom.xml
index ee78a229a..e25382a61 100644
--- a/core-it-suite/src/test/resources/mng-3740/projects.v1/maven-mng3740-plugin/pom.xml
+++ b/core-it-suite/src/test/resources/mng-3740/projects.v1/maven-mng3740-plugin/pom.xml
@@ -18,4 +18,18 @@
3.8.6
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-plugin-plugin
+
+ plugin
+
+
+
+
+
diff --git a/core-it-suite/src/test/resources/mng-3740/projects.v2/maven-mng3740-plugin/pom.xml b/core-it-suite/src/test/resources/mng-3740/projects.v2/maven-mng3740-plugin/pom.xml
index 8a21ff7fa..303f6dbbe 100644
--- a/core-it-suite/src/test/resources/mng-3740/projects.v2/maven-mng3740-plugin/pom.xml
+++ b/core-it-suite/src/test/resources/mng-3740/projects.v2/maven-mng3740-plugin/pom.xml
@@ -18,4 +18,18 @@
3.8.6
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-plugin-plugin
+
+ plugin
+
+
+
+
+
diff --git a/core-it-suite/src/test/resources/mng-3746/maven-mng3746-plugin/pom.xml b/core-it-suite/src/test/resources/mng-3746/maven-mng3746-plugin/pom.xml
index 1d0214821..c13b93794 100644
--- a/core-it-suite/src/test/resources/mng-3746/maven-mng3746-plugin/pom.xml
+++ b/core-it-suite/src/test/resources/mng-3746/maven-mng3746-plugin/pom.xml
@@ -20,4 +20,18 @@
test
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-plugin-plugin
+
+ plugin
+
+
+
+
+
diff --git a/core-it-suite/src/test/resources/mng-5530-mojo-execution-scope/extension-plugin/pom.xml b/core-it-suite/src/test/resources/mng-5530-mojo-execution-scope/extension-plugin/pom.xml
index 09c134f00..d7b75bf38 100644
--- a/core-it-suite/src/test/resources/mng-5530-mojo-execution-scope/extension-plugin/pom.xml
+++ b/core-it-suite/src/test/resources/mng-5530-mojo-execution-scope/extension-plugin/pom.xml
@@ -64,6 +64,18 @@ under the License.
+
+
+
+ org.apache.maven.plugins
+ maven-plugin-plugin
+
+ plugin
+
+
+
+
+
org.eclipse.sisu
diff --git a/core-it-suite/src/test/resources/mng-5530-mojo-execution-scope/plugin/pom.xml b/core-it-suite/src/test/resources/mng-5530-mojo-execution-scope/plugin/pom.xml
index bf0fd939f..c1282c281 100644
--- a/core-it-suite/src/test/resources/mng-5530-mojo-execution-scope/plugin/pom.xml
+++ b/core-it-suite/src/test/resources/mng-5530-mojo-execution-scope/plugin/pom.xml
@@ -57,6 +57,18 @@ under the License.
+
+
+
+ org.apache.maven.plugins
+ maven-plugin-plugin
+
+ plugin
+
+
+
+
+
org.eclipse.sisu
diff --git a/core-it-suite/src/test/resources/mng-5578-session-scope/extension-plugin/pom.xml b/core-it-suite/src/test/resources/mng-5578-session-scope/extension-plugin/pom.xml
index 49936496b..7a9cae598 100644
--- a/core-it-suite/src/test/resources/mng-5578-session-scope/extension-plugin/pom.xml
+++ b/core-it-suite/src/test/resources/mng-5578-session-scope/extension-plugin/pom.xml
@@ -64,6 +64,18 @@ under the License.
+
+
+
+ org.apache.maven.plugins
+ maven-plugin-plugin
+
+ plugin
+
+
+
+
+
org.eclipse.sisu
diff --git a/core-it-suite/src/test/resources/mng-5578-session-scope/plugin/pom.xml b/core-it-suite/src/test/resources/mng-5578-session-scope/plugin/pom.xml
index 7c451247b..676dad108 100644
--- a/core-it-suite/src/test/resources/mng-5578-session-scope/plugin/pom.xml
+++ b/core-it-suite/src/test/resources/mng-5578-session-scope/plugin/pom.xml
@@ -57,6 +57,18 @@ under the License.
+
+
+
+ org.apache.maven.plugins
+ maven-plugin-plugin
+
+ plugin
+
+
+
+
+
org.eclipse.sisu
diff --git a/core-it-suite/src/test/resources/mng-5742-build-extension-classloader/plugin/pom.xml b/core-it-suite/src/test/resources/mng-5742-build-extension-classloader/plugin/pom.xml
index a89f2213a..08f68f38c 100644
--- a/core-it-suite/src/test/resources/mng-5742-build-extension-classloader/plugin/pom.xml
+++ b/core-it-suite/src/test/resources/mng-5742-build-extension-classloader/plugin/pom.xml
@@ -57,6 +57,18 @@ under the License.
+
+
+
+ org.apache.maven.plugins
+ maven-plugin-plugin
+
+ plugin
+
+
+
+
+
org.eclipse.sisu
diff --git a/core-it-suite/src/test/resources/mng-5753-custom-mojo-execution-configurator/plugin/pom.xml b/core-it-suite/src/test/resources/mng-5753-custom-mojo-execution-configurator/plugin/pom.xml
index 3da24d3b1..8a76363d4 100644
--- a/core-it-suite/src/test/resources/mng-5753-custom-mojo-execution-configurator/plugin/pom.xml
+++ b/core-it-suite/src/test/resources/mng-5753-custom-mojo-execution-configurator/plugin/pom.xml
@@ -55,4 +55,18 @@ under the License.
provided
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-plugin-plugin
+
+ plugin
+
+
+
+
+
diff --git a/core-it-suite/src/test/resources/mng-5783-plugin-dependency-filtering/plugin/pom.xml b/core-it-suite/src/test/resources/mng-5783-plugin-dependency-filtering/plugin/pom.xml
index e6ff2272a..d79bc97dc 100644
--- a/core-it-suite/src/test/resources/mng-5783-plugin-dependency-filtering/plugin/pom.xml
+++ b/core-it-suite/src/test/resources/mng-5783-plugin-dependency-filtering/plugin/pom.xml
@@ -55,4 +55,19 @@ under the License.
provided
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-plugin-plugin
+
+ plugin
+
+
+
+
+
+
diff --git a/core-it-suite/src/test/resources/mng-6127-plugin-execution-configuration-interference/plugin/pom.xml b/core-it-suite/src/test/resources/mng-6127-plugin-execution-configuration-interference/plugin/pom.xml
index 0d440a49a..7c4a806cd 100644
--- a/core-it-suite/src/test/resources/mng-6127-plugin-execution-configuration-interference/plugin/pom.xml
+++ b/core-it-suite/src/test/resources/mng-6127-plugin-execution-configuration-interference/plugin/pom.xml
@@ -49,4 +49,19 @@ under the License.
provided
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-plugin-plugin
+
+ plugin
+
+
+
+
+
+
diff --git a/core-it-suite/src/test/resources/mng-6240-plugin-extension-aether-provider/plugin-extension/pom.xml b/core-it-suite/src/test/resources/mng-6240-plugin-extension-aether-provider/plugin-extension/pom.xml
index a8dfa3867..1b58c7f15 100644
--- a/core-it-suite/src/test/resources/mng-6240-plugin-extension-aether-provider/plugin-extension/pom.xml
+++ b/core-it-suite/src/test/resources/mng-6240-plugin-extension-aether-provider/plugin-extension/pom.xml
@@ -40,4 +40,19 @@ under the License.
${maven-version}
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-plugin-plugin
+
+ plugin
+
+
+
+
+
+
diff --git a/core-it-suite/src/test/resources/mng-6506-package-annotation/plugin/pom.xml b/core-it-suite/src/test/resources/mng-6506-package-annotation/plugin/pom.xml
index fafbea1e4..89a933026 100644
--- a/core-it-suite/src/test/resources/mng-6506-package-annotation/plugin/pom.xml
+++ b/core-it-suite/src/test/resources/mng-6506-package-annotation/plugin/pom.xml
@@ -39,4 +39,18 @@ under the License.
provided
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-plugin-plugin
+
+ plugin
+
+
+
+
+
diff --git a/core-it-suite/src/test/resources/mng-6566-execute-annotation-should-not-re-execute-goals/plugin/pom.xml b/core-it-suite/src/test/resources/mng-6566-execute-annotation-should-not-re-execute-goals/plugin/pom.xml
index c559fe654..43616f8a1 100644
--- a/core-it-suite/src/test/resources/mng-6566-execute-annotation-should-not-re-execute-goals/plugin/pom.xml
+++ b/core-it-suite/src/test/resources/mng-6566-execute-annotation-should-not-re-execute-goals/plugin/pom.xml
@@ -46,4 +46,17 @@ under the License.
+
+
+
+
+ org.apache.maven.plugins
+ maven-plugin-plugin
+
+ plugin
+
+
+
+
+
diff --git a/core-it-suite/src/test/resources/mng-7474-session-scope/plugin/pom.xml b/core-it-suite/src/test/resources/mng-7474-session-scope/plugin/pom.xml
index b900f7e74..fe25dda12 100644
--- a/core-it-suite/src/test/resources/mng-7474-session-scope/plugin/pom.xml
+++ b/core-it-suite/src/test/resources/mng-7474-session-scope/plugin/pom.xml
@@ -40,6 +40,18 @@
+
+
+
+ org.apache.maven.plugins
+ maven-plugin-plugin
+
+ plugin
+
+
+
+
+
org.eclipse.sisu