From 8be7c8c867f55b4076ab0b203d1959d0265bb06f Mon Sep 17 00:00:00 2001 From: "Vladislav.Soroka" Date: Wed, 11 Mar 2015 19:30:22 +0300 Subject: [PATCH] maven: test fixed; use local repo for another DependenciesImportingTest test (cherry picked from commit 8a5dbea) --- .../asm/asm-attrs/2.2.1/asm-attrs-2.2.1.jar | Bin 0 -> 7070 bytes .../asm-attrs/2.2.1/asm-attrs-2.2.1.jar.sha1 | 1 + .../asm/asm-attrs/2.2.1/asm-attrs-2.2.1.pom | 42 ++++++++++++++++++ .../asm-attrs/2.2.1/asm-attrs-2.2.1.pom.sha1 | 1 + .../asm/asm-attrs/maven-metadata-central.xml | 10 +++++ .../importing/DependenciesImportingTest.java | 4 ++ 6 files changed, 58 insertions(+) create mode 100644 plugins/maven/src/test/data/local1/asm/asm-attrs/2.2.1/asm-attrs-2.2.1.jar create mode 100644 plugins/maven/src/test/data/local1/asm/asm-attrs/2.2.1/asm-attrs-2.2.1.jar.sha1 create mode 100644 plugins/maven/src/test/data/local1/asm/asm-attrs/2.2.1/asm-attrs-2.2.1.pom create mode 100644 plugins/maven/src/test/data/local1/asm/asm-attrs/2.2.1/asm-attrs-2.2.1.pom.sha1 create mode 100644 plugins/maven/src/test/data/local1/asm/asm-attrs/maven-metadata-central.xml diff --git a/plugins/maven/src/test/data/local1/asm/asm-attrs/2.2.1/asm-attrs-2.2.1.jar b/plugins/maven/src/test/data/local1/asm/asm-attrs/2.2.1/asm-attrs-2.2.1.jar new file mode 100644 index 0000000000000000000000000000000000000000..6b67fec01c71d95fcd4823987b21bb2b41af8874 GIT binary patch literal 7070 zcmb7J1yEeumPG@>oe=B=r||}Y6Wrb1CAdQe4Fq=&?k*unfZ)H(@=CM!!_DcezpP205$132A)rEYc7 zmrBDt%;jb-)`y{s(d+1ptU`FRZvcPk){-%YqW{vu^%7#5MZ8FufxTT!@!Tk=Ood@;{ZmP+_0B~AEEJSbA`}#!-z9l?JMwtgINRI$ z2H4y1So^r~So`{V`|#-cTHCs)TYF0Xj+|`#eC@eyU9Ek5vJ6*(s29i|liJf1Y)y&P z_P{u)0s<`xA0{0JG|-w?pOepy{Z|u~_oo@UD4~fwy#p()B;pe_ z7#=;0%+Nc~*Z|$nw<}qKJ{jg6Nyp9pV!e|ivKlWk@|lpUb)eC4yKbFiecr<0aEdZN zTy(1Zq_zxR%bcT$ZUe{0W^TyllAu+x@ruRLqXwlS6BtIj&r)}ce8_^HPpPRH9j#Gn zda*nYd0yEPzRlrwMeEy82=0ak2rTl^R$FC=`CM(9PVI{kYM538NsDK>6A?7}LMG~r z1vun^eLw`uQ*!saJdhHmq~uZ5;9;H%0g>8u;H5r-avcqxqIrEa?^x`sVH#8Q0?u z4L`91)vqdbwj@4;Bza$EILX)eR5ABIl_QvAUcKo)dUyi4?9ev1T6neOs!2jENtD-_>ATY^2WU2pN;yt*GFmt=ze1yd&IcFb=S&sT2{4 zyJRs$E6j0#FjU50c+w4zPIW zC95|=j;QY>u^`{TGkj47bKV1d2rsk2MFZS48;@MLet+^B;2x$sfH&6+Kf1 z(`e9cepg!u6V7F6ggqy%Ea;kb|f(Ic>UVe1N?W*S`v>3&k6ePQx!uqVp4x}HB z8DpIdrHg)t*Tj+Yw$Z8ut%(Kveqg7=MAyxxkw$QD!t#f*MW_5+a_A!U$b*S}1I_Juykh0PO{G016OVe`B=kpab_mBsBDJ^dL6Wbw~JoG60e7~fCUBI&U= zJ|Sl4OPExyd9CO7%y5kN8oVS>AHd2zUS^yDY55c0JXDC;j>&Gp(dW3rj8N>CytJkR zyL1Jk4};SgAP9*5VH)m3=k#zCR#8`K!8W8-kANfT$Xz5jmV&bc=})A(jc$1&$QTiB zRFKTQ7>SnBU)$XY*Q$Dfge@L)k{$u6cA@FC^=VN`20Yq58`fN)XT*#OYu&>>bm<+u zK8aK*9i|Ih+1T;@tRqZVOrZVNRxg?2rcc$$Ieeru;*%HV z#-8j^R+*5^d=x{nKS$mfpTDt|E=6F z?bd2}?Re>~(56d4Ot3$vQATrM234dx)T4Gt_p*|8HmMw7QVbr9RNTU#CtbQq@~r67U3M4mDe2W5D}{`D#qpWoyyD$MxJWMSzJsnt z!Bb?2A;Pq#=KPVTJ&RA7xJO7U?ByD%Ukro|S`h^3=SyS=ePlnA?+JSjUr;W;)nD$V z37x=SZn(u4ohfsFx>3w@DfIjzP@31Hk+sW2C6F^RJQDjzX7P;=>SI}&YG=MGTNl_= zPVZ_Km*LWlby{1{=9?K;8p#b(m=`qbz1 zSgBfRi6AL7WT$fW{CqQG5GvA8&skL+7(E8d)Mep1WMHgt~NWr|4>u1*&v_LP`AD&=Q|M2q+Yfdb$^_LSr*a)FO4 zYi=|NRSkyiRCR=nuiSkUL-_|D{d=<@4Tn|K3T~`wH-&N0!|-JISv2DCT?Fa=ujIoK z@7VgYqb^F&8NaLpzw6Vky2jW5FzfplVV2Wcfoxpk3;Y#bjaO( zkabSzbxA;5&~7ssZ8WjvMF~YmQzuaT$$Mb@csyM|OhAUL7Iez?5J)31JLp^CD?Y0= z!&_Tg1I-QRvm;A<{>4@6EO7}(4Ks^or#W*N&4LY7 zYh^qbkH!%r-!nw=ba($%)nMied$l(#UMz9!6Qik&0b)K=Kx{$`YvC@2E|#yZfmwsE!pgM(EX;Ra{?=3uP9(oa>-1l8v@VTy4a z@kZ&A!CYNrsX7yh?Qh%OzD<0Rm;GAVB_qCbs+nrtx9^Ii-MTSF*q(r<%1X#rbY-XL zV10cj=cLx>l+s4AJ%UR7gMMf>% zeOw#GO8!Dd-@heb&BYbnWXl26hg3)|F9VjY+`BmYM0&aUY9+H*O}0qZ$WEPRjvE)f zXkA{?diW!y3=MmV1u75NG`aS4OWMpj>NH6U9T2W35}OGlYY^lD_^M^P2PWF=+x1HR z(k7qBBkAIk$7zC)Cra5YgNwu`QPF$OL(nJwy7I$>hRo5JTE_`1b;{Aa1Gp_vU09Cq z!Y|`Tl_AY}p3NDlK(S$U)DlGorRhhi?bpQjd&n~O5RUcdja^cU^J@@U2yvBWt+d|DECih0& zWlQVp9!3XS)Z>_$TgAJ~Wr5V4LWyJAW9kG`U}e$%!_CO-o*4b{$jDc<<9#q=f7`3} ztdJtXBx0PEyV`Enu}-6Qksa3bxN{lY`B8F?y!Tuyoxb+AF0Gg!s&KQLzVPeldN>x? zO*L|?F1fqLwSOXQ_0?BZwHTD)`$?hv;G`1M((<|S&Gx|#vt3U{3iXKo(uQ-oq6fl+9>%(jAp?X@um+qnZxtb_*4Jers8 zss?^Y0=>#wHUvJ|;ZcR>$juE*nL$NpEbt}aId~44ZNZ>BPu_1c@YlJQ+;SJ(DIV9_ zHtcF(5d@sVj22ZfV`sv=H2$aI1OB-3XtKL1{Re{#n-G1NXB6sCjXc`2Uhw% zcoFndKOY`qHpQ|>{b?p59_E(^6Dwj(y1#EeF5uMbNyt*hiEy+rFt$47lY#B=p*JzX z*Unp&JCFin#Ts+IV+#=jZI#vsq2)|7_oDJGx@_^5f_f<$HP}X4SIMX7(;E?$(;{hD znD)wBQhBmcvrK@z3Isr|&2834>7Y6*Bl1;rc7`(lA`mi4RE78M@8U-4SKk*ohHJ8B z)XD__H=Rrjb!=CT)sm`PGgZvgqmS7AGaZ!iU4fV8%2zwOlYL3D8t`+Ee93`w$S*lf zc29Osjv8Ihs)%1W6l_K{CF(nm$3TN|BQD#dL{+Buka8Y7HX@2ql05ZvTR!tx_FCvG;q%xs3Ui7SBYGC6s& zO1vxpH&~pUvbh1XF5V#89&eIQb_A!O+=g}tu-KZV>eUj@tyi<>usq~RHKAvgoC^rd zS&fJ2G4UD7^Gx0t`C~fko&O}!aTS@Wdg7TL&+%rnzNB_J8B%!7CJ6_RAxlU*tayeg zsrq2x#!g67id72k63jnZvoqD&pS4vicO%XmubWD85+M>j%xyLXSb}EY1$25!aBK~< zP$QV5L-20R1x|EA1WEm!z(`E84J}Gl8hF6_Jm5|S)a;9SDcErXtr8Y@&z84 zFaO9)Gpt3p6e?bTj{Bfqkk$8`0kbFT+6Nazjl{?7k-MY9>?ypyB0~_s4sk)b*R8mq zsOQX-vli(K`yduC`!1fhH0PH5iMv-n>8-kkXmm?u0th@YV~}fBd&D&3hh``#weWHt z>Sip$?_VTaZ+o$GH}Jb2rFz{4ITwW^Z7J}qUqV_5pq2*W$)?#0bORZsw^mIX@0(3p z%6W{=q74o%S5n6c#+=t&F3p33i|x*pl}c9kT2HDG?;%&4#AY4-&%P=ANc}iTE7G$U zu!(LwA=45?p1z{&-zK%gv?3QbN#UQNl|cZzvi8I1Xu!wm*m*WuUpj*-ZhbmaK@&Eb!xGpATrk%m6c#7|AQ5xys zM4P!kaWCe59nLld4SKlZ-(~^CI7TBI$0ALy z#fDCTz2zo^_1l0`)o)l`Lr2}lK?(?%) zGtX>Q)-D1rXiT#}vngNJ^X_xW4z^R}%Zc7s_Q=f9%>x_lqOBh?Q9(w~q&OVo^#)aW z`LQ3#;V{}R~O1j@_*^CjRSuVC16C8+Rwuc%>%wQIIQ(ioPk;QHfxn$ST~`&t^{qvM3l z4nM)_L3h%A;T;iwHGNh7viug-zLYrB&zBSLNvFFCYIo|9spwgcgl#L%E!{jOdIgw7 zakL71j7~50uV>#AcID@$g=>_0vztjJ9TR;KN^{+8QZeGMjG%)PbOpqC^D~tsUJkAV zQ~Qrr1e&K2-9TRK)ym#*E2$H^Zd`sGs$d17qSg~ZO6evIA7VxJ=NdPX`8>htkLZG3 zji03-W8#+a^M3vHK+)`SX+`ij!!#9&{n!=(6X>3+H*2Nl@AcM>T77qI4|a$5&K||Y zq|P4=c^Syg@0_*_CZj;Gs#({asD(vy<3&9-%=Bh12*ec#zhaQG`Q@v;?0tMUlWDERGn@}~Q7AOc=&OO(ALS4+`&k#fzX zKd)Exso@g4ztI_>=t+8vR6SffJLL#m&cCVOv!H=fq%sBT0%L#m*CW{zTvn=kVlOKEBafuQhyOhHANRN8TKxn5c@Clz*B zlsYA+u~rFR42{*d6c|E*KFOq8VgWYY{d2SDbAW*3!~N;Ee$=nS>a!@Q>2LW^*-@QP z;b?ZK@hB|XR60?g>mtX8%-ojl7CG0dAnb>s-@HW=NF1D2kNqaxZQl#spMuI=1B15n zR=!`_eDqbF*Na*DaK7fYS)M17M(b{U6Z);(r1eeM#?j(ccY!lRPZhr!C(d6e!ahL; zUODs;yn7@rSXZ!G3=oH;E2-j=j8Zt0EbBnpX(syt(iZU%=XGl^aMS1eX!XJCyyHAc zE`~Q_br%yiy}}vzMwtfaI)1^MP>H9xZx_v~NtfI>n+(r|n`b+YJI!AggE1OT{Fz@% zckW{=XFHj`LS#qoL&tBDx0SW%PV16x2KTi_zWO|Pi_SBS>F9*V!!@7gJZruh?=El8 zoN|9J))wj4N$)B%%AR=3L6(3ktw?=Y5c3*&M{5@ZJCq3g!2ej-u!3dUNaoJob7bZQRv&>3*uq=WZlfFJ@@F^-O z8jF6x@EU*{&Wy^cAB>_tqL`!WMb1plp{3sd^L>)fixJHH-34{a&Wkjlr8BCL^PK1e z`&wqe9QCTD20qD2?g243@}vDGL>o5Qc1z>vbVSx_Z3O6)Hn^`3mK6mndH$^lh(YnVaOG-n?Q$#g~yeMgd!@$sC$25Ad&m zJxaVu*U{sxC{c!uSO`Z7q+>j4uaCv|5l0u)D?Xs1jv=y*%A#Tt)eyTN;EDw~LS<21 zH4)ypLx1^eojVQk@zpSgF!4o`Rv6NJ-2P$6jj^)vP{E}BV6@ZUT*&TNcSEb~o9{cP z;zI?EMRy{ANm8m4^^FIw?C>?cmMSV5*?&4X|Jv92{Y(F^>tDG%e + 4.0.0 + asm + asm-attrs + asm-attrs + 2.2.1 + http://asm.objectweb.org/ + 2000 + + + ebruneton + Eric Bruneton + Eric.Bruneton@rd.francetelecom.com + + Creator + Java Developer + + + + eu + Eugene Kuleshov + eu@javatx.org + + Java Developer + + + + + ObjectWeb + http://www.objectweb.org/ + + + + + + asm + asm + ${project.version} + + + + \ No newline at end of file diff --git a/plugins/maven/src/test/data/local1/asm/asm-attrs/2.2.1/asm-attrs-2.2.1.pom.sha1 b/plugins/maven/src/test/data/local1/asm/asm-attrs/2.2.1/asm-attrs-2.2.1.pom.sha1 new file mode 100644 index 000000000000..1b2d866f6360 --- /dev/null +++ b/plugins/maven/src/test/data/local1/asm/asm-attrs/2.2.1/asm-attrs-2.2.1.pom.sha1 @@ -0,0 +1 @@ +b9428b49290bc170ad9fd670fa3cfd066e4e5230 \ No newline at end of file diff --git a/plugins/maven/src/test/data/local1/asm/asm-attrs/maven-metadata-central.xml b/plugins/maven/src/test/data/local1/asm/asm-attrs/maven-metadata-central.xml new file mode 100644 index 000000000000..69de29bd9120 --- /dev/null +++ b/plugins/maven/src/test/data/local1/asm/asm-attrs/maven-metadata-central.xml @@ -0,0 +1,10 @@ + + + asm + asm-attrs + + + 2.2.1 + + + diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/DependenciesImportingTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/DependenciesImportingTest.java index e048df4faa99..0d824d9a1c51 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/DependenciesImportingTest.java +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/DependenciesImportingTest.java @@ -2248,6 +2248,10 @@ public class DependenciesImportingTest extends MavenImportingTestCase { //} // public void testVersionRangeInDependencyManagementDoesntBreakIndirectDependency() throws Exception { + MavenCustomRepositoryHelper helper = new MavenCustomRepositoryHelper(myDir, "local1"); + String repoPath = helper.getTestDataPath("local1"); + setRepositoryPath(repoPath); + createProjectPom("test" + "project" + "1" +