From 8b8163df99423d05110d44042d156c06a3f86d3d Mon Sep 17 00:00:00 2001 From: Benjamin Bentmann Date: Sun, 21 Nov 2010 21:33:37 +0000 Subject: [PATCH] [MNG-3775] [regression] Problem in dependency resolution with exclusion, pom parent o Added IT git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@1037566 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/maven/it/IntegrationTestSuite.java | 1 + ...775ConflictResolutionBacktrackingTest.java | 107 ++++++++++++++++++ .../apache/maven/its/mng3775/a/0.1/a-0.1.jar | Bin 0 -> 1985 bytes .../apache/maven/its/mng3775/a/0.1/a-0.1.pom | 45 ++++++++ .../apache/maven/its/mng3775/b/0.1/b-0.1.jar | Bin 0 -> 1986 bytes .../apache/maven/its/mng3775/b/0.1/b-0.1.pom | 45 ++++++++ .../apache/maven/its/mng3775/c/0.1/c-0.1.jar | Bin 0 -> 1984 bytes .../apache/maven/its/mng3775/c/0.1/c-0.1.pom | 45 ++++++++ .../apache/maven/its/mng3775/x/0.1/x-0.1.jar | Bin 0 -> 1933 bytes .../apache/maven/its/mng3775/x/0.1/x-0.1.pom | 36 ++++++ .../resources/mng-3775/settings-template.xml | 43 +++++++ .../test/resources/mng-3775/test-abc/pom.xml | 99 ++++++++++++++++ .../test/resources/mng-3775/test-acb/pom.xml | 99 ++++++++++++++++ .../test/resources/mng-3775/test-bac/pom.xml | 99 ++++++++++++++++ .../test/resources/mng-3775/test-bca/pom.xml | 99 ++++++++++++++++ .../test/resources/mng-3775/test-cab/pom.xml | 99 ++++++++++++++++ .../test/resources/mng-3775/test-cba/pom.xml | 99 ++++++++++++++++ 17 files changed, 916 insertions(+) create mode 100644 its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3775ConflictResolutionBacktrackingTest.java create mode 100644 its/core-it-suite/src/test/resources/mng-3775/repo/org/apache/maven/its/mng3775/a/0.1/a-0.1.jar create mode 100644 its/core-it-suite/src/test/resources/mng-3775/repo/org/apache/maven/its/mng3775/a/0.1/a-0.1.pom create mode 100644 its/core-it-suite/src/test/resources/mng-3775/repo/org/apache/maven/its/mng3775/b/0.1/b-0.1.jar create mode 100644 its/core-it-suite/src/test/resources/mng-3775/repo/org/apache/maven/its/mng3775/b/0.1/b-0.1.pom create mode 100644 its/core-it-suite/src/test/resources/mng-3775/repo/org/apache/maven/its/mng3775/c/0.1/c-0.1.jar create mode 100644 its/core-it-suite/src/test/resources/mng-3775/repo/org/apache/maven/its/mng3775/c/0.1/c-0.1.pom create mode 100644 its/core-it-suite/src/test/resources/mng-3775/repo/org/apache/maven/its/mng3775/x/0.1/x-0.1.jar create mode 100644 its/core-it-suite/src/test/resources/mng-3775/repo/org/apache/maven/its/mng3775/x/0.1/x-0.1.pom create mode 100644 its/core-it-suite/src/test/resources/mng-3775/settings-template.xml create mode 100644 its/core-it-suite/src/test/resources/mng-3775/test-abc/pom.xml create mode 100644 its/core-it-suite/src/test/resources/mng-3775/test-acb/pom.xml create mode 100644 its/core-it-suite/src/test/resources/mng-3775/test-bac/pom.xml create mode 100644 its/core-it-suite/src/test/resources/mng-3775/test-bca/pom.xml create mode 100644 its/core-it-suite/src/test/resources/mng-3775/test-cab/pom.xml create mode 100644 its/core-it-suite/src/test/resources/mng-3775/test-cba/pom.xml diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java b/its/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java index f33e920d4d..7ba0fc7e5b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java @@ -342,6 +342,7 @@ public class IntegrationTestSuite suite.addTestSuite( MavenITmng3807PluginConfigExpressionEvaluationTest.class ); suite.addTestSuite( MavenITmng3805ExtensionClassPathOrderingTest.class ); suite.addTestSuite( MavenITmng3796ClassImportInconsistencyTest.class ); + suite.addTestSuite( MavenITmng3775ConflictResolutionBacktrackingTest.class ); suite.addTestSuite( MavenITmng3769ExclusionRelocatedTransdepsTest.class ); suite.addTestSuite( MavenITmng3766ToolchainsFromExtensionTest.class ); suite.addTestSuite( MavenITmng3760BaseUriPropertyTest.class ); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3775ConflictResolutionBacktrackingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3775ConflictResolutionBacktrackingTest.java new file mode 100644 index 0000000000..cc4bbd172a --- /dev/null +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3775ConflictResolutionBacktrackingTest.java @@ -0,0 +1,107 @@ +package org.apache.maven.it; + +/* + * 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. + */ + +import org.apache.maven.it.Verifier; +import org.apache.maven.it.util.ResourceExtractor; + +import java.io.File; +import java.util.List; + +/** + * This is a test set for MNG-3775. + * + * @author Benjamin Bentmann + */ +public class MavenITmng3775ConflictResolutionBacktrackingTest + extends AbstractMavenIntegrationTestCase +{ + + public MavenITmng3775ConflictResolutionBacktrackingTest() + { + super( "[3.0,)" ); + } + + public void testitABC() + throws Exception + { + testit( "test-abc" ); + } + + public void testitACB() + throws Exception + { + testit( "test-acb" ); + } + + public void testitBAC() + throws Exception + { + testit( "test-bac" ); + } + + public void testitBCA() + throws Exception + { + testit( "test-bca" ); + } + + public void testitCAB() + throws Exception + { + testit( "test-cab" ); + } + + public void testitCBA() + throws Exception + { + testit( "test-cba" ); + } + + /** + * Verify that conflict resolution doesn't select nodes which are children of eventually disabled nodes. + * In other words, when a sub tree gets disabled, all previously selected winners among the children need to + * be revised. + */ + private void testit( String project ) + throws Exception + { + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3775" ); + + Verifier verifier = newVerifier( new File( testDir, project ).getAbsolutePath() ); + verifier.setAutoclean( false ); + verifier.deleteDirectory( "target" ); + verifier.deleteArtifacts( "org.apache.maven.its.mng3775" ); + verifier.getCliOptions().add( "-s" ); + verifier.getCliOptions().add( "settings.xml" ); + verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() ); + verifier.executeGoal( "validate" ); + verifier.verifyErrorFreeLog(); + verifier.resetStreams(); + + List test = verifier.loadLines( "target/test.txt", "UTF-8" ); + + assertTrue( project + " > " + test.toString(), test.contains( "a-0.1.jar" ) ); + assertTrue( project + " > " + test.toString(), test.contains( "b-0.1.jar" ) ); + assertTrue( project + " > " + test.toString(), test.contains( "x-0.1.jar" ) ); + assertTrue( project + " > " + test.toString(), test.contains( "c-0.1.jar" ) ); + } + +} diff --git a/its/core-it-suite/src/test/resources/mng-3775/repo/org/apache/maven/its/mng3775/a/0.1/a-0.1.jar b/its/core-it-suite/src/test/resources/mng-3775/repo/org/apache/maven/its/mng3775/a/0.1/a-0.1.jar new file mode 100644 index 0000000000000000000000000000000000000000..e15143524560b443fe19317dd2b021e474e76bf2 GIT binary patch literal 1985 zcmWIWW@h1H0D-sjN^QXmD8UJ&eO*Hwbv^yu^aG&EI2hglm4zI2_sRfD*8{N#vNB&s zKTkK;;1E4ux6i(3PWyQ4>RsgZ*3~+9=KSU$gDb`lo)+nNojal9t?R_W{$xqm6fx}s zDiu5DbO#B02L+eR)mkee!!0z~I7qZc_;k=`pp2JsvDbk|ek&^@J9o|u*eDXaeoD>+ z)@4;}AKl#c#O#S-fVm9Q1N_J?%S|jx&4YUbQ?U-F;{2j?y~KjV5*tsBHSzvhF8GA-ShIpm2*rC4Be~@45lQTRgj;nSCN}DH^kTfj)A~l z_fz#V)>Scds(9PGTy0yRyCExNm-fV^9gEFpo|O`^-YR=&)vNmV7V;CCc6<@(wf+2T zZ{_0_b^cVw?<-8EKdLBt;jiAHG*wdk=f@{mrr+&+{gkd3&i&B)eCIh<|GB8!+bFO)863JUVmY7MN3mA2BbvPszKq!TFd zmRY4k_eavsF8}k1hq+gs+wpGIips-hry1>Nb6aJ7LqOoPQQqxMOgk1dZ&H0|#Z|m) zjZ{|jTaokI*;14}K1>V0lAY?R^0~3&UBd2ZOA6Ir#~t#>wQphmaq}$iy`RB17PDNR z`K5gFU;W(NlVu7^8lxTy8$EFDnyR?SWz`z4b1q(6_pWlUNh-hWd}3?jl(SKS3g(YZ z5{~_1-e9`ymkf*Vm5O8WXfl zt&KJNfZx?ymuC6im39>t``P&V#ld$QHT{#NIwsyJWa90bs6086snDo#{bm(Ez6Vxu zwb5~FA5@i9T1KyV^qFPa^nzV6bB?aA*tsBsZ}ZXK*ERj(>FfUE#{k3wD|FhDbx4HhDRrjHole@Y$cg&IW(Yk5NHUILn=}PtW zC0`7A+SY7q(L8LfV=A)QK*IHH?*Ed-E9)iLzW1Mf(RSf|grCsj=w*i_DT-VRoF1bD^Ki_n%mD{)43*DT}dT%n>&R6vDSsBhfkocYB zJG*eo?!O0lB)GI!TK;Wz3#t^`dTGy;f5CF*i3i+kvO`_I{k$a2eeYkK@h{$@uj(5d z5)<^<%g!(8yqoQFV%l-tU)-=f&H*l@Ue1yUu}!v)(3^%gJcR8}sGc%h=iS9($2;j)LL#?h zz1w|2H?% zGCqqzWhDfFEItTi!cBmcoG|OLmz@aB?=UqJC`oaf3@S?@0OTwSMhs`+H5pX0!pz2A zw!%zb(%3?>+0c>}*$Pk + + + + + 4.0.0 + + org.apache.maven.its.mng3775 + a + 0.1 + jar + + + + org.apache.maven.its.mng3775 + b + 0.1 + compile + + + + + + maven-core-it + file:///${basedir}/repo + + + diff --git a/its/core-it-suite/src/test/resources/mng-3775/repo/org/apache/maven/its/mng3775/b/0.1/b-0.1.jar b/its/core-it-suite/src/test/resources/mng-3775/repo/org/apache/maven/its/mng3775/b/0.1/b-0.1.jar new file mode 100644 index 0000000000000000000000000000000000000000..7a36629c88e3974c4c0ac8da4f69c5bacb5b4825 GIT binary patch literal 1986 zcmWIWW@h1H0D%YdN^QXmD8UJ&eO*Hwbv^yu^aG&EI2i5%m4zI2_sRfD*8{N#vNB&s zKTkK;;1E4ux6i(3PWyQ4>RsgZ*3~+9=KSU$gDb`lo)+nNojal9t?R_W{$xqm6fx}s zDiu5DbO#B02L+eR)mkee!!0z~I7qZc_;k=`pp2JsvDbk|ek&^@J9o|u*eDXaeoD>+ z)@4;}AKl#c#O#S-fVm9Q1N_J?%S|jx&4YUbQ?U-F;{2j?y~KjV5*ts65K2fhI7Ecy~)h+{X7!`LpLh}gDJ^o73AmYRpjQ(4e|BA?I5r> z`cwT3H`|6OHx|k-%IXc|a@p!7%-OEgCtdwW=f>`L@1)dM{km`cn!ms?rfO4K`Lnat zpVMULyz7#Y3&_+vdh*4I*?kPIO2K-YCSUxTW%tv>iZ}LnX_NWn&et)YSXz&X^ssDp zoiSBsp}&s#vNWzlJ?)7`&Ittu-Ot+{6tyNW#ky;0s615(k~n&O>cZwdN13N-9${*| zDCf{~qd|Y#>KAXA%xspwn(}&E*R1Pzax|N>S1jGt&da#bH|RXY~VT=)He*P}@r zObyRO@|LZ-Htkr>t2pgh8%`Wsx43$D`!bu}mFjLq?VKhWZhbvzhAtmD_MLmAA$Qn! z%dc&F;trmD^D1jwgsZrr&iV&AJ1zRdE*3dnlu7H3zW!5A_uTOY6P2vy-9eGRj!eAG znPhci_P+ghyN`*+CLJ=jQH)et9nm(y^Hycz^+hhB1-ZFbT=bW^YV63I=DzzJx9_~y zK5B2PHKy)4e59r9i=$%jncbxv_7%bTQa}FB*(%05b5f|}Qbo(lvqLtpi^wfMtMBsd z-;W>3557nGat62MMWY{*~w>4IH+Rr0^v_p{yhJFffp zLrmkt+tl;#BuzF}_j2C+w8OQY5thk0z@^j=**~v}fjOfTh;7KqAq7SG1*t_PnW@F1 zXEt&*8wfC5_^a^0;DMY_t^n)uATRdaTkH#7nVwBhO6U3V{`R~6@L0=D0nb>M^Y?{V zXswWQKT@p~5xph$z2Dx~A8IO-a@Pa~M0}g@C}B(J16A4ExssDAe5KFkUwd7DQSp6M z@4n3F-FFAPLuo zR3ziG7*tq70LbElKqlM-SkVcy9(&=5(EJWlGl8NMx5=Qw6aqlbvS7q;7G9G + + + + + 4.0.0 + + org.apache.maven.its.mng3775 + b + 0.1 + jar + + + + org.apache.maven.its.mng3775 + x + 0.1 + compile + + + + + + maven-core-it + file:///${basedir}/repo + + + diff --git a/its/core-it-suite/src/test/resources/mng-3775/repo/org/apache/maven/its/mng3775/c/0.1/c-0.1.jar b/its/core-it-suite/src/test/resources/mng-3775/repo/org/apache/maven/its/mng3775/c/0.1/c-0.1.jar new file mode 100644 index 0000000000000000000000000000000000000000..1635d9ca937136e6106f9ae6f989f55932151bdc GIT binary patch literal 1984 zcmWIWW@h1H0DRsgZ*3~+9=KSU$gDb`lo)+nNojal9t?R_W{$xqm6fx}s zDiu5DbO#B02L+eR)mkee!!0z~I7qZc_;k=`pp2JsvDbk|ek&^@J9o|u*eDXaeoD>+ z)@4;}AKl#c#O#S-fVm9Q1N_J?%S|jx&4YUbQ?U-F;{2j?y~KjV5*tsGTbZ z`cwT3H`|6OHx|k-%IXc|a@p!7%-OEgCtdwW=f>`L@1)dM{km`cn!ms?rfO4K`Lnat zpVMULyz7#Y3&_+vdh*4I*?kPIO2K-YCSUxTW%tv>iZ}LnX_NWn&et)YSXz&X^ssDp zoiSBsp}&s#vNWzlJ?)7`&Ittu-Ot+{6tyNW#ky;0s615(k~n&O>cZwdN13N-9${*| zDCf{~qd|Y#>KAXA%xspwn(}&E*R1Pzax|N>S1jGt&da#bH|RXY~VT=)He*P}@r zObyRO@|LZ-Htkr>t2pgh8%`Wsx43$D`!bu}mFjLq?VKhWZhbvzhAtmD_MLmAA$Qn! z%dc&F;trmD^D1jwgsZrr&iV&AJ1zRdE*3dnlu7H3zW!5A_uTOY6P2vy-9eGRj!eAG znPhci_P+ghyN`*+CLJ=jQH)et9nm(y^Hycz^+hhB1-ZFbT=bW^YV63I=DzzJx9_~y zK5B2PHKy)4e59r9i=$%jncbxv_7%bTQa}FB*(%05b5f|}Qbo(lvqLtpi^wfMtMBsd z-;W>3557nGat62MM00Rr%QVByr04KXZeQ3lae}B z{8eO1gAHwNm#hDG-Ki-paCh&5yD59T_U^p8<(0&(?~eLvA8v10{L=ohrA5ZkElj`f zD&LX!neg@-`{iT}ou$vd@Jo3-&Aj0;Tjk6ASp~vBY7T4TIHE=~6g+HuO~Jb&y? zPp22}suxA)rSQ&t{NPT4&fI0}k+~*LlQ$im5&X52+C&_h5V!0^@)L?aczFm2e2V31-ESkkBtB;neS z3S@j1gNjNB09kwx$b_2!D>z}+V=p=pn%`k+CQy*#HW^fuLIB8F7K|9q!fP_9V1=2D zy=aA*zNE2*WV4|KEwUA$8WcToBCJ@-LaOsYRv?mUfHx}}$TW5!v;@` + + + + + 4.0.0 + + org.apache.maven.its.mng3775 + c + 0.1 + jar + + + + org.apache.maven.its.mng3775 + x + 0.1 + compile + + + + + + maven-core-it + file:///${basedir}/repo + + + diff --git a/its/core-it-suite/src/test/resources/mng-3775/repo/org/apache/maven/its/mng3775/x/0.1/x-0.1.jar b/its/core-it-suite/src/test/resources/mng-3775/repo/org/apache/maven/its/mng3775/x/0.1/x-0.1.jar new file mode 100644 index 0000000000000000000000000000000000000000..fcf7d967e31cac08ff10a54f134f685a4a78956c GIT binary patch literal 1933 zcmWIWW@h1H00HHBrM6%Ol;8x?zOEsTx}JV+`T~t1dKY=Ub+yi&Ilno`;EM5sr$stm=T7K&>pF3;KUoqsMNIpE zO2y7O-9f_MLBS<+wbqKra0^W~4ic>qJ{|NKDC1>Z>~-Lg-^$9!&Yd#@Hj2cqpOQ0y zby*eLM>n@UF?(VdU@pV-06((Jaudr^^WfgVRIG!kIKL=eFR>soIU`jMtXnU$q*yOE zFWuPO+!T*VdL)`u0XK_-K@1qUTDeStvzQndRQh^OD3&*wV0W&klSptucyh|{qH4Cq|W}<@}~H=-tm^{ zvv)O#FEg3`=#Vw{GC6~Zr<=Mz9oij#<`4h9)F)Q!g!g@_y}t9QrSL4#1eF=4%{vxa z)*0d-GGwJzZDQ?ZQZh@xFCEuwD^ ztjfxLdG^@LxlXOFmW8r=H~+pdrP;?i!Q;CHW9y<99pdQ|Qsip-Hml4&;JoRF(f;@Y z&Nb!Y%e$YbHUE^2IeYna%EU9lHfI(5W4|_OIUR>GV=WjlXEnTtlCjViMvifDJK|S+UaGiW;;dC>)S@ix2htM~_ zUuPSxicmH^uD(k)|3ja6Apf=VA0>a^X=xE}&se?cM4tINh04Fho*(rOUe!;MZaue4XOh?M{9<4tF9l*7vJ!hiQGP*cQAuWMvFMqNT!#z< z7%u#M@bBS*YLBd?TP}FI$dp`^x43PbmJzfr^TPh{@5fjB3AtLHcIoGj-QnS~A}@ML zwpNIBQSAMay}2(6_5|n7b=6pu?NPYlm|}(R?V@>YOYVI*^w|5%pLm}Wt7k60zxAzL zqiMT(|4;V&9Pt6(j7%cTxXVwVkAOgc;jJTxMk-BV+OU_WAjKfCq){D6!nGlluJ|kl zm3t5XviKm72{!>&3c{?%UJfEOzr)l_pj5 + + + + + 4.0.0 + + org.apache.maven.its.mng3775 + x + 0.1 + jar + + + + maven-core-it + file:///${basedir}/repo + + + diff --git a/its/core-it-suite/src/test/resources/mng-3775/settings-template.xml b/its/core-it-suite/src/test/resources/mng-3775/settings-template.xml new file mode 100644 index 0000000000..f22a7f3570 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-3775/settings-template.xml @@ -0,0 +1,43 @@ + + + + + + + + maven-core-it-repo + + + maven-core-it + @baseurl@/../repo + + ignore + + + false + + + + + + + maven-core-it-repo + + diff --git a/its/core-it-suite/src/test/resources/mng-3775/test-abc/pom.xml b/its/core-it-suite/src/test/resources/mng-3775/test-abc/pom.xml new file mode 100644 index 0000000000..660dfc1bde --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-3775/test-abc/pom.xml @@ -0,0 +1,99 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng3775 + abc + 0.1 + jar + + Maven Integration Test :: MNG-3775 + + Verify that conflict resolution doesn't select nodes which are children of eventually disabled nodes. + In other words, when a sub tree gets disabled, all previously selected winners among the children need to + be revised. + + + + + + org.apache.maven.its.mng3775 + a + 0.1 + compile + + + org.apache.maven.its.mng3775 + b + 0.1 + compile + + + + org.apache.maven.its.mng3775 + x + + + + + org.apache.maven.its.mng3775 + c + 0.1 + + test + + + + + + + org.apache.maven.its.plugins + maven-it-plugin-dependency-resolution + 2.1-SNAPSHOT + + target/compile.txt + target/test.txt + 1 + + + + resolve + validate + + compile + test + + + + + + + diff --git a/its/core-it-suite/src/test/resources/mng-3775/test-acb/pom.xml b/its/core-it-suite/src/test/resources/mng-3775/test-acb/pom.xml new file mode 100644 index 0000000000..da6e78393b --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-3775/test-acb/pom.xml @@ -0,0 +1,99 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng3775 + acb + 0.1 + jar + + Maven Integration Test :: MNG-3775 + + Verify that conflict resolution doesn't select nodes which are children of eventually disabled nodes. + In other words, when a sub tree gets disabled, all previously selected winners among the children need to + be revised. + + + + + + org.apache.maven.its.mng3775 + a + 0.1 + compile + + + org.apache.maven.its.mng3775 + c + 0.1 + + test + + + org.apache.maven.its.mng3775 + b + 0.1 + compile + + + + org.apache.maven.its.mng3775 + x + + + + + + + + + org.apache.maven.its.plugins + maven-it-plugin-dependency-resolution + 2.1-SNAPSHOT + + target/compile.txt + target/test.txt + 1 + + + + resolve + validate + + compile + test + + + + + + + diff --git a/its/core-it-suite/src/test/resources/mng-3775/test-bac/pom.xml b/its/core-it-suite/src/test/resources/mng-3775/test-bac/pom.xml new file mode 100644 index 0000000000..b400652de6 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-3775/test-bac/pom.xml @@ -0,0 +1,99 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng3775 + bac + 0.1 + jar + + Maven Integration Test :: MNG-3775 + + Verify that conflict resolution doesn't select nodes which are children of eventually disabled nodes. + In other words, when a sub tree gets disabled, all previously selected winners among the children need to + be revised. + + + + + + org.apache.maven.its.mng3775 + b + 0.1 + compile + + + + org.apache.maven.its.mng3775 + x + + + + + org.apache.maven.its.mng3775 + a + 0.1 + compile + + + org.apache.maven.its.mng3775 + c + 0.1 + + test + + + + + + + org.apache.maven.its.plugins + maven-it-plugin-dependency-resolution + 2.1-SNAPSHOT + + target/compile.txt + target/test.txt + 1 + + + + resolve + validate + + compile + test + + + + + + + diff --git a/its/core-it-suite/src/test/resources/mng-3775/test-bca/pom.xml b/its/core-it-suite/src/test/resources/mng-3775/test-bca/pom.xml new file mode 100644 index 0000000000..851d4ece3c --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-3775/test-bca/pom.xml @@ -0,0 +1,99 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng3775 + bca + 0.1 + jar + + Maven Integration Test :: MNG-3775 + + Verify that conflict resolution doesn't select nodes which are children of eventually disabled nodes. + In other words, when a sub tree gets disabled, all previously selected winners among the children need to + be revised. + + + + + + org.apache.maven.its.mng3775 + b + 0.1 + compile + + + + org.apache.maven.its.mng3775 + x + + + + + org.apache.maven.its.mng3775 + c + 0.1 + + test + + + org.apache.maven.its.mng3775 + a + 0.1 + compile + + + + + + + org.apache.maven.its.plugins + maven-it-plugin-dependency-resolution + 2.1-SNAPSHOT + + target/compile.txt + target/test.txt + 1 + + + + resolve + validate + + compile + test + + + + + + + diff --git a/its/core-it-suite/src/test/resources/mng-3775/test-cab/pom.xml b/its/core-it-suite/src/test/resources/mng-3775/test-cab/pom.xml new file mode 100644 index 0000000000..eb3347cab2 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-3775/test-cab/pom.xml @@ -0,0 +1,99 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng3775 + cab + 0.1 + jar + + Maven Integration Test :: MNG-3775 + + Verify that conflict resolution doesn't select nodes which are children of eventually disabled nodes. + In other words, when a sub tree gets disabled, all previously selected winners among the children need to + be revised. + + + + + + org.apache.maven.its.mng3775 + c + 0.1 + + test + + + org.apache.maven.its.mng3775 + a + 0.1 + compile + + + org.apache.maven.its.mng3775 + b + 0.1 + compile + + + + org.apache.maven.its.mng3775 + x + + + + + + + + + org.apache.maven.its.plugins + maven-it-plugin-dependency-resolution + 2.1-SNAPSHOT + + target/compile.txt + target/test.txt + 1 + + + + resolve + validate + + compile + test + + + + + + + diff --git a/its/core-it-suite/src/test/resources/mng-3775/test-cba/pom.xml b/its/core-it-suite/src/test/resources/mng-3775/test-cba/pom.xml new file mode 100644 index 0000000000..7c1984c7e8 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-3775/test-cba/pom.xml @@ -0,0 +1,99 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng3775 + cba + 0.1 + jar + + Maven Integration Test :: MNG-3775 + + Verify that conflict resolution doesn't select nodes which are children of eventually disabled nodes. + In other words, when a sub tree gets disabled, all previously selected winners among the children need to + be revised. + + + + + + org.apache.maven.its.mng3775 + c + 0.1 + + test + + + org.apache.maven.its.mng3775 + b + 0.1 + compile + + + + org.apache.maven.its.mng3775 + x + + + + + org.apache.maven.its.mng3775 + a + 0.1 + compile + + + + + + + org.apache.maven.its.plugins + maven-it-plugin-dependency-resolution + 2.1-SNAPSHOT + + target/compile.txt + target/test.txt + 1 + + + + resolve + validate + + compile + test + + + + + + +