[MNG-7474] Add and fix IT (#192)

Author: gnodet

core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java

@@ -106,6 +106,7 @@ public static Test suite()
         // Tests that don't run stable and need to be fixed
         // -------------------------------------------------------------------------------------------------------------
         // suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- MNG-3137
+        suite.addTestSuite( MavenITmng7474SessionScopeTest.class );
         suite.addTestSuite( MavenITmng7529VersionRangeRepositorySelection.class );
         suite.addTestSuite( MavenITmng7443ConsistencyOfOptionalProjectsAndProfilesTest.class );
         suite.addTestSuite( MavenITmng7353CliGoalInvocationTest.class );

core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7474SessionScopeTest.java

@@ -40,7 +40,12 @@ public void testSessionScope()
     {
         File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-7474-session-scope" );
 
-        Verifier verifier = newVerifier( testDir.getAbsolutePath() );
+        Verifier verifier = newVerifier( new File( testDir, "plugin" ).getAbsolutePath() );
+        verifier.executeGoal( "install" );
+        verifier.verifyErrorFreeLog();
+        verifier.resetStreams();
+
+        verifier = newVerifier( new File( testDir, "project" ).getAbsolutePath() );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

core-it-suite/src/test/resources/mng-7474-session-scope/plugin/pom.xml

@@ -1,20 +1,15 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <parent>
-        <groupId>org.apache.maven.its.mng7474</groupId>
-        <artifactId>parent</artifactId>
-        <version>1.0-SNAPSHOT</version>
-    </parent>
-
+    <groupId>org.apache.maven.its.mng7474</groupId>
     <artifactId>plugin</artifactId>
     <version>1.0-SNAPSHOT</version>
     <packaging>maven-plugin</packaging>
 
     <properties>
         <maven.compiler.source>1.7</maven.compiler.source>
         <maven.compiler.target>1.7</maven.compiler.target>
-        <maven-version>3.1.1</maven-version>
+        <maven-version>3.2.5</maven-version>
     </properties>
 
     <dependencies>
@@ -23,6 +18,12 @@
             <artifactId>javax.inject</artifactId>
             <version>1</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-core</artifactId>
+            <version>${maven-version}</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.maven.plugin-tools</groupId>
             <artifactId>maven-plugin-annotations</artifactId>

core-it-suite/src/test/resources/mng-7474-session-scope/plugin/src/main/java/org/apache/maven/its/mng7474/TestComponent.java

@@ -19,12 +19,13 @@
  * under the License.
  */
 
-import javax.enterprise.context.SessionScoped;
 import javax.inject.Named;
 
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 
+import org.apache.maven.SessionScoped;
+
 @SessionScoped
 @Named
 public class TestComponent

…resources/mng-7474-session-scope/pom.xml …s/mng-7474-session-scope/project/pom.xmlcore-it-suite/src/test/resources/mng-7474-session-scope/pom.xml renamed to core-it-suite/src/test/resources/mng-7474-session-scope/project/pom.xml core-it-suite/src/test/resources/mng-7474-session-scope/pom.xml renamed to core-it-suite/src/test/resources/mng-7474-session-scope/project/pom.xml

@@ -7,7 +7,6 @@
     <packaging>pom</packaging>
 
     <modules>
-        <module>plugin</module>
         <module>project-a</module>
         <module>project-b</module>
     </modules>