Hi, I can't see any flag to switch to legacy mode, is this intended? We are adding a new 'choice' element, will it be documented or is it for internal use ?
Enrico Il sab 22 set 2018, 20:44 <rfscho...@apache.org> ha scritto: > This is an automated email from the ASF dual-hosted git repository. > > rfscholte pushed a commit to branch MNG-5667 > in repository > https://gitbox.apache.org/repos/asf/maven-integration-testing.git > > commit 75e91ce7544349a27c348dd41e1bfaf00901d162 > Author: rfscholte <rfscho...@apache.org> > AuthorDate: Sat Sep 22 20:44:18 2018 +0200 > > [MNG-5667] Either install or deploy > --- > .../test/java/org/apache/maven/it/MavenIT0132PomLifecycleTest.java | 6 > +++++- > .../test/java/org/apache/maven/it/MavenIT0133JarLifecycleTest.java | 6 > +++++- > .../test/java/org/apache/maven/it/MavenIT0134WarLifecycleTest.java | 6 > +++++- > .../test/java/org/apache/maven/it/MavenIT0135EjbLifecycleTest.java | 6 > +++++- > .../test/java/org/apache/maven/it/MavenIT0136RarLifecycleTest.java | 6 > +++++- > .../test/java/org/apache/maven/it/MavenIT0137EarLifecycleTest.java | 6 > +++++- > .../java/org/apache/maven/it/MavenIT0138PluginLifecycleTest.java | 6 > +++++- > .../org/apache/maven/it/MavenIT0144LifecycleExecutionOrderTest.java | 6 > +++++- > 8 files changed, 40 insertions(+), 8 deletions(-) > > diff --git > a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0132PomLifecycleTest.java > b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0132PomLifecycleTest.java > index a50ceab..c45d866 100644 > --- > a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0132PomLifecycleTest.java > +++ > b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0132PomLifecycleTest.java > @@ -54,7 +54,11 @@ public class MavenIT0132PomLifecycleTest > { > verifier.assertFilePresent( > "target/site-attach-descriptor.txt" ); > } > - verifier.assertFilePresent( "target/install-install.txt" ); > + if ( matchesVersionRange( "(,3.6.0)" ) ) > + { > + // MNG-5667 > + verifier.assertFilePresent( "target/install-install.txt" ); > + } > verifier.assertFilePresent( "target/deploy-deploy.txt" ); > verifier.verifyErrorFreeLog(); > verifier.resetStreams(); > diff --git > a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0133JarLifecycleTest.java > b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0133JarLifecycleTest.java > index d936a55..c528678 100644 > --- > a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0133JarLifecycleTest.java > +++ > b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0133JarLifecycleTest.java > @@ -56,7 +56,11 @@ public class MavenIT0133JarLifecycleTest > verifier.assertFilePresent( "target/compiler-test-compile.txt" ); > verifier.assertFilePresent( "target/surefire-test.txt" ); > verifier.assertFilePresent( "target/jar-jar.txt" ); > - verifier.assertFilePresent( "target/install-install.txt" ); > + if ( matchesVersionRange( "(,3.6.0)" ) ) > + { > + // MNG-5667 > + verifier.assertFilePresent( "target/install-install.txt" ); > + } > verifier.assertFilePresent( "target/deploy-deploy.txt" ); > verifier.verifyErrorFreeLog(); > verifier.resetStreams(); > diff --git > a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0134WarLifecycleTest.java > b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0134WarLifecycleTest.java > index 389c3e3..5d5f460 100644 > --- > a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0134WarLifecycleTest.java > +++ > b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0134WarLifecycleTest.java > @@ -56,7 +56,11 @@ public class MavenIT0134WarLifecycleTest > verifier.assertFilePresent( "target/compiler-test-compile.txt" ); > verifier.assertFilePresent( "target/surefire-test.txt" ); > verifier.assertFilePresent( "target/war-war.txt" ); > - verifier.assertFilePresent( "target/install-install.txt" ); > + if ( matchesVersionRange( "(,3.6.0)" ) ) > + { > + // MNG-5667 > + verifier.assertFilePresent( "target/install-install.txt" ); > + } > verifier.assertFilePresent( "target/deploy-deploy.txt" ); > verifier.verifyErrorFreeLog(); > verifier.resetStreams(); > diff --git > a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0135EjbLifecycleTest.java > b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0135EjbLifecycleTest.java > index bfa13d3..6f2184d 100644 > --- > a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0135EjbLifecycleTest.java > +++ > b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0135EjbLifecycleTest.java > @@ -56,7 +56,11 @@ public class MavenIT0135EjbLifecycleTest > verifier.assertFilePresent( "target/compiler-test-compile.txt" ); > verifier.assertFilePresent( "target/surefire-test.txt" ); > verifier.assertFilePresent( "target/ejb-ejb.txt" ); > - verifier.assertFilePresent( "target/install-install.txt" ); > + if ( matchesVersionRange( "(,3.6.0)" ) ) > + { > + // MNG-5667 > + verifier.assertFilePresent( "target/install-install.txt" ); > + } > verifier.assertFilePresent( "target/deploy-deploy.txt" ); > verifier.verifyErrorFreeLog(); > verifier.resetStreams(); > diff --git > a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0136RarLifecycleTest.java > b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0136RarLifecycleTest.java > index f765ba1..77a9779 100644 > --- > a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0136RarLifecycleTest.java > +++ > b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0136RarLifecycleTest.java > @@ -56,7 +56,11 @@ public class MavenIT0136RarLifecycleTest > verifier.assertFilePresent( "target/compiler-test-compile.txt" ); > verifier.assertFilePresent( "target/surefire-test.txt" ); > verifier.assertFilePresent( "target/rar-rar.txt" ); > - verifier.assertFilePresent( "target/install-install.txt" ); > + if ( matchesVersionRange( "(,3.6.0)" ) ) > + { > + // MNG-5667 > + verifier.assertFilePresent( "target/install-install.txt" ); > + } > verifier.assertFilePresent( "target/deploy-deploy.txt" ); > verifier.verifyErrorFreeLog(); > verifier.resetStreams(); > diff --git > a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0137EarLifecycleTest.java > b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0137EarLifecycleTest.java > index 6e4d7ba..30e5d48 100644 > --- > a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0137EarLifecycleTest.java > +++ > b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0137EarLifecycleTest.java > @@ -53,7 +53,11 @@ public class MavenIT0137EarLifecycleTest > verifier.assertFilePresent( > "target/ear-generate-application-xml.txt" ); > verifier.assertFilePresent( "target/resources-resources.txt" ); > verifier.assertFilePresent( "target/ear-ear.txt" ); > - verifier.assertFilePresent( "target/install-install.txt" ); > + if ( matchesVersionRange( "(,3.6.0)" ) ) > + { > + // MNG-5667 > + verifier.assertFilePresent( "target/install-install.txt" ); > + } > verifier.assertFilePresent( "target/deploy-deploy.txt" ); > verifier.verifyErrorFreeLog(); > verifier.resetStreams(); > diff --git > a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0138PluginLifecycleTest.java > b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0138PluginLifecycleTest.java > index 7c7c914..24a443f 100644 > --- > a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0138PluginLifecycleTest.java > +++ > b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0138PluginLifecycleTest.java > @@ -58,7 +58,11 @@ public class MavenIT0138PluginLifecycleTest > verifier.assertFilePresent( "target/surefire-test.txt" ); > verifier.assertFilePresent( "target/jar-jar.txt" ); > verifier.assertFilePresent( > "target/plugin-add-plugin-artifact-metadata.txt" ); > - verifier.assertFilePresent( "target/install-install.txt" ); > + if ( matchesVersionRange( "(,3.6.0)" ) ) > + { > + // MNG-5667 > + verifier.assertFilePresent( "target/install-install.txt" ); > + } > if ( matchesVersionRange( "(,2.2.0)" ) ) > { > verifier.assertFilePresent( > "target/plugin-update-registry.txt" ); > diff --git > a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0144LifecycleExecutionOrderTest.java > b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0144LifecycleExecutionOrderTest.java > index cedd8d5..5358233 100644 > --- > a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0144LifecycleExecutionOrderTest.java > +++ > b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0144LifecycleExecutionOrderTest.java > @@ -95,7 +95,11 @@ public class MavenIT0144LifecycleExecutionOrderTest > expected.add( "post-integration-test" ); > } > expected.add( "verify" ); > - expected.add( "install" ); > + if ( matchesVersionRange( "(,3.6.0)" ) ) > + { > + // MNG-5667 > + expected.add( "install" ); > + } > expected.add( "deploy" ); > > expected.add( "pre-site" ); > > -- -- Enrico Olivelli
