From 1790affa29a4b8722a0411754d42e895f460e510 Mon Sep 17 00:00:00 2001 From: Scott Frederick Date: Wed, 29 Jun 2016 22:16:31 -0400 Subject: [PATCH] Update gradle to 2.10. Update versions used in matrixTest. --- build.gradle | 63 +++++++++++------- gradle/wrapper/gradle-wrapper.jar | Bin 52266 -> 53636 bytes gradle/wrapper/gradle-wrapper.properties | 4 +- gradlew | 10 +-- publish-maven.gradle | 5 ++ .../build.gradle | 29 +++----- .../build.gradle | 5 ++ 7 files changed, 64 insertions(+), 52 deletions(-) diff --git a/build.gradle b/build.gradle index ee408ad..979d677 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,7 @@ buildscript { dependencies { classpath 'org.springframework.build.gradle:propdeps-plugin:0.0.7' classpath 'io.spring.gradle:spring-io-plugin:0.0.4.RELEASE' - classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.5.0' + classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.5.3' } } @@ -19,9 +19,11 @@ ext { tomcatVersion = "7.0.53" springAmqpVersion = "1.1.1.RELEASE" - springDataRedisVersion = "1.1.1.RELEASE" - springDataMongoVersion = "1.4.3.RELEASE" + springDataMongoVersion = "1.4.3.RELEASE" + mongoDriverVersion = "2.11.4" + + springDataRedisVersion = "1.1.1.RELEASE" jedisVersion = "2.1.0" lettuceVersion = "3.4.3.Final" @@ -31,7 +33,9 @@ ext { mysqlDriverVersion = "5.1.29" mariadbDriverVersion = "1.1.3" postgresDriverVersion = "9.0-801.jdbc4" + javaxMailVersion = "1.4.7" + cglibVersion = "3.1" jacksonVersion = "2.3.3" @@ -61,14 +65,15 @@ subprojects { apply plugin: 'propdeps-idea' apply plugin: 'propdeps-eclipse' apply plugin: "org.asciidoctor.gradle.asciidoctor" + asciidoctor { sourceDir = new File("docs/src/main/asciidoc") outputDir = new File("docs/target/generated-docs") options = [ - doctype: 'book', - attributes: [ - 'source-highlighter': 'coderay' - ] + 'doctype': 'book' + ] + attributes = [ + 'source-highlighter': 'coderay' ] } @@ -192,21 +197,33 @@ configure(rootProject) { ext { matrix = [ - "mongo14" : [springDataMongoVersion: "1.4.3.RELEASE"], - "mongo15" : [springDataMongoVersion: "1.5.5.RELEASE"], - "mongo16" : [springDataMongoVersion: "1.6.2.RELEASE"], - "mongo17" : [springDataMongoVersion: "1.7.0.RELEASE"], - "jedis22-redis11": [jedisVersion: "2.2.1", springDataRedisVersion: "1.1.1.RELEASE"], - "jedis23-redis12": [jedisVersion: "2.3.1", springDataRedisVersion: "1.2.1.RELEASE"], - "jedis23-redis13": [jedisVersion: "2.3.1", springDataRedisVersion: "1.3.0.RELEASE"], - "jedis24-redis13": [jedisVersion: "2.4.2", springDataRedisVersion: "1.3.0.RELEASE"], - "amqp11" : [springAmqpVersion: "1.1.4.RELEASE"], - "amqp12" : [springAmqpVersion: "1.2.2.RELEASE"], - "amqp13" : [springAmqpVersion: "1.3.6.RELEASE"], - "spring32" : [springVersion: "3.2.9.RELEASE"], - "spring40" : [springVersion: "4.0.5.RELEASE"], - "tomcat7" : [tomcatVersion: "7.0.53"], - "tomcat8" : [tomcatVersion: "8.0.24"], + "driver211-mongo14": [mongoDriverVersion: "2.11.4", springDataMongoVersion: "1.4.3.RELEASE"], + "driver211-mongo15": [mongoDriverVersion: "2.11.4", springDataMongoVersion: "1.5.5.RELEASE"], + "driver211-mongo16": [mongoDriverVersion: "2.11.4", springDataMongoVersion: "1.6.3.RELEASE"], + "driver213-mongo17": [mongoDriverVersion: "2.13.0", springDataMongoVersion: "1.7.2.RELEASE"], + "driver214-mongo18": [mongoDriverVersion: "2.13.0", springDataMongoVersion: "1.8.4.RELEASE"], + "driver214-mongo19": [mongoDriverVersion: "2.14.0", springDataMongoVersion: "1.9.2.RELEASE"], + "driver32-mongo19" : [mongoDriverVersion: "3.2.2", springDataMongoVersion: "1.9.2.RELEASE"], + "jedis25-redis14" : [jedisVersion: "2.5.2", springDataRedisVersion: "1.4.4.RELEASE"], + "jedis26-redis15" : [jedisVersion: "2.6.3", springDataRedisVersion: "1.5.2.RELEASE"], + "jedis27-redis16" : [jedisVersion: "2.7.3", springDataRedisVersion: "1.6.4.RELEASE"], + "jedis28-redis17" : [jedisVersion: "2.8.1", springDataRedisVersion: "1.7.2.RELEASE"], +// "lettuce34-redis15": [lettuceVersion: "3.4.3.Final", springDataRedisVersion: "1.5.2.RELEASE"], +// "lettuce34-redis16": [lettuceVersion: "3.4.3.Final", springDataRedisVersion: "1.6.4.RELEASE"], +// "lettuce34-redis17": [lettuceVersion: "3.4.3.Final", springDataRedisVersion: "1.7.2.RELEASE"], + "amqp11" : [springAmqpVersion: "1.1.4.RELEASE"], + "amqp12" : [springAmqpVersion: "1.2.2.RELEASE"], + "amqp13" : [springAmqpVersion: "1.3.9.RELEASE"], + "amqp14" : [springAmqpVersion: "1.4.6.RELEASE"], + "amqp15" : [springAmqpVersion: "1.5.6.RELEASE"], + "amqp16" : [springAmqpVersion: "1.6.0.RELEASE"], + "spring32" : [springVersion: "3.2.17.RELEASE"], + "spring40" : [springVersion: "4.0.9.RELEASE"], + "spring41" : [springVersion: "4.1.9.RELEASE"], + "spring42" : [springVersion: "4.2.6.RELEASE"], + "spring43" : [springVersion: "4.3.0.RELEASE"], + "tomcat7" : [tomcatVersion: "7.0.53"], + "tomcat8" : [tomcatVersion: "8.0.24"], ] } @@ -232,5 +249,5 @@ task dist(dependsOn: assemble) { } task wrapper(type: Wrapper) { - gradleVersion = '1.12' + gradleVersion = '2.10' } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index b5166dad4d90021f6a0b45268c0755719f1d5cd4..941144813d241db74e1bf25b6804c679fbe7f0a3 100644 GIT binary patch delta 12505 zcmZX4WmsHGuq|%E-Q7J9+(K}7cXxLkf(HpQI0SbK?(XjH5`w!2$s>?=&OP_;KV9GI z>Q&X%wR`vURB;k`U=BE$;=MAdHfI)>q`7?e5L02>e z3SAoY6_ZBL* zPaxa*x}w8&u4F;_{yd1N1IZ+sK&$8DoW$LJ^Aa0_1Ji5nY%vm;fG3Y`#x3I}sv7KDB{Kt$Q-bpd?P+OM#E zE%>~`0wZpl90|4phTB%w0Px_fHRa2WG(B}|*C^~My`yb&)Tr#W8P?^>0E%Gu+Pcwb zb(hcw2k) z$^KB&+09u!@uV~(0jzj0!_6_aw8)nY+KoRrDph(`hEylyDNIh&7Hl(?7af(PgcSe2 zDHauLjx`frL@BB_+a&W{SNy6>Br6~`cFHFlZ{AQCDl~oU={5H*_0(6nc0=PC7Xbr) zQdiHG@jKf=v)1UZpC=`e94-g}1FZ0Az9i3d=WOWF^YUByBY?&rrTqzzwIJCxb z3bI5f8Kga94lw}P8Z2>3_zMk9q{DMe!iqlT|Mm#!d-(^2TL3t+rZhgp}fCHV_0moPomPK$I z<3-99#cf4``OW;er6n1i3(t}R(O3p0F+}W?n|unch)fKWj4p+*%7kdlff^hlj*_^{ zMG{x=lco_=WEpUx5LZEnjTKCgsGfq(CI4tC8C?UfNT%k$XZa#j$)?Qvd>jHZ=AK!3 zdiUQKpn49O3GywiVKJlrrga*&3N+%MwB}r^Tg5{I0Xd=p{wAUZyz@risTH7VUR6-gQi&`a?L`v7XuH&}q1$wK)33tcBreXQ@C7ee& z{f3jfir@IoC764OlDmsvLI76ZL7qi)z5;bA3f%64N7>Z}8t>0t85d5~8S@fiQhsCG z*HhLoXF)9rn{yy#JLkS@5w>{RYZgO-h_>OjhNk3lUr!!g!SGF3O1yAtp2 z74I9QQ)q*(0U)&w&0Sd_HoL9@Ay3wKjY2<;={FeJMM{RBT9ndJP$-M-=|2)wkf+>n zp8TZCm7q?8pOCeU>x=zD6XZs-f|hBUjJK<+F+mlki?dO3XL;YExyH}H->A81mE?~Q zX?4KPVb@fXRpc_=mp_}z!B%G1=q$9FUn?Cnnt0fJ1xN`cJS?@SMKvvTf}FnlAB^&A!}epRq9zZw*|-`POtg|(uFoqvKU6M8;4l=KH^(gG8p-n_Bkjj9 zcy`5|Iv30zumGi5b-2RqNKwRzU?|{MS#U>kd!6e_ptQbG;V&7u=A$;5^cm3&;TNQy z<5qrYAdTZ0Q+6H7%~ZfXLNoP}Y~!FJl}5wAcn|0p@8BGHxL^^Y+%9^!#2QMGe zI>J^XLHUmL3>8YK2&VKK+3%I9P355#|G{aKE0)SHdT98|2Eg%f(od#b(?C(`c;>RU z6c>OWrTwD5E3Sl;sw)gsSQT%I;VR8LX9T`5g zF68Kf;o8md_+ zhhkv@rjB6G0m*%o{5p=#pYJIr5(*rgc#@ zsT_tq%+Y4qH0EqPMosaO*f~1PvH9T=`BVrcl~|coJz;ne!ZXs8kOQHmF*9{A!^Qwi zvOTv7gFp^k&jpDX2|9c^4GrR@()k`Vh1IGf*fkhM+&$-dGQM4G7a>x{L06Zd2+p{Q ztjV}ZG~*uZ;LGd94Xqf+&#l=sPzhg@IU+K6C^pFbYtO0oBHZ{7wkHb-h2o0TQRGU8 zJ!hqD*^CzQGiwWKtnttzsI;6lG>`%8q`|qz4wCVWh*LLXGA`VcW;@uV*;?7|aEyjng*M5q)Kj_!7prF+QbVR()c=Tms##84&L zP}yge8qAEeISD7J;5pPR6*f%G4SN;IW_AECQZs{l5r!?QJDPq2yDVHmp`0^|(70*CIm3`4R z!iaul`=RXd;+j-j`F+n{rCrS`ZJ+Iw?F%Y zED=q9-vjV@*x6IPPxS_TgujU%THkt-=8>fqPH{t}-_pDSN@QMiKib5fkR@#W8| z=%7|hT?s2!H#xtH%o=rL=-9Pd{lbZ<>4QtZO4Wj2p_13B`i&3}vXnAYmXaLkfSOH) zkCs4@lI~}|9|#q(a5Obs`&F2?ct0gxoT67(7D0s}%%ZV3Ke(z`l};j|hb3777$zT_ zc2e3aw0}`P=ZZdH?&2EBZuxOX3^FpR$UBrs?G83R1HGTAhkB`kbQqWl)yExVpRK*U#os3GpyCF^44l^X_J5q_okMyS~ zv|=j!ed9EbI`QpP`t*bZRu*BJB?h1d$&RvzgvGlxU){4+fqP!Mn^?-v`~q=bmK1{U zl_pF|T>F%LWAspqbQ6BY8(qbBqRNW(BonYhd0iz@OeS^Vcj|E)vU8B2P@fyS!0&t; z68JHX@fPGVQLW6_zpw(vH(Sk#Q`4weKN`&{OW>) zCc@HMphchazWRwU|77H+O_<8#ZXwmyEW;0e9*e_4fYpqK3mn^8CDpN3^2`1GZRu}^ zi#?+3H(l~@I0B}#GeVqSCJg5B$9}>=nt6}tK#h&aug@`I`ai$Z8T)BM)d-)w726j5 z^$g}6W&L+XD}T|VlL}jj`v64f{5E?{2s?{p?O18T^yDM2ZUq zv!;$KJ^+TPvKpV+EN(6;J)_mIh_|xbcKS(`m#jZ<6N5jF1sFML`%X+)FXUUovC|0k z!LnF$ze)xv$Ka2A77JZiG|!DHg}#BNWi##1=xO+Z6y372vttHJU!I$8jCo_L;J*}X zrWzB`g5OOBFp%ED>4WFuaF5A4><4o-?a+~`NdZK^TX-#;bG9ALs1d8Nf|)=3%(0&N zHq6Po7)`T4>`xfXI?j0?kEJf{FMI7tPbfr#dQ^VtkZokc9J|BT&aYRb9am|ULC*9o{h`Ox{`^x`bB}C zdJH(sj5qr9vrvj+FmaIwZ;%jgDvx$LxxhFU11F6Ol)Olbv539i^!IKIYem->=;%2i zxhy)a5U=BI!-c%OAa?5^k1VpR%+0m>ltcR=gF?lJd5CU1lQ3;)WJMiMM;%^+526v& zEUX}`jHXwb`{OZqrtGE|Nt2EH7b0%l^_7555{|D;rA33aofYAQXqzU*cnn2;WDf5w zeUVt21q+mj;!za%A@?Pl!jj7S)Chf2;C9?2Z$EKaEz70F9#efCahL5}!P}>-@j7!M zpmsk`Q{(>#xf6hHPKVEttV>9I%^b<}ol{!UW5?hkUX36hHpCh+L&yvFeqyXwGBO`9 zg%fQ+IGT^z@=b!nD0d}GqJE-G_$GCr=O$G=-mLwLHsO_TdYd0%%ug6d@lGcd5dj(P z5K~2|d*BC9CZJWTpq&85+|OYn$ugv;?SMAHlqFTdE67Vax?-rp!i;=AvEHc2=xTWG zgaAhh?yxr5KB^B znl)%%|LG{)oU|4ccX^}h_(KR|{(TL2a8uwIDZx*e$$RwtNaG2U89_>yDGc+62{#52 zYc$u7ox>Hsbg_&47&G&(5SpSM0ol%Tr5qDa%&4SLC4`yKB)!5*BI~)}%vK~6`y{1j z{-S|xB1qk(B^}qx?w6a5VTe<18~NJc0-vJtK`-G&AuJhoDy)2^W|f>NyE&$zEqt{M zif%P%tuB@82uU)Vx3ER&VkB=0LP|stz0$J}cqPFHfZ&;Q6O_bGsF^aL0RHB}bWbP0 zwbFNqUdz(_vn1f+D=)(Lt zEs8=tdn^VhVoX~G?c9ZIwVFDQ$;yUWhW6sxQLL*l+S>c5Y1GbX#ZwebcJyi|n*wcw z;Q0woPD5JK_o3>%@3J#O0NB3Jr$5q!n&F+=$UlCQgRX~Rg`BFJy$>Yhyd=q31Sl` zJsAd>YKifF{b!x#?{H;&Ww?4yd8A)j4;F{2KQJUW9s@R3Qe@aoIfHvhVo{7M0DtIg~iBOMLJx67rq)IvkUO`>N6DfVc7Czo2wz~ z@{^t|9DxK&!YictimE+7Hs>2GX*=E#Evu5rkmG9Hpm4l+@iUS z+Yg1jejPe*Jz$QATJ|@HB;cd%6PdYBAon4W;69l$ zGGL4{%VWWEJ!ieEj;CVu8L@<-_jGj0fypO&jq?WJU)*7fdXR%8I17$*QfhNHg0e`PMc?Uc*EUl@I#sZyfzS5%dC4Ob3AAgPr`% zcWRSow4If8;sb!mXOL_S6sgQPP^}(R>YKLK`q4@^Yb1R|>EFh?)1{%n$E)$olhB1w zE<#>F`~{q~`E!X5+$5)+~|kqdcQlp{q<=Q#ejm5p~Rja zvYIZGoVk^E0-1+Y9E|b0u@jw+ zH9M}rmNGk~r@mkKb^{wB=t0kWxe(6%@xqpHwNs?HzQ8w7;<@8vNxK*Zg|$i>;tkJVz^wIDO7`5~$p?*vqrk;QLKrw|YT9gkQgmUFvU@Ci){v9zzRx-RseP9H{TTu zVH`xLtPNX@#{Q^!Nc-;NLRA+A$v)(MIQMHz-D2Q(N!~=!$K5Q$P|S4e&?fHGejz(NRNehg?&N-A zy(j-0A4(KgXqC* zgoAq1_%T7B#e=lb4$Ix2*Ah1c9v@yj1;fj!Y^B~Mh~L){t;1$xtz%HEzuS7a` zKw(%qmy(@Eeaa?xDj}iD)qF6bT;C+!uYAlrO6=3~Px;*e_VJ%#Eu(vNW2<;$yjE_` zHF}*FI;}#@Ib;Fdd_kyuJdj)d)A{eqQdK|6(W(DTO0Ps6{F=4GJ^Ed9V<|;^>X|l# z)xa5s0r6yd1RdZ*Frq$uU@bd9JT&o9n6?V5v^Q~b4vV+>IamXu}D#;@{|a>gzw1$;XT z<@OS=ko-I2Tj-T1rXD{j&V65wMr)QzW#Vh1KnKpyF_0$HH_e-1V;)cEKd_yPvqDlh zOcW%e3FqdABI3r_3)7l&rhkI0-4^*llp`9R(iLG3Sg6BMx@wF)YmCuvnP(@mS!pu7 zDYnhvV$S>$=Ms|OXFmZ&jTNQuI+~hl z=Ty8oTP_U}y%{1pg#FQ`GR1e{_Kzy;hb^g-0Ex&%^AD_fTXtU~QdM~AtPkS9>{I7t z@!&o)Hvb-2wuktw#Qscy$0p+WA?ApkWw0SK;i~GajkF`BFAl-Fx#QXnBjN5B5z3<; zZ^4$w74$T6Qec9lPsr}Zi+@2M-rj>dOTSQ@rt~xNTR-WYG-#2(_yFJ;gJ*sUw0WJ zE7G%R9oZU1IckGb;UXEdofvH3tcu*9$NXz$jyGc@_{u_VDPjlD8VK31X^faK@)5{p z2?-?+;JrA3t};N|A*(VU1f?sB-d(jJ2tcbNMm^l~aO?F!qan6z?{`|zysqyMDtU@< zXBfDiHAUGdYQS3C zVc06Rvfekwmcm5#T>+WElKc(s#4QscYsTVYN}Y&C`M|jQ$(FH$Ft9ako=w$XNm_#G zOYuprGmz7|U5gHZ%{+)GT+eLmEEc#Aj&gl)VPE0(Zr~l+AcW=(3gO>t3Jm1k=6O@aGKJB(P4D5xq*s4DHRWB`{*p@AgMi;>PVI$ zJ^B^j%b{vY{7SH}TKytvFA{*Rq86n1wG4eq6q}pZa#?%c_-A2IOCx^mkZU^i_K>wP zrV6@_%p?_l-<0^FK_DqZhyt1gPs9=?t_zi|m4y$oOAK@aU$}_|eSJX|#>HT^FD6|z z=cI;}{haEe6&05i6_1sHp{pcj$+upmZ@r?a4w2P$a~f7v^C?JK204K7V6v@_NmBcn z2h+)mg(qhtgp)2l^)VyOal2*;`jH1mp#wtZNNxPX9b7&TksczL;hsTO&A{E~*BI2nsu{`Fo*d ziY~$pw5?$*Tq5Hvi#tCMB-ioBOu@dP!G4oM(6ENL*+Pc3aV-K|S|2>}9)Kk_MGIkm zL!T5uS$!(YVla`tK`Y)%VyfX!5gC_NtS!^9_JP5Q*WV>kzF9u8UZzQ}4OOc79++V2 zNK=^*1cm7f3qIS8d|lnJO>YM@3f^f=)YX=;>s^O=IyB2Z>gB&UHE|I?gS^4hhL=3E zJgQF}0K*l$7ux`2pGz8&Y-+KEti1>Gb^yFPZVha26M{h;sE_o}`jk^FFV@H1SIdYM z7!RS;BnUaHs$dYhsN8P{zKIFm%|27&DAGDKCa_OY>&{hPrQ5gvub72%HbOzTq0IfDiOApdkLET*OKNz z@=d@kmhn1U&xK~fnM)&BoMRGGGqSG86^559ADN=zxNgAwg>|&)y12YI7YOs2T`^TxvXppod z6RvcHpR-er9Iv!@2N)TRCG@2+M3ytKc%jL?`$|V+upoLkhwmwLay_HZv6aPAj}mo% zbm08G01W@+hIlD@dUfMK)ja2H{aN6jGcqd3pFf}jadS(mUXI3}UXI4Je~!l0kOI?i zum4Rij-j|`zLZSD$h{@L!Gp_I4!f5PkH)X>w5SaTE4d>$w%?1rT?IWVtvLDf;VDum-oDuJIch>A7OU$RH< z@7ZX8C$j8DI_qYCgb~0zw?~f({WXd0>)&tauDunp^@Tb;VvA-!9r?Uw1VAZTGcJ0j z4M9cbuAAjERKa7zVYQH>3fPn#X2(!9ri`E=vuU)zxuvQ3A~Qz&3p}B~Uc=^xh7rZO z<2UehK90fnPgkFP0@7+EN2&f){9*@r713E-lr z5?Qp90!?$4G?_dV!WG;IlqY_z;#aq^7;*iSw{RS}y1_G23~?77a-2A$$5D$~Dh}PRTY;Uzs!(sa-E>Mz8EuRZ`jZ9#F-s_9QPGwqoc)t4)Z_^5E(@!O;je zk9H~1&12~K`QEYrgA*EzNdJp%+;tCixu&1@a;b)5660;TpV70 zSq)xF_siX~DuLx{EEv@PFd5Z9_hf75Gwee>ajmM;GB&tPdTsy=J8cwj`vzmVSa+%t z;8iGyeGk>LFZn97P`b^&Ql5jvG^yr8O~7PS-xVJjxTsQfl(xTr$E7=Y{;p-n^SVLI zS$enu>HEGrf!&_FQjb=)7v3p#pch>5?%`ctAs|SPRkO^{xk;AyiPGQAr6oj(d#xWD z%u-b$S(NMATlj zpNbQ!Q_uMkV>h`Gd`w6+i@1)wgL^%1v*1p;fA{WF|9a1kAAOS%4Ixk_l1*8?+871a z(RT>n0=>M=9^Ze|Gk-G`{6~6MLO!&}G((%YT~KUQf8s7c2JoGv0&Gi|laPgSRCH;K z$aHIY)AvA@or?{#sJLaLr|=YtHs}yIDqGgKT`)?EI3ua{c^F~E5(7Mq?u*l|`edzC zTjTs$e=;^%DqA?O8OK@fsP+ZylJUzS#BvlidE}lLk3#(NXx{%rt0IdnzusV<|B*`l zqvE2J_5=<<$*5WS0AuvP!Jg3Z`^Poc{b*<_ysA?$9{uOg$e%x(tbhn=ll~EK<USQyMZXh`3oVlaCQjO6%&$iplMpoDRcL@+J+0d% zc&gRwIO6WWzx&!la#>hd@fB&1kY8xZ+{P}k89{$p%f_QyMN`)?KH*k7Z%1Tc*E#gJ z&qCkg^5SwhrtrdAlBNK7e3J(hL(vINpdzddlqM}ox*%t~`8PqU19(!R$tp-5YAr6J z2yf^-fbRZ!s9iSE1?QH`Cpu5NbCi6F8LeGpzPMl53?}qEAq!co=I=y3afY|)sE5=& zf}=1jg-l9Q`ckem=wGW%i(DCNb+WUAn(L9e%yG@VrM!DR8+1L{n3gH18#;m@ZvgUU2N@x0S5o?c*V zwZh;Ra<*z9>2ryQfpG!_jkAmvcE_BLO8a$Mpwj+fkA55KOW*G~4ONq@)KsuShR-?f zEZD)gPpSmSrfNFR4IOw%?PZ!2HSFQ&PA$IVS>MVlJ{5C^&BnEg#|mi;WWzT)CAC5i zqyf;3M; zN<)+$n(VUm;{l$ezn8~i~_J4!b= zB2&8q_CKl}HC`z7?RzK2UMO*alv*SJLECO(IR!E`eBX~1%Cbn8iBX5Ah-(kQM%|keU%G{3s_Lx=_hsu2%)o|ku5q;9 z?feFtP0`Vgu^A^5Qxbp2-*P@&!3y{{o_{6^B+{mX_#;%yYKMTmO29?ky*H>=@A(a? z?l;`~D^;7sg1+@im=VIfNmh1*;BQi-Blllv*kuax4a@Sn|2rbxX9oHWa}ApKi%EtQ z|7E`WQhXmxU{(edkZl09`e$0%U#-N9^}mv5b}hsk8*2gBU#ncj zr+<6t%e4Pmh$#Q~S8t+f{4bVMqx4trS6wVP!XK;sR7&KcFH0^AOl}h3`yW|U#lj~4 zf3s-kKe+=6h7SI3K`juynf0HFTA*Ar_gh(PWHaNN(B91UCfqgiy$M_`GH*gyi|w26 z*dqNVNVlrJ2?eb>uj&3z1uYPzO_uo23!vabV6g)M0)q460`toh{{K_+`5qZ~#*YEK zMkce+YoGe?370-v3p$Bz`I81O)+61qT7){ExDe%BylaHUdyf z9vi6F`PXf`PFye_wb#DPPTW_Q|JhYu2+00JGOGtn)uaIa?t~})lQ{qE6)zTF4&VPg zHJ?rOfplGzuS$Q=my~{ekp8wHAjlw3f|dqAhc1FwrRagH1l|`dB}fpE_x~vU33svq zu)Is)HQRybUASQ6#=y!nG9Ys|+Ur2YPp|}qF9UC1PWin58HjB1suz`g;_cJVr2Qn2*-bn)H(kp zgaXp_;=d6{_2PmpxV_?Sj)Xwn;kRIsdJbyFzDzF}0R)8dKO~r5FCO3n&w8=n2;lp0 z!H)d?Aztu8`G-Wy-8Lx>8U&;t<$sgx`vV0FNP!i7sIM-E3$j^zzbwnUmqg(HkG0M) zU|Q+3!Qvxct=aUye;pi@SA%7S3Iftc`@gLSMZGAJ0yp~Kto*xQfq=07 z$I408iy|Anywtz@!=H>1n>0O&eTih+OCbI`U@Q0UgyDhN18?l^lv~RBFE2OlI}i|_ z|FHKKyd(t<@OXgvEn*~txM04eF9BfuAM5yn1%Cfa3I*&KBz>J56@)lE&P!m-Uc8|B z52;(#>oO1y;k}Xa4dH^#SHBXpmgD`OsQ^KElK({b@r8)%KSX#9z_lu#e AlK=n! delta 11140 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�#4bd5U*SWAN~4sfPuEUbmUA0@0hTEj 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 +cd "`dirname \"$PRG\"`/" >/dev/null APP_HOME="`pwd -P`" -cd "$SAVED" >&- +cd "$SAVED" >/dev/null CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -114,6 +109,7 @@ fi if $cygwin ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` # We build the pattern for arguments to be converted via cygpath ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` diff --git a/publish-maven.gradle b/publish-maven.gradle index 2d1ac74..fd8f64d 100644 --- a/publish-maven.gradle +++ b/publish-maven.gradle @@ -52,6 +52,11 @@ def customizePom(pom, gradleProject) { name = 'Ramnivas Laddad' email = 'rladdad@gopivotal.com' } + developer { + id = 'sfrederick' + name = 'Scott Frederick' + email = 'sfrederick@pivotal.io' + } developer { id = 'cschaefer' name = 'Chris Schaefer' diff --git a/spring-cloud-cloudfoundry-connector/build.gradle b/spring-cloud-cloudfoundry-connector/build.gradle index c16f64a..213e55f 100644 --- a/spring-cloud-cloudfoundry-connector/build.gradle +++ b/spring-cloud-cloudfoundry-connector/build.gradle @@ -5,11 +5,11 @@ buildscript { jcenter() } dependencies { - classpath 'com.github.jengelman.gradle.plugins:shadow:0.8' + classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.3' } } -apply plugin: 'shadow' +apply plugin: 'com.github.johnrengelman.shadow' apply from: "publish-maven.gradle" dependencies { @@ -18,27 +18,16 @@ dependencies { compile("com.fasterxml.jackson.core:jackson-databind:$jacksonVersion") } -shadow { - artifactSet { - include 'com.fasterxml.jackson.core:jackson-*' - } - relocation { - pattern = 'com.fasterxml.jackson' - shadedPattern = 'org.springframework.cloud.cloudfoundry.com.fasterxml.jackson' +shadowJar { + classifier = null + dependencies { + include dependency('com.fasterxml.jackson.core:jackson-.*') } + relocate 'com.fasterxml.jackson', 'org.springframework.cloud.cloudfoundry.com.fasterxml.jackson' } -task moveShadowJar(type: Copy) { - from "$buildDir/distributions/${archivesBaseName}-${version}-shadow.jar" - into "$buildDir/libs" - rename { String fileName -> - fileName.replace('-shadow', '') - } -} - -moveShadowJar.dependsOn shadowJar -assemble.dependsOn moveShadowJar -install.dependsOn moveShadowJar +assemble.dependsOn shadowJar +install.dependsOn shadowJar configurations { tests diff --git a/spring-cloud-spring-service-connector/build.gradle b/spring-cloud-spring-service-connector/build.gradle index c28d5ef..2beacc6 100644 --- a/spring-cloud-spring-service-connector/build.gradle +++ b/spring-cloud-spring-service-connector/build.gradle @@ -23,7 +23,9 @@ dependencies { } optional("commons-dbcp:commons-dbcp:$commonDbcpVersion") optional("com.zaxxer:HikariCP-java6:2.1.0") + optional("org.springframework.amqp:spring-rabbit:$springAmqpVersion") + optional("org.springframework.data:spring-data-redis:$springDataRedisVersion") { exclude(group: 'org.springframework', module: 'spring-context-support') } @@ -34,5 +36,8 @@ dependencies { exclude(group: 'org.springframework', module: 'spring-beans') exclude(group: 'org.springframework', module: 'spring-expression') exclude(group: 'org.springframework', module: 'spring-tx') + // depend on mongo-java-driver explicitly to control version used for testing + exclude(group: 'org.mongodb', module: 'mongo-java-driver') } + optional("org.mongodb:mongo-java-driver:${mongoDriverVersion}") }