diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469ReportConfigTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469ReportConfigTest.java index e7d574efd8..2ea972a5c4 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469ReportConfigTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469ReportConfigTest.java @@ -90,8 +90,18 @@ public class MavenITmng0469ReportConfigTest Verifier verifier = new Verifier( testDir.getAbsolutePath() ); verifier.deleteDirectory( "target" ); verifier.setAutoclean( false ); - verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-site:2.1-SNAPSHOT:generate" ); - verifier.assertFilePresent( "target/site/info.properties" ); + if ( matchesVersionRange( "(,3.0-alpha-1)" ) ) + { + verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-site:2.1-SNAPSHOT:generate" ); + verifier.assertFilePresent( "target/site/info.properties" ); + } + else + { + verifier.executeGoal( "validate" ); + Properties props = verifier.loadProperties( "target/config.properties" ); + assertEquals( "maven-it-plugin-site", props.getProperty( "project.reporting.plugins.0.artifactId" ) ); + assertFalse( "fail.properties".equals( props.getProperty( "project.reporting.plugins.0.configuration.children.infoFile.0.value" ) ) ); + } verifier.verifyErrorFreeLog(); verifier.resetStreams(); } diff --git a/its/core-it-suite/src/test/resources/mng-0469/test2/pom.xml b/its/core-it-suite/src/test/resources/mng-0469/test2/pom.xml index 61e002bd8a..031f06a80b 100644 --- a/its/core-it-suite/src/test/resources/mng-0469/test2/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-0469/test2/pom.xml @@ -43,6 +43,26 @@ under the License. fail.properties + + org.apache.maven.its.plugins + maven-it-plugin-expression + 2.1-SNAPSHOT + + target/config.properties + + project/build/plugins/8/configuration + + + + + test + validate + + eval + + + +