Skip to content

Commit 2b09738

Browse files
author
Fernando Saint-Jean
committed
Merge branch 'master' into issue-10
# Conflicts: # src/main/java/feign/error/AnnotationErrorDecoder.java
2 parents 2768e45 + c8fa9b1 commit 2b09738

16 files changed

+958
-853
lines changed

.travis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,15 @@ branches:
4646
env:
4747
global:
4848
# Ex. travis encrypt BINTRAY_USER=your_github_account
49-
- secure: "H1A/n1bkR4ZV6/7mSTvqFfBxpOvW54s5LA1yms/wtlDCasdEPztgGwT0if4+h8kcHUi5qZONGbSk5au6wkyuDN4bwD5R4Xw5GOZTL2tAF1SuA243MJc+pfcj7XUYMCSY3G+FS3y+Z1B15L6+sWWbNFVO58Sm6SxMxfz/PqHeu2yGYiRMOPamOHibhVkBuJSgFbI6/Wy451DDesYrDGhcoc9ysTREfx842dzR4B+PknjNVJCRreVgYTIKCpHxX1Xn1QWXLX5gxRmv1StQrbMUUrEaqHGKWTAx1/akThpCJ1uzTyihduhETfQOAkD0Wmx7HiBuLr+uqhXCqpUMmuvzCANM//AoFEb23b66YlOy5nEEKExLbPJXgYqttT10fZSks2qn36rN5IROIlgcQfQvI6EIShTj/Drq6M0Nwi4rJAbf2RmvsawfmJDiEwIBtDoC600QNeTKnuKLBUQ4Y9GGUw6n+FmJVlinKlU0KbsjKRrt9D8IljcHfZauz8xOTViE2lNwfs0KQzKNT64eBNh1BROuHwqo+U0pbjCtTRwSYQtXmwbvNvaVWm8o2x/EievMfyavV9Nw4rRIiPhUtVIQrjou9cRxMDWF9jwiCqADEGOqekMzyHi4GsNqc9Km/PoB43BbbObutgmdyszzZ3GaM1Uws0oIW8Ww7j52Qa/pkdM="
49+
- secure: "UGCb+uE9a/hGVEPlAUM/iFgGYxnjJJ79nhl8a/RHsUJQI0/hGUwYkjELCVM3D9ck0hZI6xTjk/fr2JwTlAghmBYun8K9xKhGYnUShwCGwFBZzGRxLcN2Hfv2y4jSgUG59lRVxAFJFjXaH2wBooNmRRm/rjQpqdKiVissx6fUWq2B+zKUKQofXZlCi7gXTNeyQS4ROeDk3O+Q7uVLZ6ut39JSTSOl1t3AGBwJJ+Rz8d3kbLshM1T04MnRR7BRpDknWBc2b+7cbfNSRsQ8F7gbYce/lZSz5/WlE6c+RXNLztCf4AbPdkrJx5I6WRdCD34Hleo1zqTy2JOHneYJGKfupeqrvglFDibnJmsSpaOhgcGPCl5vi2MI/B0FiSyjtsdxgW9+ZaR3um3+6bBYfBznmPq379gCQcbxOX2+VlItSJHcOqH651F5akp58Uw7qO3bYYlj07pmZvZz//PaZf6F/h0LxLUGqn0esMBxLYsLb6nk8/DR5EL/69goR8qYkV17VHgTPNGT7YB7lQ+lQGzq9q7m9hT3lZj57ZjOrcHKTc0e9AA/8hOpMIegaeTHhRbrOUMQFWsqHke73BPKFvrJYEi54H4P1LatDCB1aQXoYuXsujR7idS6JGDW1kJy5ljppPjhzT9DYs4ypYI37yswSTrsQtwFysYC1FLVuklJCJU="
5050
# # Ex. travis encrypt BINTRAY_KEY=xxx-https://bintray.com/profile/edit-xxx --add
51-
- secure: "LzDRBKu7ypY3f/jvTyTGvppaCB+2NyClrQkfxvjQsTJYPC7hBoGurOQ9EvL6tufwq8utSdbOrnGqZW44c44KF1V4DZnHggVKGfXK0VND9iGZ3Mg3WkdGPE8UGlFqUt1FmgGtzGBG7qKJzRiK8KGyt2kgiwplGngY43nCbZKLmJr44PWb88YEXoHmxO19lpKuLPOJg7/Q8H7HXxALcBjNNapDSx4msgx1jdp3mCUAqHs79cKkx+apeVd8IClQ+llybXQmv0rbg8d/+5GOcuGTlPMPb+3mvJfjn8XAf5ByPiv1G0qkWGhLeC16HAGclxljyYMmXE98LLSP7HOaXVDjkTgU8DzVfnKfY4MsmTK/XTwa/h9VDy1Dgnu3JaecNTN49p0NNRGvIQw/R16L1jB1cT4+u6JPVcvk48m2sfWf1pjPv4t6bB7JFwj5/A6DpANUrLifQBcB0twSEnCNjjNpzunjgdE306BaSuWBj6QS92FomRi3zZ+wUDYhWWB+CNScO8Bn+wA9MOWkUVNWTQ7A6QWaiW8jCXcgRD/EBmIk9fWzR9lQfTagQnKIe4yYj/DAhHMVW3opUrhLzA4QkR38vE/XIaWumAKhUXUgcX3MwVAr7idLIHHM3m3ZKHDiBzDPXRYoM33KEZZlni7o0qxF6CFRDi7x9HppWX5nhkT/ASY="
51+
- secure: "XpunNYBzavq6waWQFr0G6ixR1egdqjGq+EbIjGb3h/AvHkOPA6NAgthOgyZFnB3xSOTP6M8SVRFPZyC69zcA69n8Np1vfo1eKZjq6mKG+gpxh19x4zqhd57dlt1TITmqiuPqShwIfcDLWI8Tb8sQ4CiI71AGtFXo4c83Nll79eS+wxqwXqyGn643bt/7DjPeZx7GVKi1iippO+TJCxnBmlJEj9g2N/ynb2AE0ofmf66pCSVWUZQ7AF366j/pSWXe0Y8jLdMR9LkC1nvznjtxcM3Kc0SzYJqzWN/AzkkUndQBt30fLdTH1Se/TAMltaAXiYXHld7giJFAUY8RybIm6Zp21Gawd/MvHqsEg0KJ84OaIuxBAbWBKCn7Wp7r+VLqOEaJF7bzGc2BZgFCTcr2xN6Q4EIQboanKjEGQZ5DxaNC3gQeNTJRenUH+PAHrk6a1ZPaO24ymDYOaN9wyJo+ueJGXTCS8fjYZJNlTk93D/koftkUapvuU5rd+2w/Q4oL6D/7fPCyiH94C428+nEaYzTkpqibSU1tRG8zDxl+MkVTQ4t0dJfVH3Hz4eqXs+9mir69a2QmQuFoefSOr5fNa7m+Hx0/H0FvmzAqnrSkmlXXG6d3Y7YDUEPtgVeZ8CJ+qFLRalkWM9cV+7bDc+SWxM2vC0HsT6LNS+IHT36fYBQ="
5252
# # Ex. travis encrypt [email protected] --add
5353
- secure: "WJQvlc3K9KWUHz71qqlgux1xH11Cz/IY3QaNDU6Zg5bsBwDMCS03WwNw/4JfmH89u55sXEYlmtC6i38WrZbjJy2peNOP62FVP7zyPagehACJW71Q2uoOs6OPQDmQsh6n+sFOxEBbl4zc8nD6QgAt/X3n7MO7BcHreokUHHOPz7hQ8KNiF1zK2r4h8/98gInP5wbw8TemUDJgFhFJbWSIENg3tfBOgypb+pjOCViHwqm4gBs2/S9IYBBNAf415KHvz7QvIU49JQFMrhMj89hX/mbywWFcBfbTqXVT3El6V7f5gN2A77nMxWeaFfoYvG3BBr4fcuf8AaRgHtL0twTTS5tMGx45RnhQGjTFMFvEPRRglh78TMIcgO688rFJmQCi8IY7mLEvTIHvI7BXrAz+A1xuhGyLyteopdOJsZ4e7AAOqwvdef3JQXgR3LCTsaevJfXIenMl4Lb5Eh/LIcEaxpZCSH2nuMOMDfn1lw4L7sMxCC1QjEs+hnuKE72DDZOyyT7co5aZlvcvglHOEEWyAuwpy08+LH8NKOluFia3+g2WdhrFZoxd/vNDc6SSBbYnAPVtn+v36ucDuP6N8snATs3VU5yjWePzfCVpbnclwBvc+kmGSGXqDTdQlQXLRLF9aAY5sLyECc921E/Jesz0t34ZU5poGBER+tH1WDeZIG0="
5454
# # Ex. travis encrypt GH_USER=your_github_account --add
55-
- secure: "FgRfBCgGjf8SqlCt/1ENuM41p6sJ+mZsI5DZSxY04Ncr5SSlMds1E5Xbw/BrSOu8KUgHMFJSge3A71ewOOmII7h8c6FTGobqk8IyDi+GKNdRNZ64tvdnImo9reNwc6niTJR0JeVwy3Gnlu5NJhvhdVKxChEvuOF9Fd2HrqMlI/2Wk2z9X11jYpAxcys8Ws1zDK7jvdsWIM19FhtRN+LOLoRrpgkifVJtkwrPXKLYTtcXI907eV+DEF85gho4qJ4QsA3EgzXgoudM2FUpNpzQCLgDsnEVJblCwCBptU4hbVbDjPQNgZabhNdG8Mp5Puw30xZDboKm54GInefBXTpIRCpwuFIdehDR+Qt2K4yRJiWa5aKcCwOJVjzgJaeBfWlGcbtKh2lZGLkBjJY0/pfA8H1li1kRAd9y4rHccc0sEDIpSvpHY5OVzDrdjeX11lbFpS0dtado4aMR6CeI3x5mW9roysWw+ug+wPGcDusf10DfGQIbo83za1yiOMES+o0okvd/9JnmWgFvA8DP6OUVLzXCZ2DMvelmGAmFbotA5NZmtyYlDaickr29/6+o/XBGcvIrinFbul+saqiQLY6XNiDrF/aHcyfzaIbBOQG1jLCJdzOOgOiXfie3Pm6HSm1C9CE0XOUpmGkhVQEHXpeNFmeQSnZPEnZdlwRAQj59Lag="
55+
- secure: "g2NBlGFcPLtgPQByQGy9dequHtdVCs2tAx3lEIQJoYv7VTlv+sPHaLSn4/sSSPven9k4KCF9cMZ/mF4+TBJxfR+WhvbqVI+nL1js8dHw4ko7wGhNUMeZot0l6u44JtalNiYCA8+0sn8rrj9lisS/xE3kzpyXMVZ3CMEBBp5gghUUwjKTXJPnV/WcmTbari6MCCa8UVQ3G4J9prhjX9ZRFZSQGk+5MrRH+O/EqkThpEQaUDtOaXx3P8RMcO8KwpPs8GUD++Z9clnH2NTs24BRJ6oOdbyR+9KnmBIV/FOYCmSelBmBs5AznkPz3XRQfSW8CfFLepHkEWvjw9k1hHMvQTAtqz5ZJyvbVC0ztIK8O1q8bQAOBoHRkQyxWk5o/57SrwgSQTtYLjoAjsR4Et2Noab01qme8/Knd8XYhee46CnHtxpPq6dhX58CB9N0Tep4TJYz5pKfe5q8jAQO9ceaLiPAhnRNzpHN/2CksXTdbdp+/go9FU7sBs61q+JK29zbVQTNpgiLiNagoJ8ZP8JkVDklQWK++wCWb2PxiaTMgsGxfRt2qydnpLdA/qkUrov7vlNlt5EEXqSslo+jdMfSsDBhr442bYrUGzlzTAuZTqBk2hS9VXSktUvDwzdx84BRQ2iKyfmeeuHDWdzLeQ+C+gMtb+Z1j6RRN1Bzcxaja58="
5656
# # Ex. travis encrypt GH_TOKEN=XXX-https://github.com/settings/tokens-XXX --add
57-
- secure: "Bq32VA1FhfT9xCNEhmF6flwudMG6KUIG0T1/RjMmZ1syz/sK12j5rT+rnYIplP7Dg0F+BinZflNEXOVk+mMHh+gT8U6M5JZ8VE8OfhUuJ9f2SIn7aVF1yB2tEabg+qoFcmx5hOoj9sjX/DAy9jQHE5H9GAVV+Pvvu7ObZdMfnHmPKlo+sP2CGwy+5vQQKe/mM8O3HzwiRAbsw9F5sWwavLOVoIq8q7fDkyqyzraCTQdUF/cQ85mRGjgTDhSntUQyJdgHQe3VxLY7w2jHUItXQBauq44MU2DqvJ6rlMlU8BX1S6JhEdAvykXdQGMEIrvxYNtS9Dft4W9o5ht36oZDu9kpkwoH8lwojYGK17u5+UzEa+58VOw5/34bC1wZdbDlx0ewLbPDEWOLEqwMuvZP7B6QtRcYkSqtjMWI08U8dx+YkoxGY8gApcRXCPqePVsX9VOK7FRxq900vaStR2fMV8npxI42XduE3CGl3Qj85SLiYNoUgAg5xPTM1UkXzoML19eTjWxJKbMayL09n2GSHWW01RazoA/MPGQxcIBihs5lEUBpab3n3p0r6MsyCt7K52oktUM2jGKGRtQQtQGzWl+pxuHN2FIoQKi8JoCQ6nLPZqc+3mrg6yYciOBVfqxm9V+JH7Lj0NCWGpMVSNOpRdtFDBUgbBOEkPkrLNC/1wc="
57+
- secure: "SYm90I0vUc9i52aISvGEgjlW3ACrAE6orzE08b2PAvKJqzcZ+3FOKvWpgAPDypXr+6LYiYhtOrX2Yt3S6/XDpizDQPcaz09aRBG3AR9yzDuE3UQgazPtgd2cNQiMIoKiBfIMi2z5jJk0PpYNxi0n7cOXSKBmxKjXCAcD4PUAZzR4hCYph1qWBtsj82WMqXgC6BxlLUPYYrnPALnyfmDxsYB017e2AyGkk7ItLWF90ov87d+BbulknOQ5fXp5atkV/xgcrr73yATe4pniWr8c2HZy1jaeYqtFYDN4QVhgN3QBrtGIwKYZbamYLgL5OX2g5L5JWqaR8RICZVs/5bQecwcNlHph8yRoByc/cssZhLnPbMgIbeSE02YbJ+Xk+kEtEBhSv6jGWlicWX8cl+d5Z0QRBKl+c/QrIuA1p7ltk5S4cb0WedPWu/u90eJZUoAb3HKpquAgU2FTohNby/Je8L+P+QtpmqOMk5cM+kformomx1bYEw2RQj+hj+G2fE8lvuZtXA1n45KAiCN185YI4/1Sdo9guBKdUjgs6ig37pJkbhVSsAdbfUUeb9wCVN2nOf2E2P19ZZoAJ0Gkf/zWGuNiFHcvLBORpZ9oIb3o6TeSi1rj8zJiGNmBzBXHZ2JDfgzfaabnnxpwUHtHBB0HA3uyA/xMJWuyAzeeRl9TorA="
5858
# # Ex. travis encrypt SONATYPE_USER=your_sonatype_account
5959
- secure: "JRkMiXYwDURgZFJg/pOT+jsd9JXq74tRUBaTbvvcvaOdpfL5tBjgdoQgu/xvDttcwF74v5ygOWrXBKM/Q4fLamMrX+Z2+s/fMawXgZC0DsIU3UWB4W0rg2IWW9ByLTRrEOmRs1kIIEG5IfpvwuviQPbIbeKdZL9yDmRikah4kWAy/cDiUF3oqieSfww8TSzkk1edh+LlWfiz3kyXFThV1kjN1emQxbRKR8onK9LqIBTsiaxuz0h+hJnUFvHIp13DzqMYzq4TE1LKerC3aj/GwAlbuJYnE0Qe++phEjVcr6tEVEkc2NbWfRywKFo0o7TqoEpHZI0olCRcwvRnUUU6OMlIHLa9N2P9u+LqJ4Y6Im+hcqIfPFG04BEww6fp6EkPWzGM2vv+uLADBEPT7Rxg95LWkC8JrFtRkT3JNah7O9LErLVmDW7cAh2lFeqaHgBWHXxqULdFrlh///pZIhQDClKvNF+fKWsFfPNqBEoa5a88dNDd5i3y10+XqIeo8BQNYUGDF4PmaOrxIcOPEmlAfaIR8ZI4U/t4LuxM6v57fKw6vAhc5bzC7aYOSBE/fOmJ72PGAQDpi1ufseVPAtaQb/M3pgz1Cy8fbGoASF08yI72LzkNhgnbSSyWXMTr19r7O3iyTC67V3ENdFNvZmnQXQdJ3p54eTHDs0Ev8nqxV/g="
6060
# # Ex. travis encrypt SONATYPE_PASSWORD=your_sonatype_password

0 commit comments

Comments
 (0)