This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git
The following commit(s) were added to refs/heads/master by this push: new 32a4d1b74 [MNG-7474] Add and fix IT (#192) 32a4d1b74 is described below commit 32a4d1b7443bb8700679c39a93c42ba423deb1da Author: Guillaume Nodet <gno...@apache.org> AuthorDate: Fri Sep 2 12:58:38 2022 +0200 [MNG-7474] Add and fix IT (#192) --- .../java/org/apache/maven/it/IntegrationTestSuite.java | 1 + .../apache/maven/it/MavenITmng7474SessionScopeTest.java | 7 ++++++- .../test/resources/mng-7474-session-scope/plugin/pom.xml | 15 ++++++++------- .../java/org/apache/maven/its/mng7474/TestComponent.java | 3 ++- .../mng-7474-session-scope/{ => project}/pom.xml | 1 - .../{ => project}/project-a/pom.xml | 0 .../{ => project}/project-b/pom.xml | 0 7 files changed, 17 insertions(+), 10 deletions(-) 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 8f3f160f9..089b4d1e1 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 @@ -106,6 +106,7 @@ public class IntegrationTestSuite // 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 ); diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7474SessionScopeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7474SessionScopeTest.java index 018681261..7619a3028 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7474SessionScopeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7474SessionScopeTest.java @@ -40,7 +40,12 @@ public class MavenITmng7474SessionScopeTest { 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(); diff --git a/core-it-suite/src/test/resources/mng-7474-session-scope/plugin/pom.xml b/core-it-suite/src/test/resources/mng-7474-session-scope/plugin/pom.xml index a51b8951b..f37a47ab6 100644 --- a/core-it-suite/src/test/resources/mng-7474-session-scope/plugin/pom.xml +++ b/core-it-suite/src/test/resources/mng-7474-session-scope/plugin/pom.xml @@ -1,12 +1,7 @@ <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> @@ -14,7 +9,7 @@ <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> diff --git a/core-it-suite/src/test/resources/mng-7474-session-scope/plugin/src/main/java/org/apache/maven/its/mng7474/TestComponent.java b/core-it-suite/src/test/resources/mng-7474-session-scope/plugin/src/main/java/org/apache/maven/its/mng7474/TestComponent.java index 7bc17dd91..d6d8eef9e 100644 --- a/core-it-suite/src/test/resources/mng-7474-session-scope/plugin/src/main/java/org/apache/maven/its/mng7474/TestComponent.java +++ b/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 @@ package org.apache.maven.its.mng7474; * 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 diff --git a/core-it-suite/src/test/resources/mng-7474-session-scope/pom.xml b/core-it-suite/src/test/resources/mng-7474-session-scope/project/pom.xml similarity index 94% rename from core-it-suite/src/test/resources/mng-7474-session-scope/pom.xml rename to core-it-suite/src/test/resources/mng-7474-session-scope/project/pom.xml index 6f8add86e..3ab320e90 100644 --- a/core-it-suite/src/test/resources/mng-7474-session-scope/pom.xml +++ b/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> diff --git a/core-it-suite/src/test/resources/mng-7474-session-scope/project-a/pom.xml b/core-it-suite/src/test/resources/mng-7474-session-scope/project/project-a/pom.xml similarity index 100% rename from core-it-suite/src/test/resources/mng-7474-session-scope/project-a/pom.xml rename to core-it-suite/src/test/resources/mng-7474-session-scope/project/project-a/pom.xml diff --git a/core-it-suite/src/test/resources/mng-7474-session-scope/project-b/pom.xml b/core-it-suite/src/test/resources/mng-7474-session-scope/project/project-b/pom.xml similarity index 100% rename from core-it-suite/src/test/resources/mng-7474-session-scope/project-b/pom.xml rename to core-it-suite/src/test/resources/mng-7474-session-scope/project/project-b/pom.xml