From 4b7151ed07190e8b013facfc5571c4c98c7a8fd7 Mon Sep 17 00:00:00 2001 From: Hector Ortega Date: Tue, 21 Nov 2017 09:13:27 -0500 Subject: [PATCH 1/3] Upgrade twilio to 7.17.0 --- build.gradle | 2 +- .../production/taskrouter-servlets/workspace.json | 2 +- .../application/servlet/EnqueueServlet.java | 12 ++++++------ .../application/servlet/IncomingCallServlet.java | 8 ++++---- .../application/servlet/MessageServlet.java | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/build.gradle b/build.gradle index d754d53..54ff09b 100644 --- a/build.gradle +++ b/build.gradle @@ -23,7 +23,7 @@ repositories { dependencies { providedCompile 'javax.servlet:javax.servlet-api:3.1.0' compile 'org.slf4j:slf4j-api:1.7.21' - compile 'com.twilio.sdk:twilio:7.0.0-rc-29' + compile 'com.twilio.sdk:twilio:7.17.0' compile 'org.json:json:20160810' compile 'org.apache.commons:commons-lang3:3.0' diff --git a/classes/production/taskrouter-servlets/workspace.json b/classes/production/taskrouter-servlets/workspace.json index 674f244..a69c29d 100644 --- a/classes/production/taskrouter-servlets/workspace.json +++ b/classes/production/taskrouter-servlets/workspace.json @@ -56,7 +56,7 @@ "workflow": { "name": "Sales", "callback": "%(host)s/assignment", - "timeout": "60", + "timeout": "15", "routingConfiguration": [ { "expression": "selected_product==\"ProgrammableSMS\"", diff --git a/src/main/java/com/twilio/taskrouter/application/servlet/EnqueueServlet.java b/src/main/java/com/twilio/taskrouter/application/servlet/EnqueueServlet.java index c139270..d4b0f0a 100644 --- a/src/main/java/com/twilio/taskrouter/application/servlet/EnqueueServlet.java +++ b/src/main/java/com/twilio/taskrouter/application/servlet/EnqueueServlet.java @@ -1,10 +1,10 @@ package com.twilio.taskrouter.application.servlet; import com.twilio.taskrouter.domain.common.TwilioAppSettings; -import com.twilio.twiml.EnqueueTask; -import com.twilio.twiml.Task; import com.twilio.twiml.TwiMLException; import com.twilio.twiml.VoiceResponse; +import com.twilio.twiml.voice.Enqueue; +import com.twilio.twiml.voice.Task; import javax.inject.Inject; import javax.inject.Singleton; @@ -39,13 +39,13 @@ public void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { String selectedProduct = getSelectedProduct(req); - Task task = new Task.Builder() - .data(format("{\"selected_product\": \"%s\"}", selectedProduct)) + Task task = new Task + .Builder(format("{\"selected_product\": \"%s\"}", selectedProduct)) .build(); - EnqueueTask enqueueTask = new EnqueueTask.Builder(task).workflowSid(workflowSid).build(); + Enqueue enqueue = new Enqueue.Builder().task(task).workflowSid(workflowSid).build(); - VoiceResponse voiceResponse = new VoiceResponse.Builder().enqueue(enqueueTask).build(); + VoiceResponse voiceResponse = new VoiceResponse.Builder().enqueue(enqueue).build(); resp.setContentType("application/xml"); try { resp.getWriter().print(voiceResponse.toXml()); diff --git a/src/main/java/com/twilio/taskrouter/application/servlet/IncomingCallServlet.java b/src/main/java/com/twilio/taskrouter/application/servlet/IncomingCallServlet.java index ce28a88..9e6e272 100644 --- a/src/main/java/com/twilio/taskrouter/application/servlet/IncomingCallServlet.java +++ b/src/main/java/com/twilio/taskrouter/application/servlet/IncomingCallServlet.java @@ -1,11 +1,11 @@ package com.twilio.taskrouter.application.servlet; -import com.twilio.twiml.Gather; -import com.twilio.twiml.Method; -import com.twilio.twiml.Say; +import com.twilio.http.HttpMethod; import com.twilio.twiml.TwiMLException; import com.twilio.twiml.VoiceResponse; +import com.twilio.twiml.voice.Gather; +import com.twilio.twiml.voice.Say; import javax.inject.Singleton; import javax.servlet.ServletException; @@ -33,7 +33,7 @@ public void doPost(HttpServletRequest req, HttpServletResponse resp) throws Serv .action("/call/enqueue") .numDigits(1) .timeout(10) - .method(Method.POST) + .method(HttpMethod.POST) .say(new Say .Builder("For Programmable SMS, press one. For Voice, press any other key.") .build() diff --git a/src/main/java/com/twilio/taskrouter/application/servlet/MessageServlet.java b/src/main/java/com/twilio/taskrouter/application/servlet/MessageServlet.java index 6b05a08..872f546 100644 --- a/src/main/java/com/twilio/taskrouter/application/servlet/MessageServlet.java +++ b/src/main/java/com/twilio/taskrouter/application/servlet/MessageServlet.java @@ -2,9 +2,9 @@ import com.google.inject.Singleton; import com.twilio.taskrouter.domain.model.WorkspaceFacade; -import com.twilio.twiml.Sms; import com.twilio.twiml.TwiMLException; import com.twilio.twiml.VoiceResponse; +import com.twilio.twiml.voice.Sms; import javax.inject.Inject; import javax.servlet.ServletException; From a7f89a8f549c29230d04e12d774b6992656c5ed2 Mon Sep 17 00:00:00 2001 From: Carolina Lopez Date: Tue, 19 Oct 2021 16:40:13 -0500 Subject: [PATCH 2/3] Updgrade gradle version --- gradle/wrapper/gradle-wrapper.jar | Bin 53556 -> 52818 bytes gradle/wrapper/gradle-wrapper.properties | 4 ++-- gradlew | 5 +++++ gradlew.bat | 6 ------ 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index ca78035ef0501d802d4fc55381ef2d5c3ce0ec6e..deedc7fa5e6310eac3148a7dd0b1f069b07364cb 100644 GIT binary patch delta 10610 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 H{z3mAxA?u1 delta 11465 zcma)i1yEeg5-#rUEKYED2$lfB-6as*f)hNz;slq)Ex5Zo!QI_0NN`B75Xjp=?td@$ zzIyex>eTf1`C6vWZ1G6VXR?uo-o8)ddt1A5D-7X-f)63c(Gr|YcvqXVV`jHXbVtJ6fEWn z%oDYP8wG{>NB@}PVJI#<1cWWfmw*juOr(kVFgJ(m4&n>_uu$i3L>s}hh$pQ|CyjkJ z`=+eoCxgOLqm|VQJBHKdmXe+zM{K%lFBqt}J2-qD`kq=y@2^o%?TdPE>lvo6;M;gl zE!RePIoDGgem{)g^FpTeb!_p4c9Ev_su083_RzPHizx@~(8(>Am7_`C zQqjU`?y3+guf!d{79h0-B$zppb=aZ98~EeGcDLb?^jyj_EZQZzk#8 zGkNeN?mw$W(f_m+rtC={#M(a@SkZH)uKbXKqK}`tj`1y(-BWhguKz5Zpq;4y`pm1- zfi{S&=S=LSJ8ftS5?Z)cn2y5$&|Y_0i>@iiltJl3e$leO_^5-EWM_;l=w9qa_jgX! zZqWC{e#zjyf_&N!#)&vo61En+b=Jz9$cyv0s-6$Vzf*}~iVSEg3lT%Mdk@m^hY2V9u$D{QFO*?xU$*QI_Fnehcnzz59knSPmJ z=WXuBhfk6_%>53M#kp!^of-`Z;3iN`P4|XT$g4% zyF29O7EZG7MIQAT=jIY0SLx!c<(ySPYCUX3P~QeHHJmKJCR6QzMXfn**4s~ zZ2{{wK(`-RlG&~4_@g)0rqOC~@))T4s}|CzxhdNJh4RW=qME^*q6GOSFH}F|hgEC# z#z>2Krtg$F(ERS2sRZJJI(leBxTj^d`Tj>u9?U0o?32WJ1f&&(9p|(mp!lXyx*Yudp zC-NTAkrv(rdo?8wz?np3lZ>{N{ z|6bX)T(YcM;}48YrF${YoEo5d=F1=Rj-+VE{$BWe;=scDXt6m5as@`$^TL<1cc}D0>aQ;AvdC z3Xfv4ErLB1C-R=t8gH56iU3FyM?7dTUtiin`eq0A=&{zwpyGJ109Y!^9loo~=^Cen zc{HXFs!AAO51Y*`&u>{p<*|n8WDWo$LPY*Y285`*kDRz~#sYaT(m@?YxJQexJY45OXuFoduKy$)#({CmE;UY%^KkW$NQl%=! zIe2;jouKtTgkYCW4#H>bY%{s+MV4NEAbyR_&IRI6XL7+GX1*EYXh&FL524SnFfz+$ z7h}?kGd~ZC8L6f+kMhw%-yu+1(9H(Lm`r^ zyp~`sZl}$0)Ek~#T;I|$%ReuEy?ufHK3Z5dUs$qY zo<+;wJ&io_AdqB9ls~{z3362cNOJmJt3Not&J$oGHu6LXe1aoH5nr;C5qId~AR$##{W z9$Tu_*5G~tv@J;(EtQ5`W70?3N4M#{nt|pnE|K5|G%$}!DK=w`hL2hDr#hV#YNSxs z&amN;w@~bjq8K*mdTYJ*FVRzD7X8eHno6?7*_<-kC&%3@MPRQ;FcMi_(I=z!%RWd+ zfD&?)x{3r7ee`m8WR06XIGq{}Z+TLCDzcfs+L~1nxH9R@?p_veTM(4rw71wzwcNlx zJs`7@w=fy5CO1krsAu-l#6uL9U-yup~cF%Dfl^Q^qnUADp zAOZ48W{Qq@ke6DR_Eiw@yx{OpOX0Y4=oBpDfHpP){X#JC@YVj9u;b@K!B_r1oxg8u z_aoAv8AZOqyHToP*!rA=b*QCqu^R6&4SJ;_3 zipjNJL~$czh?jr!gr493J%|4A{q+WOL?7_5Hf)M%;)sMl=*$n#c|T`z4?$o;F=q>4 z08ue57llnxy%qeMMj&K&G%Ln9I@KMf-%+<%_*Cc}u~aj}r_i~c%8p}#V|OQ}sMfTr@Gu*r>+yXOOKdyG zVt3th_>28ti0wYt^LyE6!yUl%Y(}Ha4jn2_zZ2shzZ^7tU67EGuya@GFk3|q9fpJo z_~i}#VO;$N+#He*!1$dB* z(;Kh;k9S``pua*gXv4bLX7*me{PNbHt~1?x1@{dh8eA4|!&bYgKdJ%NzJkmSeT&4+ z90RwJ^^*+ok8M2>wQU2~m+Q>kA5HkExE57Evrtay7~N8TK8 ze0Xsmgrcavm3osPbz4uij+l+Vj!V6cymfcun{?Gp?j1k|e~$f&%jYwF;rbL23E{~x zfaDtq@q!TlO2bDBH~T_!HxoIL!cz{Lin*8>6>Jh^;ILdS4G+E6luhnbLPE8R#b9{3 zfoXZ=n^;TE3;%ARKrA5v*e$>5 zeD<z&eN2DnYZ{D=HeC(nHRXkVr(;FxtyVuY3ub8smcR$Mx>ul1&|sgFbu2E(dT* zCatNbl8X#-f8E(TdaHq>=`JWFba$y0)K%CuZ`1Ql%UPc?58Wic&-uffNLj&%q=c2M zWW=mhao^FpAc`#K@-JCXX+ylUDu{=kuzR?5z&ea?#%`5jzM_WC8OIs->|RUa{pRvC z1Z{o2FPp8GW(v4f*JGtP1^PKDO=jfi__Ey7bI9}FlH_!^VU^a#up1+vzgs}uMUlEY z|IoKSQ`g8mMZgUj*%b5$Q^;c&D1!c8AfKxWTxhMQv$r>>HItHb16<(YKMt}Wb8M&`Jd1LG4^j5Ech}+Ve7WV zzmnxhgr#(a+b`4;s{Uw-J!^_FXr1RFvjMI&8(kIKetyZ884~v)H0^C^ZezRTFxB4O zaZ^}qZAoFFPmz9%;e1F9k}Eyk^5LgaV?x6G+0Rl1gAE(jZ13m8Re#sPUe2>z;Fdo8 zj+eo2r7zEH@>!=?)~)u+5-UmSVJ&Lbk{?*BFp(;};r8z4*Ryxy165S{dVet5$hpc>oxE3wS^d5woMuO zDrI}~+^RwoH}V+JHe_(=2^b!HUa4rWs8;Cd=xCnP3g&D%H%j+@7S|)~k2aGpz6rDc zrOtEMnmQ>Rk!ZoinYU#Z8J?;x$Y>2bh!6Qjmy;y`cwlMyJ+N#K^IMhYftrY0+=DCT zh=*gaF(Tnd^;tXRmz2IZRO^;6mv*=bH$TZRf9VSrY`Kr&d@*PU-K#svCHVF8*3;o_ zZD@EU3+u>Uxf~^7;?$M-$X7N-ZFQWyfaFzWh$K~C86u$zmeYyR+T%%%)Az0_Kx5n^ z=}!jw0$IxODuSHo65e*2XEzShp{LMc5!57+dn^%^8QBbu+)Wa^bwQ~}5zM+Dm~D`( zirgN?{OaV7H)EuQ%7U+{V+YR~NqH{mjahN?QD4lGlFA&QeB=YU$b)Q$tjfGlRexCa z?r9Fev^nB7AUzDXT^=+U5h(Ol02v_jx+-AQ^Hh+|aM^x^7Bk4kF?6VuG0@V<;yR%b z7`8M`5LF;KhpB2^#GB3_$ZxR=NihNz!Co_&G0yKo$(CY z5m#MeGH%j4vP@lx*StVue3>@f<~Dx0rlJrsD3Md~?lE1;9 zxMeD4%~D)UqZi(!6cBei**bO*3bm#yu&MDg>8(h{Qhbuj4D9r~u0@A{76CNOmk-=L z9F~APN5wv*(2zbF=b~+DN3!peiPdStRM&HF-8$!Y7IGBYd)<5tnQBnBh8o{rg{g@w zXWM>gm>jsbB>dh~bqkx+xS zQ*2K6N4mwHdJHNQjw}GHKEB`EkUgB8a(Q^KFjW+iYL#s5LRh#<9m1}W|FHAb?Gm~egw`3+S~N&OHhtkJqi+K<3d z*9=sNEW??SAmA5#zpM+KH`y%=Y;7X08*<5@+a9tu!BfZ4lb@s|?wgW2Gz_3*4pzpt z6bN6!131&#T3LEwILE*@3Wb?!Gc^=s;a&`8d*d~`pVPLgo=-u~GRzqdda?ColG1+W&TR5x;ob>ojC#@~q_qcCg)95g z)+g$4mXD;4&tLf!Hti-;d73}M7gqs7se!L7x<+ zrKYJ)l%cKKi$Lk2e!G-A4TWo$kEj?6 zVp*5k)_i_>ANbO>TfFhiN47=?b(}Q}(NL9lT=Mrnm8m$tX=G>%<#;JR&at@j6;)=P zc+3nc9UC!S7FF9C#byfw(Z;3dyY;~@!2_to=4dgzbeu_XAm-|QSr)UY!WDM$eiCb~ zaEkc2f=XSPwzU@me!RgRh1%8fiS;slM%^dX+KPY#Ge`QWgg`hvZ$#+XZj8&C#%(4$ zka5sXTjD!idAr_qg!@DD?4w@ci&Il)sWaFsB3%@jv-d|0sRK{|kz2`)>~k3-ip{s& z!E5YLo(@1{;Bi|(N4ppT+CW2u`&-eRVkOBw{=PaE{D62E)n*acSq){wPm5~(cF>!6 z(A_*UC63~4Lu0SLQP;V>EU(sc9cfN^)qcG4Q0=RaX!@n7?4e5`{yacnqq%q@*=prG z$;mCpOMSN+hVjknl}#&$^f2jI3E4!%I{qbio}WuP2f*Yj|7(1cb?%-EorE*zCa5^a zB-R#;cj7;AKe`CLP%#>R=Rbd89c{KQrR4b%g6iQH?-qaMB6IKSTyeuwzPyRxLm_Is z0ZWt(RF_imDf#l;vN*K^srSq@-y{?>BNM1JPI~}hOv^Y+PTq(I+_u?BXiqexRKITVi_?em$w+UwAaOWH>>+k?Ib*=PmBrD38FhPf;8alnMSOBaz7##Zx^bXk zk#n~G@ap+1Z~!2;q#FDREJ^?Y1;OyR2QvGP`eQNcpUv{V&{Pe@@4CykGGF;xBt zhgQMW<8<^}o4~EPt26&9v#5SM`si`1`+b}HDXOCI_p=;`xv&U^`b`#GqBD-BR$Z0~ zr85~^SRj_Jk0w3ec7MseTf|D6M(?401KIV>xd*JBk}^%z(3yn0TSX}E<|xuycJ>rx zhk7qstNev$i|!glqHA#@`l-s9E$r#}wl|_jMd*&(XTR$btw8ibt)LntQYGaVO)J6Z z3^&na=*5M-!Roo}6dg1>7ty+;SH?q8QH5vQn7}5WTIWk#vR-2b(*AxmPvXx?=hA{% z8>&dcWk#GCYUhNWb5Y~cDdTtNu(0}ZpY>yd6$iUnWhKC`$hd?1CElL$o%4Cju7f*7 z-YYD?j&J=9YMw;v%4d47+G#^NDz@NnvUI(3xB72FLO*YrBYBr+qjz8wF1cscwUun! z1A%t^zTGVz%>roGM~8<;i;Nii{P~|Jy4i($F^fkHk!fQRw4*=5U%cNX97Tbo(H zd@)%-7DA{Z&6(W~_v4M)iC*S7Ac6*V&IOnp5_2XcN)}1D2}1PpT#*WJU0N0~pD&Z# z<{IMd)Ayxz4!)4D&pQmkyeK*2!&A~5Yq<<~UF46+-7S#K?q86%jR*?Xn30nCql$zZzXyb61pKfiNb{6sw~T8EDUw;PkP-=o7n*LZGl<+99-WymL(s`$t;n5`H7% z2+gmV^Lu@cF(vZ#;TO$QN4l6qTHLrBKKv6V zNdt!k&z&_h?~ERw{Kd$+Fl%;`qv&znsQt-sY%B6I6YTp&xcT=4oy-8+K6yYSaFa$O z2U(8_wWDX+NxfWvkozHCAXlE=h$n)Bp6eGTchHgsGYH*{_X?9 zBzQDdsLt(Zh2xKHSFQ>YMkW7b16uifa8&93?vVOpi?e2xN4`q2LEB0-oRJoM{ zmbE0x4I8n!p?VjoL~(m#6^xsb6eBd>gwV){CsPh_S4qL(C})MpRB2(#asid8i@(*r zJYl>S0LQIXCzSQ#wk@A*JREoHUvtx?JBxT4& zPS<4Rm{EQ$CNkPXAdycp&O%6C!4$F#ct1~Nm1>@6IUZvy(KFS9RHY(=VrdkQgO9Sz z+eE*qyQ3|v!^~o4ah*azL=F6!9gtrFqb}7OOrJMZl53SMQ99Y9qs&+tBDkW19lG30 z6GzNTIhmtu%!d>4IT%<&dBCL{Wu=`VG=%(O-Yj2=cUf#&*kOlT)|d!qvM|IsJ7iut z+C~dIaf3&^H1T>HkAJhZ_l=5O^f3hA9B1ADa}7`xz>Q9)3eu(+3$((_$uA#;}VRP2t!nj$6l6RRb_=$bx?Pqi% zrtbLg9|T%d%UnJxVAKP@mGwlS54%sdr0ys()f|t0^SG@#BNfNrL8A}Q4v6HFXwyIPv875EVArn=6dHC&g>Taf zNdTG0Xj}n@2|xXTZwx31rV0BQ1^pZb{QDTA!-Oo31x#q8xeo#kU#}IuI~8}$IA7fh zcbs+3*i+FtmlF{l4L-YdAJ=H_@+W(N8IoLW$~BUnQv)5d{Qcs+fPZ%e@9J;C)xIR_ zOSOB^R!$Pf<6msI3dzo*Us_O4?dt1ijAs6`HaStkbfKnM*(=z7RAicjEUpEvC( zEwFT3-gH(KjzBgm{jU40QZIV?0M9x5w#aCpL1(=+V>wAe%9u@U4AXO$*i`OacDx*>6Y zt)q#k<4ib}@HqtVdobIS<#it@2f{H)zF_I)KN97<0#4g#8Vj}6V8Ue;R3bJQaoS2E zzw;~O^JhFK(6Kp<5Fn*oQx@=yx_J3gCJJwp;>|6!*abORLXMWy%j<2po=+} zZQep{wz0AlFLh-tppZ=K9Oy^_KTq+TPbN?{aLydUC~!~~Sigi?{k2;%hUyg1ig(tK z(4HoGtOOLxw1v6^W%`%sDjDNh^ikxgp;$=5^6$rz)GNypYc$5le0ktEBgz}XuVy^s z;H?QAET6n}<)Q81uem5$xI!M-+C>S|z^@q6;EQnnWrf5A-({)G;d|M1)LgTmZn|)O zc~aeySPt?yE&me4#gp$~2}sPVvK;rK`HJzp3E)H!lM{?XRbcYa7$Ab>(gg2GS*)F#MCZq&aN)pDj>ZG-!U#1 z*9u^2-@*&_x#JyW&FMuv_uyu~_75MAYT8=&h4u!#sOu*>rv`1VSS!;9*GErRuPThk z;eKNOV#wa5W`b0g%Z-=o1>}Et;YF06SYa^Jz-HshX?V@1ofm-`Hz6f!S8!Y{Q?~`{ zMzP6==!FT=!l+3ib*m!Dp*pcYUNbLXxnEGnpp!9PUoCWsjZeL|B#svT{N_~dYx+?w z9YtWC-0x%*Ekk{x!PTyGmg`ZL>nZvlF_wtba+$AqqijdER1O?5Ti;_H=KY3#{=Qqo zEVlyp)H;Hy3ir321YcbZ;jxKiK7CbR8Qh?v2y)Y70IH6SD$Ic_9Fecvf%=bAHv@3T3f80eCcWwzM{3b~H6MwX}C)v3CTW=ph25 zI&HhjQG!lehty1aWzgV-h-qZh{LEzsc`rs+cq_NaK3CPL+`h_mUk)a!KDKqNj}PCMP&`vQ+W(Kg z-~R*vkj>SIsq61AjP=SmM8=f$vMh{R=6uIgCUkb${ z7V=T<6~4vqesK3sFg65)&>y*)Y0G2yCwPwoDfAPy>%wl@~+&Y-2yWvGp(2t(if2sVC1XfrK_vAT4&0uNcUwB}J?q5%K zDqsHU&D_$y)VXlP<>`u`LJF9!$^TRRfu!Jn-y z#(&!Y8MXtUNFYHJ2)H0tC`3?dJ2v?r+r4Xnb2wmk?ZK|T`NuW{M6E9*)L$?=sCf|O z5&W#P?HSk=<`JykLG%cODe_p=1#49XYh`{0G=v2yix7cII-c6;K;s<%C;6+OI%+M0hjs#>`p6#Tl;q$+V`OlkfzGF?KWi6wCQrusC_v5$ z04;ub0{{E84gA}F24>-V1ncnO{u9*y_+J8o;Tc#`3>+(_|9zC3T>vN%g}-j1|L=YF zZU7X8`r~~zRq8+SdyG}Au?!I*0tAFCIs^p8GeeA;k6>0P1kgk`)+6|z`Tz#Lcn0>@ z2YKmHGyUfR`}5oT?;QUxnOa|51JH^d0A$mH@|X}nUOfOPLPJn;56RQ_X7G0@L(pa} zA?UP+hWvk$qpJgmc*cm{=aiY>jyxYI{mc>2fB0kx5ckUv$UIFYqsEI{_2^cVAn?hd}q>sE7|}n z>h*Z^M8OT^@tOW{JIz{mya4QWJ~%1zJyVkE^N&^cfxnSX82~^f`GHc3C_xJYPstl} z0_NF=f>whCAD8cA^#3#SKU4Z99IRC8PtcyCKQst{x`+hxC_xBAe-)Ar0ie>eK!#0p zAfq9|CmayWi^=`#5a|#At47pHKu2VnM=W5v-~sdXQkvB zkh9{SX%Cj-{X2eWBLFCxYVbW`P(=m$KNiI%@pccuvGWAyUBPFHf@(m%BQj5}j)R4V z8bF65l4O74!;EX;2M>0$1)SYDo(ZLcsz#|m%ng`-3_mWHXBF!i_D2giMna&Dktg8u V+VyW_t#4=txRSBMp?&$o{6A(>Qtki% diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c1ff248..17d1da4 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Jun 21 14:46:10 ECT 2016 +#Tue Oct 19 16:18:59 ECT 2021 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.0-bin.zip diff --git a/gradlew b/gradlew index 27309d9..9aa616c 100755 --- a/gradlew +++ b/gradlew @@ -161,4 +161,9 @@ function splitJvmOpts() { eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [[ "$(uname)" == "Darwin" ]] && [[ "$HOME" == "$PWD" ]]; then + cd "$(dirname "$0")" +fi + exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/gradlew.bat b/gradlew.bat index f6d5974..e95643d 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -49,7 +49,6 @@ goto fail @rem Get command-line arguments, handling Windows variants if not "%OS%" == "Windows_NT" goto win9xME_args -if "%@eval[2+2]" == "4" goto 4NT_args :win9xME_args @rem Slurp the command line arguments. @@ -60,11 +59,6 @@ set _SKIP=2 if "x%~1" == "x" goto execute set CMD_LINE_ARGS=%* -goto execute - -:4NT_args -@rem Get arguments from the 4NT Shell from JP Software -set CMD_LINE_ARGS=%$ :execute @rem Setup the command line From 3aec07b722f201856d373129fc5b4487b671fd20 Mon Sep 17 00:00:00 2001 From: Carolina Lopez Date: Tue, 19 Oct 2021 16:40:32 -0500 Subject: [PATCH 3/3] Fix tests with new tiwlio version --- .../application/servlet/MessageServletTest.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/test/java/com/twilio/taskrouter/application/servlet/MessageServletTest.java b/src/test/java/com/twilio/taskrouter/application/servlet/MessageServletTest.java index e303477..3d137ff 100644 --- a/src/test/java/com/twilio/taskrouter/application/servlet/MessageServletTest.java +++ b/src/test/java/com/twilio/taskrouter/application/servlet/MessageServletTest.java @@ -13,6 +13,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.PrintWriter; import java.lang.reflect.Constructor; +import java.net.URI; import java.util.HashMap; import java.util.Map; import java.util.Optional; @@ -54,11 +55,12 @@ public void setUp() throws Exception { Constructor idleConstructor = Activity.class.getDeclaredConstructor( String.class, Boolean.class, String.class, String.class, - String.class, String.class, String.class + String.class, String.class, String.class, URI.class ); idleConstructor.setAccessible(true); Activity idleActivity = idleConstructor.newInstance( - "WACIDLEXXXX", true, "2010-01-01", "2010-01-01", "idle", "WACIDLEXXXX", "WACIDLEXXXX" + "WACIDLEXXXX", true, "2010-01-01", "2010-01-01", "idle", "WACIDLEXXXX", "WACIDLEXXXX", + new URI("http://fake.com") ); when(workspaceFacadeMock.findActivityByName("Idle")) @@ -66,11 +68,12 @@ public void setUp() throws Exception { Constructor offlineActivityConstructor = Activity.class.getDeclaredConstructor( String.class, Boolean.class, String.class, String.class, - String.class, String.class, String.class + String.class, String.class, String.class, URI.class ); offlineActivityConstructor.setAccessible(true); Activity offlineActivity = offlineActivityConstructor.newInstance( - "WACOFFLINEXXXX", true, "2010-01-01", "2010-01-01", "off", "WACOFFLINEXXXX", "WACOFFLINEXXXX" + "WACOFFLINEXXXX", true, "2010-01-01", "2010-01-01", "off", "WACOFFLINEXXXX", "WACOFFLINEXXXX", + new URI("http://fake.com") ); when(workspaceFacadeMock.findActivityByName("Offline")) @@ -98,7 +101,8 @@ public void testNoValidWorker() throws Exception { verify(responseMock, times(1)).setContentType("application/xml"); verify(responseMock.getWriter(), times(1)) - .print("You are not a valid worker"); + .print("" + + "You are not a valid worker"); } }