You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by if...@apache.org on 2017/05/07 21:44:02 UTC

maven-integration-testing git commit: MNG-6210 shortened test project file names

Repository: maven-integration-testing
Updated Branches:
  refs/heads/master 39a910a13 -> a98575094


MNG-6210 shortened test project file names

Signed-off-by: Igor Fedorenko <if...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/a9857509
Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/a9857509
Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/a9857509

Branch: refs/heads/master
Commit: a9857509453b42ad9b26fad80d5c421de0a2c50e
Parents: 39a910a
Author: Igor Fedorenko <if...@apache.org>
Authored: Sun May 7 17:43:15 2017 -0400
Committer: Igor Fedorenko <if...@apache.org>
Committed: Sun May 7 17:43:15 2017 -0400

----------------------------------------------------------------------
 ...ITmng6210CoreExtensionsCustomScopesTest.java |   2 +-
 .../client/.mvn/extensions.xml                  |  28 --------
 .../client/pom.xml                              |  55 ----------------
 .../.gitignore                                  |   1 -
 .../pom.xml                                     |  66 -------------------
 .../TestMojoExecutionScopedComponent.java       |  12 ----
 .../TestSessionScopedComponent.java             |  11 ----
 .../main/resources/META-INF/maven/extension.xml |  29 --------
 .../.gitignore                                  |   1 -
 .../pom.xml                                     |  66 -------------------
 .../plugin/ValidateMojoExecutionScopedMojo.java |  25 -------
 .../plugin/ValidateSessionScopedMojo.java       |  26 --------
 ...ven-it-core-extensions-custom-scopes-0.1.jar | Bin 5359 -> 0 bytes
 ...ven-it-core-extensions-custom-scopes-0.1.pom |  66 -------------------
 .../maven-metadata.xml                          |  12 ----
 ...core-extensions-custom-scopes-client-0.1.jar | Bin 6719 -> 0 bytes
 ...core-extensions-custom-scopes-client-0.1.pom |  66 -------------------
 .../maven-metadata.xml                          |  13 ----
 .../maven-metadata.xml                          |  10 ---
 .../settings-template.xml                       |  43 ------------
 .../client/.mvn/extensions.xml                  |  28 ++++++++
 .../client/pom.xml                              |  55 ++++++++++++++++
 .../maven-it-core-extensions/.gitignore         |   1 +
 .../repo-src/maven-it-core-extensions/pom.xml   |  66 +++++++++++++++++++
 .../TestMojoExecutionScopedComponent.java       |  12 ++++
 .../extensions/TestSessionScopedComponent.java  |  11 ++++
 .../main/resources/META-INF/maven/extension.xml |  29 ++++++++
 .../repo-src/maven-it-plugin/.gitignore         |   1 +
 .../repo-src/maven-it-plugin/pom.xml            |  66 +++++++++++++++++++
 .../plugin/ValidateMojoExecutionScopedMojo.java |  25 +++++++
 .../its/plugin/ValidateSessionScopedMojo.java   |  26 ++++++++
 .../0.1/maven-it-core-extensions-0.1.jar        | Bin 0 -> 5061 bytes
 .../0.1/maven-it-core-extensions-0.1.pom        |  66 +++++++++++++++++++
 .../maven-it-core-extensions/maven-metadata.xml |  12 ++++
 .../maven-it-plugin/0.1/maven-it-plugin-0.1.jar | Bin 0 -> 5954 bytes
 .../maven-it-plugin/0.1/maven-it-plugin-0.1.pom |  66 +++++++++++++++++++
 .../maven-it-plugin/maven-metadata.xml          |  13 ++++
 .../maven-metadata.xml                          |  10 +++
 .../settings-template.xml                       |  43 ++++++++++++
 39 files changed, 531 insertions(+), 531 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a9857509/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6210CoreExtensionsCustomScopesTest.java
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6210CoreExtensionsCustomScopesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6210CoreExtensionsCustomScopesTest.java
index 133a391..d009821 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6210CoreExtensionsCustomScopesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6210CoreExtensionsCustomScopesTest.java
@@ -21,7 +21,7 @@ public class MavenITmng6210CoreExtensionsCustomScopesTest
     public void testCoreExtensionCustomScopes()
         throws Exception
     {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-6210-core-extensions-custom-scopes" );
+        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-6210-core-extensions-scopes" );
 
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a9857509/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/client/.mvn/extensions.xml
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/client/.mvn/extensions.xml b/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/client/.mvn/extensions.xml
deleted file mode 100644
index cf00081..0000000
--- a/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/client/.mvn/extensions.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<extensions>
-  <extension>
-    <groupId>org.apache.maven.its.it-core-extensions-custom-scopes</groupId>
-    <artifactId>maven-it-core-extensions-custom-scopes</artifactId>
-    <version>0.1</version>
-  </extension>
-</extensions>

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a9857509/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/client/pom.xml
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/client/pom.xml b/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/client/pom.xml
deleted file mode 100644
index c884723..0000000
--- a/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/client/pom.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project>
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.apache.maven.its.it-core-extensions-custom-scopes</groupId>
-  <artifactId>test</artifactId>
-  <version>0.1</version>
-  <packaging>jar</packaging>
-
-  <name>Maven Integration Test :: it-core-extensions-custom-scopes</name>
-  <description>
-    Verify that Maven loads core extensions and components contributed by the extensions are available to regular
-    plugins. 
-  </description>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.its.it-core-extensions-custom-scopes</groupId>
-        <artifactId>maven-it-plugin-core-extensions-custom-scopes-client</artifactId>
-        <version>0.1</version>
-        <executions>
-          <execution>
-            <id>validate-extensions</id>
-            <phase>validate</phase>
-            <goals>
-              <goal>validate-session-execution-scoped</goal>
-              <goal>validate-session-scoped</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a9857509/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo-src/maven-it-core-extensions-custom-scopes/.gitignore
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo-src/maven-it-core-extensions-custom-scopes/.gitignore b/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo-src/maven-it-core-extensions-custom-scopes/.gitignore
deleted file mode 100644
index b83d222..0000000
--- a/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo-src/maven-it-core-extensions-custom-scopes/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/target/

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a9857509/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo-src/maven-it-core-extensions-custom-scopes/pom.xml
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo-src/maven-it-core-extensions-custom-scopes/pom.xml b/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo-src/maven-it-core-extensions-custom-scopes/pom.xml
deleted file mode 100644
index cf027ad..0000000
--- a/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo-src/maven-it-core-extensions-custom-scopes/pom.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project>
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.apache.maven.its.it-core-extensions-custom-scopes</groupId>
-  <artifactId>maven-it-core-extensions-custom-scopes</artifactId>
-  <version>0.1</version>
-  <packaging>jar</packaging>
-
-  <name>Maven Integration Test :: maven-it-core-extensions-custom-scopes</name>
-  <description>
-    Maven core extensions components that use @SessionScope and @MojoExecutionScope Guice scopes
-  </description>
-  
-  <!-- 
-    mvn clean deploy -DaltDeploymentRepository=default::default::file://
-   -->
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-core</artifactId>
-      <version>3.3.1</version>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.eclipse.sisu</groupId>
-        <artifactId>sisu-maven-plugin</artifactId>
-        <version>0.3.3</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>main-index</goal>
-              <goal>test-index</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a9857509/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo-src/maven-it-core-extensions-custom-scopes/src/main/java/org/apache/maven/its/core_extensions_custom_scopes/TestMojoExecutionScopedComponent.java
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo-src/maven-it-core-extensions-custom-scopes/src/main/java/org/apache/maven/its/core_extensions_custom_scopes/TestMojoExecutionScopedComponent.java b/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo-src/maven-it-core-extensions-custom-scopes/src/main/java/org/apache/maven/its/core_extensions_custom_scopes/TestMojoExecutionScopedComponent.java
deleted file mode 100644
index 24a6c79..0000000
--- a/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo-src/maven-it-core-extensions-custom-scopes/src/main/java/org/apache/maven/its/core_extensions_custom_scopes/TestMojoExecutionScopedComponent.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.apache.maven.its.core_extensions_custom_scopes;
-
-import javax.inject.Named;
-
-import org.apache.maven.execution.scope.MojoExecutionScoped;
-
-@Named
-@MojoExecutionScoped
-public class TestMojoExecutionScopedComponent
-{
-
-}

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a9857509/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo-src/maven-it-core-extensions-custom-scopes/src/main/java/org/apache/maven/its/core_extensions_custom_scopes/TestSessionScopedComponent.java
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo-src/maven-it-core-extensions-custom-scopes/src/main/java/org/apache/maven/its/core_extensions_custom_scopes/TestSessionScopedComponent.java b/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo-src/maven-it-core-extensions-custom-scopes/src/main/java/org/apache/maven/its/core_extensions_custom_scopes/TestSessionScopedComponent.java
deleted file mode 100644
index e449188..0000000
--- a/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo-src/maven-it-core-extensions-custom-scopes/src/main/java/org/apache/maven/its/core_extensions_custom_scopes/TestSessionScopedComponent.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.apache.maven.its.core_extensions_custom_scopes;
-
-import javax.inject.Named;
-
-import org.apache.maven.SessionScoped;
-
-@Named
-@SessionScoped
-public class TestSessionScopedComponent
-{
-}

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a9857509/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo-src/maven-it-core-extensions-custom-scopes/src/main/resources/META-INF/maven/extension.xml
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo-src/maven-it-core-extensions-custom-scopes/src/main/resources/META-INF/maven/extension.xml b/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo-src/maven-it-core-extensions-custom-scopes/src/main/resources/META-INF/maven/extension.xml
deleted file mode 100644
index 7ca43c1..0000000
--- a/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo-src/maven-it-core-extensions-custom-scopes/src/main/resources/META-INF/maven/extension.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<extension>
-  <exportedPackages>
-    <exportedPackage>org.apache.maven.its.core_extensions_custom_scopes</exportedPackage>
-  </exportedPackages>
-  <exportedArtifacts>
-    <exportedArtifact>org.apache.maven.its.it-core-extensions:maven-it-core-extensions-custom-scopes</exportedArtifact>
-  </exportedArtifacts>
-</extension>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a9857509/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo-src/maven-it-plugin-core-extensions-custom-scopes-client/.gitignore
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo-src/maven-it-plugin-core-extensions-custom-scopes-client/.gitignore b/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo-src/maven-it-plugin-core-extensions-custom-scopes-client/.gitignore
deleted file mode 100644
index b83d222..0000000
--- a/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo-src/maven-it-plugin-core-extensions-custom-scopes-client/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/target/

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a9857509/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo-src/maven-it-plugin-core-extensions-custom-scopes-client/pom.xml
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo-src/maven-it-plugin-core-extensions-custom-scopes-client/pom.xml b/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo-src/maven-it-plugin-core-extensions-custom-scopes-client/pom.xml
deleted file mode 100644
index a5d1434..0000000
--- a/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo-src/maven-it-plugin-core-extensions-custom-scopes-client/pom.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project>
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.apache.maven.its.it-core-extensions-custom-scopes</groupId>
-  <artifactId>maven-it-plugin-core-extensions-custom-scopes-client</artifactId>
-  <version>0.1</version>
-  <packaging>maven-plugin</packaging>
-
-  <name>Maven Integration Test :: maven-it-plugin-core-extensions-custom-scopes-client</name>
-  <description>
-    Maven plugin that fails if expected components were not contributed by the core extension
-  </description>
-
-  <!-- 
-    mvn clean deploy -DaltDeploymentRepository=default::default::file://
-   -->
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-core</artifactId>
-      <version>3.3.1</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-plugin-api</artifactId>
-      <version>3.3.1</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.plugin-tools</groupId>
-      <artifactId>maven-plugin-annotations</artifactId>
-      <version>3.3</version>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.maven.its.it-core-extensions</groupId>
-      <artifactId>maven-it-core-extensions-custom-scopes</artifactId>
-      <version>0.1</version>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-</project>

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a9857509/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo-src/maven-it-plugin-core-extensions-custom-scopes-client/src/main/java/org/apache/maven/its/core_extensions_custom_scopes/plugin/ValidateMojoExecutionScopedMojo.java
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo-src/maven-it-plugin-core-extensions-custom-scopes-client/src/main/java/org/apache/maven/its/core_extensions_custom_scopes/plugin/ValidateMojoExecutionScopedMojo.java b/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo-src/maven-it-plugin-core-extensions-custom-scopes-client/src/main/java/org/apache/maven/its/core_extensions_custom_scopes/plugin/ValidateMojoExecutionScopedMojo.java
deleted file mode 100644
index 50d7e3c..0000000
--- a/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo-src/maven-it-plugin-core-extensions-custom-scopes-client/src/main/java/org/apache/maven/its/core_extensions_custom_scopes/plugin/ValidateMojoExecutionScopedMojo.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.apache.maven.its.core_extensions_custom_scopes.plugin;
-
-import org.apache.maven.its.core_extensions_custom_scopes.TestMojoExecutionScopedComponent;
-import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugins.annotations.Component;
-import org.apache.maven.plugins.annotations.Mojo;
-
-@Mojo( name = "validate-session-execution-scoped" )
-public class ValidateMojoExecutionScopedMojo
-    extends AbstractMojo
-{
-    @Component
-    private TestMojoExecutionScopedComponent component;
-
-    public void execute()
-        throws MojoExecutionException, MojoFailureException
-    {
-        if ( this.component == null )
-        {
-            throw new MojoExecutionException( "Expected core extension component is not available" );
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a9857509/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo-src/maven-it-plugin-core-extensions-custom-scopes-client/src/main/java/org/apache/maven/its/core_extensions_custom_scopes/plugin/ValidateSessionScopedMojo.java
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo-src/maven-it-plugin-core-extensions-custom-scopes-client/src/main/java/org/apache/maven/its/core_extensions_custom_scopes/plugin/ValidateSessionScopedMojo.java b/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo-src/maven-it-plugin-core-extensions-custom-scopes-client/src/main/java/org/apache/maven/its/core_extensions_custom_scopes/plugin/ValidateSessionScopedMojo.java
deleted file mode 100644
index a259ebe..0000000
--- a/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo-src/maven-it-plugin-core-extensions-custom-scopes-client/src/main/java/org/apache/maven/its/core_extensions_custom_scopes/plugin/ValidateSessionScopedMojo.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.apache.maven.its.core_extensions_custom_scopes.plugin;
-
-import org.apache.maven.its.core_extensions_custom_scopes.TestSessionScopedComponent;
-import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugins.annotations.Component;
-import org.apache.maven.plugins.annotations.Mojo;
-
-@Mojo( name = "validate-session-scoped" )
-public class ValidateSessionScopedMojo
-    extends AbstractMojo
-{
-    @Component
-    private TestSessionScopedComponent component;
-
-    public void execute()
-        throws MojoExecutionException, MojoFailureException
-    {
-        if ( this.component == null )
-        {
-            throw new MojoExecutionException( "Expected core extension component is not available" );
-        }
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a9857509/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo/org/apache/maven/its/it-core-extensions-custom-scopes/maven-it-core-extensions-custom-scopes/0.1/maven-it-core-extensions-custom-scopes-0.1.jar
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo/org/apache/maven/its/it-core-extensions-custom-scopes/maven-it-core-extensions-custom-scopes/0.1/maven-it-core-extensions-custom-scopes-0.1.jar b/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo/org/apache/maven/its/it-core-extensions-custom-scopes/maven-it-core-extensions-custom-scopes/0.1/maven-it-core-extensions-custom-scopes-0.1.jar
deleted file mode 100644
index 779faaf..0000000
Binary files a/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo/org/apache/maven/its/it-core-extensions-custom-scopes/maven-it-core-extensions-custom-scopes/0.1/maven-it-core-extensions-custom-scopes-0.1.jar and /dev/null differ

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a9857509/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo/org/apache/maven/its/it-core-extensions-custom-scopes/maven-it-core-extensions-custom-scopes/0.1/maven-it-core-extensions-custom-scopes-0.1.pom
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo/org/apache/maven/its/it-core-extensions-custom-scopes/maven-it-core-extensions-custom-scopes/0.1/maven-it-core-extensions-custom-scopes-0.1.pom b/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo/org/apache/maven/its/it-core-extensions-custom-scopes/maven-it-core-extensions-custom-scopes/0.1/maven-it-core-extensions-custom-scopes-0.1.pom
deleted file mode 100644
index cf027ad..0000000
--- a/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo/org/apache/maven/its/it-core-extensions-custom-scopes/maven-it-core-extensions-custom-scopes/0.1/maven-it-core-extensions-custom-scopes-0.1.pom
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project>
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.apache.maven.its.it-core-extensions-custom-scopes</groupId>
-  <artifactId>maven-it-core-extensions-custom-scopes</artifactId>
-  <version>0.1</version>
-  <packaging>jar</packaging>
-
-  <name>Maven Integration Test :: maven-it-core-extensions-custom-scopes</name>
-  <description>
-    Maven core extensions components that use @SessionScope and @MojoExecutionScope Guice scopes
-  </description>
-  
-  <!-- 
-    mvn clean deploy -DaltDeploymentRepository=default::default::file://
-   -->
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-core</artifactId>
-      <version>3.3.1</version>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.eclipse.sisu</groupId>
-        <artifactId>sisu-maven-plugin</artifactId>
-        <version>0.3.3</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>main-index</goal>
-              <goal>test-index</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a9857509/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo/org/apache/maven/its/it-core-extensions-custom-scopes/maven-it-core-extensions-custom-scopes/maven-metadata.xml
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo/org/apache/maven/its/it-core-extensions-custom-scopes/maven-it-core-extensions-custom-scopes/maven-metadata.xml b/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo/org/apache/maven/its/it-core-extensions-custom-scopes/maven-it-core-extensions-custom-scopes/maven-metadata.xml
deleted file mode 100644
index 037f7ac..0000000
--- a/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo/org/apache/maven/its/it-core-extensions-custom-scopes/maven-it-core-extensions-custom-scopes/maven-metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata>
-  <groupId>org.apache.maven.its.it-core-extensions-custom-scopes</groupId>
-  <artifactId>maven-it-core-extensions-custom-scopes</artifactId>
-  <versioning>
-    <release>0.1</release>
-    <versions>
-      <version>0.1</version>
-    </versions>
-    <lastUpdated>20170413003607</lastUpdated>
-  </versioning>
-</metadata>

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a9857509/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo/org/apache/maven/its/it-core-extensions-custom-scopes/maven-it-plugin-core-extensions-custom-scopes-client/0.1/maven-it-plugin-core-extensions-custom-scopes-client-0.1.jar
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo/org/apache/maven/its/it-core-extensions-custom-scopes/maven-it-plugin-core-extensions-custom-scopes-client/0.1/maven-it-plugin-core-extensions-custom-scopes-client-0.1.jar b/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo/org/apache/maven/its/it-core-extensions-custom-scopes/maven-it-plugin-core-extensions-custom-scopes-client/0.1/maven-it-plugin-core-extensions-custom-scopes-client-0.1.jar
deleted file mode 100644
index 124e074..0000000
Binary files a/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo/org/apache/maven/its/it-core-extensions-custom-scopes/maven-it-plugin-core-extensions-custom-scopes-client/0.1/maven-it-plugin-core-extensions-custom-scopes-client-0.1.jar and /dev/null differ

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a9857509/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo/org/apache/maven/its/it-core-extensions-custom-scopes/maven-it-plugin-core-extensions-custom-scopes-client/0.1/maven-it-plugin-core-extensions-custom-scopes-client-0.1.pom
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo/org/apache/maven/its/it-core-extensions-custom-scopes/maven-it-plugin-core-extensions-custom-scopes-client/0.1/maven-it-plugin-core-extensions-custom-scopes-client-0.1.pom b/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo/org/apache/maven/its/it-core-extensions-custom-scopes/maven-it-plugin-core-extensions-custom-scopes-client/0.1/maven-it-plugin-core-extensions-custom-scopes-client-0.1.pom
deleted file mode 100644
index a5d1434..0000000
--- a/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo/org/apache/maven/its/it-core-extensions-custom-scopes/maven-it-plugin-core-extensions-custom-scopes-client/0.1/maven-it-plugin-core-extensions-custom-scopes-client-0.1.pom
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project>
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.apache.maven.its.it-core-extensions-custom-scopes</groupId>
-  <artifactId>maven-it-plugin-core-extensions-custom-scopes-client</artifactId>
-  <version>0.1</version>
-  <packaging>maven-plugin</packaging>
-
-  <name>Maven Integration Test :: maven-it-plugin-core-extensions-custom-scopes-client</name>
-  <description>
-    Maven plugin that fails if expected components were not contributed by the core extension
-  </description>
-
-  <!-- 
-    mvn clean deploy -DaltDeploymentRepository=default::default::file://
-   -->
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-core</artifactId>
-      <version>3.3.1</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-plugin-api</artifactId>
-      <version>3.3.1</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.plugin-tools</groupId>
-      <artifactId>maven-plugin-annotations</artifactId>
-      <version>3.3</version>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.maven.its.it-core-extensions</groupId>
-      <artifactId>maven-it-core-extensions-custom-scopes</artifactId>
-      <version>0.1</version>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-</project>

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a9857509/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo/org/apache/maven/its/it-core-extensions-custom-scopes/maven-it-plugin-core-extensions-custom-scopes-client/maven-metadata.xml
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo/org/apache/maven/its/it-core-extensions-custom-scopes/maven-it-plugin-core-extensions-custom-scopes-client/maven-metadata.xml b/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo/org/apache/maven/its/it-core-extensions-custom-scopes/maven-it-plugin-core-extensions-custom-scopes-client/maven-metadata.xml
deleted file mode 100644
index 46aea9c..0000000
--- a/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo/org/apache/maven/its/it-core-extensions-custom-scopes/maven-it-plugin-core-extensions-custom-scopes-client/maven-metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata>
-  <groupId>org.apache.maven.its.it-core-extensions-custom-scopes</groupId>
-  <artifactId>maven-it-plugin-core-extensions-custom-scopes-client</artifactId>
-  <versioning>
-    <latest>0.1</latest>
-    <release>0.1</release>
-    <versions>
-      <version>0.1</version>
-    </versions>
-    <lastUpdated>20170413003615</lastUpdated>
-  </versioning>
-</metadata>

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a9857509/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo/org/apache/maven/its/it-core-extensions-custom-scopes/maven-metadata.xml
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo/org/apache/maven/its/it-core-extensions-custom-scopes/maven-metadata.xml b/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo/org/apache/maven/its/it-core-extensions-custom-scopes/maven-metadata.xml
deleted file mode 100644
index e2ae4e1..0000000
--- a/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo/org/apache/maven/its/it-core-extensions-custom-scopes/maven-metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata>
-  <plugins>
-    <plugin>
-      <name>Maven Integration Test :: maven-it-plugin-core-extensions-custom-scopes-client</name>
-      <prefix>itcore-extensions-custom-scopes-client</prefix>
-      <artifactId>maven-it-plugin-core-extensions-custom-scopes-client</artifactId>
-    </plugin>
-  </plugins>
-</metadata>

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a9857509/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/settings-template.xml
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/settings-template.xml b/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/settings-template.xml
deleted file mode 100644
index 8649e57..0000000
--- a/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/settings-template.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<settings>
-  <profiles>
-    <profile>
-      <id>maven-core-it-repo</id>
-      <pluginRepositories>
-        <pluginRepository>
-          <id>maven-core-it</id>
-          <url>@baseurl@/repo</url>
-          <releases>
-            <checksumPolicy>ignore</checksumPolicy>
-          </releases>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-        </pluginRepository>
-      </pluginRepositories>
-    </profile>
-  </profiles>
-  <activeProfiles>
-    <activeProfile>maven-core-it-repo</activeProfile>
-  </activeProfiles>
-</settings>

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a9857509/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/client/.mvn/extensions.xml
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/client/.mvn/extensions.xml b/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/client/.mvn/extensions.xml
new file mode 100644
index 0000000..96a493a
--- /dev/null
+++ b/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/client/.mvn/extensions.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<extensions>
+  <extension>
+    <groupId>org.apache.maven.its.6210-core-extensions-scopes</groupId>
+    <artifactId>maven-it-core-extensions</artifactId>
+    <version>0.1</version>
+  </extension>
+</extensions>

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a9857509/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/client/pom.xml
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/client/pom.xml b/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/client/pom.xml
new file mode 100644
index 0000000..9cd5adb
--- /dev/null
+++ b/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/client/pom.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project>
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.apache.maven.its.it-core-extensions-custom-scopes</groupId>
+  <artifactId>test</artifactId>
+  <version>0.1</version>
+  <packaging>jar</packaging>
+
+  <name>Maven Integration Test :: it-core-extensions-custom-scopes</name>
+  <description>
+    Verify that Maven loads core extensions and components contributed by the extensions are available to regular
+    plugins. 
+  </description>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.its.6210-core-extensions-scopes</groupId>
+        <artifactId>maven-it-plugin</artifactId>
+        <version>0.1</version>
+        <executions>
+          <execution>
+            <id>validate-extensions</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>validate-session-execution-scoped</goal>
+              <goal>validate-session-scoped</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a9857509/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo-src/maven-it-core-extensions/.gitignore
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo-src/maven-it-core-extensions/.gitignore b/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo-src/maven-it-core-extensions/.gitignore
new file mode 100644
index 0000000..b83d222
--- /dev/null
+++ b/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo-src/maven-it-core-extensions/.gitignore
@@ -0,0 +1 @@
+/target/

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a9857509/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo-src/maven-it-core-extensions/pom.xml
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo-src/maven-it-core-extensions/pom.xml b/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo-src/maven-it-core-extensions/pom.xml
new file mode 100644
index 0000000..e2e1c18
--- /dev/null
+++ b/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo-src/maven-it-core-extensions/pom.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project>
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.apache.maven.its.6210-core-extensions-scopes</groupId>
+  <artifactId>maven-it-core-extensions</artifactId>
+  <version>0.1</version>
+  <packaging>jar</packaging>
+
+  <name>Maven Integration Test :: maven-it-core-extensions</name>
+  <description>
+    Maven core extensions components that use @SessionScope and @MojoExecutionScope Guice scopes
+  </description>
+  
+  <!-- 
+    mvn clean deploy -DaltDeploymentRepository=default::default::file://
+   -->
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-core</artifactId>
+      <version>3.3.1</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.sisu</groupId>
+        <artifactId>sisu-maven-plugin</artifactId>
+        <version>0.3.3</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>main-index</goal>
+              <goal>test-index</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a9857509/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo-src/maven-it-core-extensions/src/main/java/org/apache/maven/its/extensions/TestMojoExecutionScopedComponent.java
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo-src/maven-it-core-extensions/src/main/java/org/apache/maven/its/extensions/TestMojoExecutionScopedComponent.java b/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo-src/maven-it-core-extensions/src/main/java/org/apache/maven/its/extensions/TestMojoExecutionScopedComponent.java
new file mode 100644
index 0000000..810b999
--- /dev/null
+++ b/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo-src/maven-it-core-extensions/src/main/java/org/apache/maven/its/extensions/TestMojoExecutionScopedComponent.java
@@ -0,0 +1,12 @@
+package org.apache.maven.its.extensions;
+
+import javax.inject.Named;
+
+import org.apache.maven.execution.scope.MojoExecutionScoped;
+
+@Named
+@MojoExecutionScoped
+public class TestMojoExecutionScopedComponent
+{
+
+}

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a9857509/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo-src/maven-it-core-extensions/src/main/java/org/apache/maven/its/extensions/TestSessionScopedComponent.java
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo-src/maven-it-core-extensions/src/main/java/org/apache/maven/its/extensions/TestSessionScopedComponent.java b/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo-src/maven-it-core-extensions/src/main/java/org/apache/maven/its/extensions/TestSessionScopedComponent.java
new file mode 100644
index 0000000..1f37691
--- /dev/null
+++ b/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo-src/maven-it-core-extensions/src/main/java/org/apache/maven/its/extensions/TestSessionScopedComponent.java
@@ -0,0 +1,11 @@
+package org.apache.maven.its.extensions;
+
+import javax.inject.Named;
+
+import org.apache.maven.SessionScoped;
+
+@Named
+@SessionScoped
+public class TestSessionScopedComponent
+{
+}

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a9857509/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo-src/maven-it-core-extensions/src/main/resources/META-INF/maven/extension.xml
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo-src/maven-it-core-extensions/src/main/resources/META-INF/maven/extension.xml b/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo-src/maven-it-core-extensions/src/main/resources/META-INF/maven/extension.xml
new file mode 100644
index 0000000..aee3251
--- /dev/null
+++ b/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo-src/maven-it-core-extensions/src/main/resources/META-INF/maven/extension.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<extension>
+  <exportedPackages>
+    <exportedPackage>org.apache.maven.its.extensions</exportedPackage>
+  </exportedPackages>
+  <exportedArtifacts>
+    <exportedArtifact>org.apache.maven.its.6210-core-extensions-scopes:maven-it-core-extensions</exportedArtifact>
+  </exportedArtifacts>
+</extension>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a9857509/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo-src/maven-it-plugin/.gitignore
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo-src/maven-it-plugin/.gitignore b/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo-src/maven-it-plugin/.gitignore
new file mode 100644
index 0000000..b83d222
--- /dev/null
+++ b/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo-src/maven-it-plugin/.gitignore
@@ -0,0 +1 @@
+/target/

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a9857509/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo-src/maven-it-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo-src/maven-it-plugin/pom.xml b/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo-src/maven-it-plugin/pom.xml
new file mode 100644
index 0000000..5b65b0c
--- /dev/null
+++ b/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo-src/maven-it-plugin/pom.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project>
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.apache.maven.its.6210-core-extensions-scopes</groupId>
+  <artifactId>maven-it-plugin</artifactId>
+  <version>0.1</version>
+  <packaging>maven-plugin</packaging>
+
+  <name>Maven Integration Test :: maven-it-plugin-core-extensions-custom-scopes-client</name>
+  <description>
+    Maven plugin that fails if expected components were not contributed by the core extension
+  </description>
+
+  <!-- 
+    mvn clean deploy -DaltDeploymentRepository=default::default::file://
+   -->
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-core</artifactId>
+      <version>3.3.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-plugin-api</artifactId>
+      <version>3.3.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.plugin-tools</groupId>
+      <artifactId>maven-plugin-annotations</artifactId>
+      <version>3.3</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.maven.its.6210-core-extensions-scopes</groupId>
+      <artifactId>maven-it-core-extensions</artifactId>
+      <version>0.1</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+</project>

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a9857509/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo-src/maven-it-plugin/src/main/java/org/apache/maven/its/plugin/ValidateMojoExecutionScopedMojo.java
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo-src/maven-it-plugin/src/main/java/org/apache/maven/its/plugin/ValidateMojoExecutionScopedMojo.java b/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo-src/maven-it-plugin/src/main/java/org/apache/maven/its/plugin/ValidateMojoExecutionScopedMojo.java
new file mode 100644
index 0000000..83f7f65
--- /dev/null
+++ b/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo-src/maven-it-plugin/src/main/java/org/apache/maven/its/plugin/ValidateMojoExecutionScopedMojo.java
@@ -0,0 +1,25 @@
+package org.apache.maven.its.plugin;
+
+import org.apache.maven.its.extensions.TestMojoExecutionScopedComponent;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugins.annotations.Component;
+import org.apache.maven.plugins.annotations.Mojo;
+
+@Mojo( name = "validate-session-execution-scoped" )
+public class ValidateMojoExecutionScopedMojo
+    extends AbstractMojo
+{
+    @Component
+    private TestMojoExecutionScopedComponent component;
+
+    public void execute()
+        throws MojoExecutionException, MojoFailureException
+    {
+        if ( this.component == null )
+        {
+            throw new MojoExecutionException( "Expected core extension component is not available" );
+        }
+    }
+}

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a9857509/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo-src/maven-it-plugin/src/main/java/org/apache/maven/its/plugin/ValidateSessionScopedMojo.java
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo-src/maven-it-plugin/src/main/java/org/apache/maven/its/plugin/ValidateSessionScopedMojo.java b/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo-src/maven-it-plugin/src/main/java/org/apache/maven/its/plugin/ValidateSessionScopedMojo.java
new file mode 100644
index 0000000..38c0cf2
--- /dev/null
+++ b/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo-src/maven-it-plugin/src/main/java/org/apache/maven/its/plugin/ValidateSessionScopedMojo.java
@@ -0,0 +1,26 @@
+package org.apache.maven.its.plugin;
+
+import org.apache.maven.its.extensions.TestSessionScopedComponent;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugins.annotations.Component;
+import org.apache.maven.plugins.annotations.Mojo;
+
+@Mojo( name = "validate-session-scoped" )
+public class ValidateSessionScopedMojo
+    extends AbstractMojo
+{
+    @Component
+    private TestSessionScopedComponent component;
+
+    public void execute()
+        throws MojoExecutionException, MojoFailureException
+    {
+        if ( this.component == null )
+        {
+            throw new MojoExecutionException( "Expected core extension component is not available" );
+        }
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a9857509/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo/org/apache/maven/its/6210-core-extensions-scopes/maven-it-core-extensions/0.1/maven-it-core-extensions-0.1.jar
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo/org/apache/maven/its/6210-core-extensions-scopes/maven-it-core-extensions/0.1/maven-it-core-extensions-0.1.jar b/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo/org/apache/maven/its/6210-core-extensions-scopes/maven-it-core-extensions/0.1/maven-it-core-extensions-0.1.jar
new file mode 100644
index 0000000..aeef570
Binary files /dev/null and b/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo/org/apache/maven/its/6210-core-extensions-scopes/maven-it-core-extensions/0.1/maven-it-core-extensions-0.1.jar differ

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a9857509/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo/org/apache/maven/its/6210-core-extensions-scopes/maven-it-core-extensions/0.1/maven-it-core-extensions-0.1.pom
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo/org/apache/maven/its/6210-core-extensions-scopes/maven-it-core-extensions/0.1/maven-it-core-extensions-0.1.pom b/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo/org/apache/maven/its/6210-core-extensions-scopes/maven-it-core-extensions/0.1/maven-it-core-extensions-0.1.pom
new file mode 100644
index 0000000..e2e1c18
--- /dev/null
+++ b/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo/org/apache/maven/its/6210-core-extensions-scopes/maven-it-core-extensions/0.1/maven-it-core-extensions-0.1.pom
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project>
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.apache.maven.its.6210-core-extensions-scopes</groupId>
+  <artifactId>maven-it-core-extensions</artifactId>
+  <version>0.1</version>
+  <packaging>jar</packaging>
+
+  <name>Maven Integration Test :: maven-it-core-extensions</name>
+  <description>
+    Maven core extensions components that use @SessionScope and @MojoExecutionScope Guice scopes
+  </description>
+  
+  <!-- 
+    mvn clean deploy -DaltDeploymentRepository=default::default::file://
+   -->
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-core</artifactId>
+      <version>3.3.1</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.sisu</groupId>
+        <artifactId>sisu-maven-plugin</artifactId>
+        <version>0.3.3</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>main-index</goal>
+              <goal>test-index</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a9857509/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo/org/apache/maven/its/6210-core-extensions-scopes/maven-it-core-extensions/maven-metadata.xml
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo/org/apache/maven/its/6210-core-extensions-scopes/maven-it-core-extensions/maven-metadata.xml b/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo/org/apache/maven/its/6210-core-extensions-scopes/maven-it-core-extensions/maven-metadata.xml
new file mode 100644
index 0000000..ac57587
--- /dev/null
+++ b/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo/org/apache/maven/its/6210-core-extensions-scopes/maven-it-core-extensions/maven-metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>org.apache.maven.its.6210-core-extensions-scopes</groupId>
+  <artifactId>maven-it-core-extensions</artifactId>
+  <versioning>
+    <release>0.1</release>
+    <versions>
+      <version>0.1</version>
+    </versions>
+    <lastUpdated>20170507213501</lastUpdated>
+  </versioning>
+</metadata>

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a9857509/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo/org/apache/maven/its/6210-core-extensions-scopes/maven-it-plugin/0.1/maven-it-plugin-0.1.jar
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo/org/apache/maven/its/6210-core-extensions-scopes/maven-it-plugin/0.1/maven-it-plugin-0.1.jar b/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo/org/apache/maven/its/6210-core-extensions-scopes/maven-it-plugin/0.1/maven-it-plugin-0.1.jar
new file mode 100644
index 0000000..9bb5b8a
Binary files /dev/null and b/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo/org/apache/maven/its/6210-core-extensions-scopes/maven-it-plugin/0.1/maven-it-plugin-0.1.jar differ

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a9857509/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo/org/apache/maven/its/6210-core-extensions-scopes/maven-it-plugin/0.1/maven-it-plugin-0.1.pom
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo/org/apache/maven/its/6210-core-extensions-scopes/maven-it-plugin/0.1/maven-it-plugin-0.1.pom b/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo/org/apache/maven/its/6210-core-extensions-scopes/maven-it-plugin/0.1/maven-it-plugin-0.1.pom
new file mode 100644
index 0000000..5b65b0c
--- /dev/null
+++ b/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo/org/apache/maven/its/6210-core-extensions-scopes/maven-it-plugin/0.1/maven-it-plugin-0.1.pom
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project>
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.apache.maven.its.6210-core-extensions-scopes</groupId>
+  <artifactId>maven-it-plugin</artifactId>
+  <version>0.1</version>
+  <packaging>maven-plugin</packaging>
+
+  <name>Maven Integration Test :: maven-it-plugin-core-extensions-custom-scopes-client</name>
+  <description>
+    Maven plugin that fails if expected components were not contributed by the core extension
+  </description>
+
+  <!-- 
+    mvn clean deploy -DaltDeploymentRepository=default::default::file://
+   -->
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-core</artifactId>
+      <version>3.3.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-plugin-api</artifactId>
+      <version>3.3.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.plugin-tools</groupId>
+      <artifactId>maven-plugin-annotations</artifactId>
+      <version>3.3</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.maven.its.6210-core-extensions-scopes</groupId>
+      <artifactId>maven-it-core-extensions</artifactId>
+      <version>0.1</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+</project>

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a9857509/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo/org/apache/maven/its/6210-core-extensions-scopes/maven-it-plugin/maven-metadata.xml
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo/org/apache/maven/its/6210-core-extensions-scopes/maven-it-plugin/maven-metadata.xml b/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo/org/apache/maven/its/6210-core-extensions-scopes/maven-it-plugin/maven-metadata.xml
new file mode 100644
index 0000000..0ed5ded
--- /dev/null
+++ b/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo/org/apache/maven/its/6210-core-extensions-scopes/maven-it-plugin/maven-metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>org.apache.maven.its.6210-core-extensions-scopes</groupId>
+  <artifactId>maven-it-plugin</artifactId>
+  <versioning>
+    <latest>0.1</latest>
+    <release>0.1</release>
+    <versions>
+      <version>0.1</version>
+    </versions>
+    <lastUpdated>20170507211324</lastUpdated>
+  </versioning>
+</metadata>

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a9857509/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo/org/apache/maven/its/6210-core-extensions-scopes/maven-metadata.xml
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo/org/apache/maven/its/6210-core-extensions-scopes/maven-metadata.xml b/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo/org/apache/maven/its/6210-core-extensions-scopes/maven-metadata.xml
new file mode 100644
index 0000000..8e06970
--- /dev/null
+++ b/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo/org/apache/maven/its/6210-core-extensions-scopes/maven-metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <plugins>
+    <plugin>
+      <name>Maven Integration Test :: maven-it-plugin-core-extensions-custom-scopes-client</name>
+      <prefix>it</prefix>
+      <artifactId>maven-it-plugin</artifactId>
+    </plugin>
+  </plugins>
+</metadata>

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a9857509/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/settings-template.xml
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/settings-template.xml b/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/settings-template.xml
new file mode 100644
index 0000000..8649e57
--- /dev/null
+++ b/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/settings-template.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<settings>
+  <profiles>
+    <profile>
+      <id>maven-core-it-repo</id>
+      <pluginRepositories>
+        <pluginRepository>
+          <id>maven-core-it</id>
+          <url>@baseurl@/repo</url>
+          <releases>
+            <checksumPolicy>ignore</checksumPolicy>
+          </releases>
+          <snapshots>
+            <enabled>false</enabled>
+          </snapshots>
+        </pluginRepository>
+      </pluginRepositories>
+    </profile>
+  </profiles>
+  <activeProfiles>
+    <activeProfile>maven-core-it-repo</activeProfile>
+  </activeProfiles>
+</settings>