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/04/13 20:01:43 UTC
maven-integration-testing git commit: MNG-6210 allow maven custom
guice scopes in .mvn/extensions
Repository: maven-integration-testing
Updated Branches:
refs/heads/MNG-6210-custom-scoped-extensions [created] 66f162a4b
MNG-6210 allow maven custom guice scopes in .mvn/extensions
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/66f162a4
Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/66f162a4
Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/66f162a4
Branch: refs/heads/MNG-6210-custom-scoped-extensions
Commit: 66f162a4bd4daea1c86c1bda328b63484bed53de
Parents: 3941c79
Author: Igor Fedorenko <if...@apache.org>
Authored: Thu Apr 13 12:59:31 2017 -0700
Committer: Igor Fedorenko <if...@apache.org>
Committed: Thu Apr 13 13:01:13 2017 -0700
----------------------------------------------------------------------
.../apache/maven/it/IntegrationTestSuite.java | 1 +
...ITmng6210CoreExtensionsCustomScopesTest.java | 38 +++++++++++
.../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 0 -> 5359 bytes
...ven-it-core-extensions-custom-scopes-0.1.pom | 66 +++++++++++++++++++
.../maven-metadata.xml | 12 ++++
...core-extensions-custom-scopes-client-0.1.jar | Bin 0 -> 6719 bytes
...core-extensions-custom-scopes-client-0.1.pom | 66 +++++++++++++++++++
.../maven-metadata.xml | 13 ++++
.../maven-metadata.xml | 10 +++
.../settings-template.xml | 43 ++++++++++++
21 files changed, 569 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/66f162a4/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
index 40163f5..4f7d83e 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
@@ -695,6 +695,7 @@ public class IntegrationTestSuite
suite.addTestSuite( MavenIT0010DependencyClosureResolutionTest.class );
suite.addTestSuite( MavenIT0009GoalConfigurationTest.class );
suite.addTestSuite( MavenIT0008SimplePluginTest.class );
+ suite.addTestSuite( MavenITmng6210CoreExtensionsCustomScopesTest.class );
/*
* Add tests in reverse alpha order above.
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/66f162a4/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
new file mode 100644
index 0000000..133a391
--- /dev/null
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6210CoreExtensionsCustomScopesTest.java
@@ -0,0 +1,38 @@
+package org.apache.maven.it;
+
+import java.io.File;
+
+import org.apache.maven.it.util.ResourceExtractor;
+
+/**
+ * This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-6210">MNG-6210</a>:
+ * check that Maven loads core extensions and {@code @SessionScoped} and
+ * {@code @MojoExecutionScoped} components contributed by <code>.mvn/extensions.xml</code> are
+ * available to regular plugins.
+ */
+public class MavenITmng6210CoreExtensionsCustomScopesTest
+ extends AbstractMavenIntegrationTestCase
+{
+ public MavenITmng6210CoreExtensionsCustomScopesTest()
+ {
+ super( "(3.5.0,)" );
+ }
+
+ public void testCoreExtensionCustomScopes()
+ throws Exception
+ {
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-6210-core-extensions-custom-scopes" );
+
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+
+ verifier = newVerifier( new File( testDir, "client" ).getAbsolutePath() );
+ verifier.deleteDirectory( "target" );
+ verifier.deleteArtifacts( "org.apache.maven.its.it-core-extensions-custom-scopes" );
+ verifier.getCliOptions().add( "-s" );
+ verifier.getCliOptions().add( new File( testDir, "settings.xml" ).getAbsolutePath() );
+ verifier.executeGoal( "validate" );
+ verifier.verifyErrorFreeLog();
+ verifier.resetStreams();
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/66f162a4/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
new file mode 100644
index 0000000..cf00081
--- /dev/null
+++ b/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-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.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/66f162a4/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
new file mode 100644
index 0000000..c884723
--- /dev/null
+++ b/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-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.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/66f162a4/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
new file mode 100644
index 0000000..b83d222
--- /dev/null
+++ b/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo-src/maven-it-core-extensions-custom-scopes/.gitignore
@@ -0,0 +1 @@
+/target/
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/66f162a4/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
new file mode 100644
index 0000000..cf027ad
--- /dev/null
+++ b/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo-src/maven-it-core-extensions-custom-scopes/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.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/66f162a4/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
new file mode 100644
index 0000000..24a6c79
--- /dev/null
+++ 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
@@ -0,0 +1,12 @@
+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/66f162a4/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
new file mode 100644
index 0000000..e449188
--- /dev/null
+++ 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
@@ -0,0 +1,11 @@
+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/66f162a4/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
new file mode 100644
index 0000000..7ca43c1
--- /dev/null
+++ 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
@@ -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.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/66f162a4/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
new file mode 100644
index 0000000..b83d222
--- /dev/null
+++ b/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo-src/maven-it-plugin-core-extensions-custom-scopes-client/.gitignore
@@ -0,0 +1 @@
+/target/
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/66f162a4/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
new file mode 100644
index 0000000..a5d1434
--- /dev/null
+++ 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
@@ -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.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/66f162a4/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
new file mode 100644
index 0000000..50d7e3c
--- /dev/null
+++ 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
@@ -0,0 +1,25 @@
+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/66f162a4/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
new file mode 100644
index 0000000..a259ebe
--- /dev/null
+++ 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
@@ -0,0 +1,26 @@
+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/66f162a4/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
new file mode 100644
index 0000000..779faaf
Binary files /dev/null and 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 differ
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/66f162a4/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
new file mode 100644
index 0000000..cf027ad
--- /dev/null
+++ 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
@@ -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.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/66f162a4/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
new file mode 100644
index 0000000..037f7ac
--- /dev/null
+++ 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
@@ -0,0 +1,12 @@
+<?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/66f162a4/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
new file mode 100644
index 0000000..124e074
Binary files /dev/null and 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 differ
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/66f162a4/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
new file mode 100644
index 0000000..a5d1434
--- /dev/null
+++ 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
@@ -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.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/66f162a4/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
new file mode 100644
index 0000000..46aea9c
--- /dev/null
+++ 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
@@ -0,0 +1,13 @@
+<?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/66f162a4/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
new file mode 100644
index 0000000..e2ae4e1
--- /dev/null
+++ 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
@@ -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>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/66f162a4/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
new file mode 100644
index 0000000..8649e57
--- /dev/null
+++ b/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-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>