diff --git a/.travis.yml b/.travis.yml index 674f643..aa2e5e7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,18 +1,18 @@ language: groovy sudo: false jdk: -- openjdk7 +- openjdk8 before_script: - rm -rf target -script: ./travis-build.sh +script: "./travis-build.sh" env: global: - GIT_NAME="Graeme Rocher" - GIT_EMAIL="graeme.rocher@gmail.com" - - secure: bQukqNZTegPUozqNq/gFpj3y6rLQaCs3w6UGHYc/m1l/xRBOfokOkhHYvJMB8gX1QrV7NdWiGJD2vRUStpMasWyN7pYkRO8io+/uNSnyXgeXzXwwcx0S63ByJdD3B/KbabekCm3+hh0+V3vtMKGQQlNWmyODmA0ZSVSgGu9N99496W7MBukw3broDGZzwwTHbtDQfyU84TAO9byZiQyYGhVjFHFc9Ba4EawqgdA+8i9XYQ21AK/zAX6pBDw42Ne92KBcz1xaN31DNsnmh7xRlITV46n6xa01ng4OtMqzm2i4QShVMiErkBaZ/wK/SDeokgcVssE3/mm2TjfcrhkOliyJRBoc+ieVgpTYGu8IcfVnXubIocHSdo6Do4V1WwJqYEsYUQAoYEfG07EVYFGGmxUOnI5EBftPYVmZrzxPqRf1ZZBnmwZSpPbPv9hauOVOg6Iy893mb5Ooeh3HU7hRJPYeizRXFc0BXBXdpZOwv01Fn0gFg7QZBZTKahoJplhF7nx9a/ez6gBzhyt1imDzhK98zbepB4wSRMeXabP3JzstC4x5DRU5RT74PRHAz/S04qfjSFGCiyjSf1nI6K9W1E1yUmFRHfk+o8/DpQm3+F2NqtfXYf4WvPz6YnLSB2X2u6jtq0rzgFRTw50gAZZdib8WHP5d1bx1B0IbQILIjAI= - - secure: Yd+clZBG01Nx+EBdFfWAbgWE6elQ8H0Bob7ZBhB3kOJfuzw6rCaOqy/AUZpHmaf1gnKL61n2GS9Xker+88KnHa2anq4b3W1xLp75osHyWqSNRQg/miSvfIDi1qD4MkVMFmC+/lDk7/q5zJuGSpSkIk+CVUyOY8nPGpmVzLinkCI02mp3o6ksjXIUajB9c2RgDGRxxbWAU+k/DawKvMj09HFpPCpKEdNqOW+hY4TG6YWoo6CtAYOkLrSg6hn77pfWW4ChwI9TD0D3rCWoo7bfKuG/QnWcOl+PecFL6RAM1tqR4JcasV6ekMUApUflwHuDja+1CF9dFPHcMlUhxheaMJYnH7Ti//uBUY24wfZ6/trWd7yKUo3JGhqJ6d0K9gt057PszPNhnmkrJk8LuJDY+jvMXEe1lG2uY7KpdHi+wJaxRca86JkHtoOvLKq7vQoE26mIWIw7XnqI/dPLl4prfw2ZWrozTkqW93vZ3JBN1UgdQhU42ZTEDaotn8lnOYg9EJ7jFj+5YnPpiogyTUARAIU0ZhnLJWsuyRqgwRQdqLjVWNcaMKrMTCNWzMaowqfb62jxMfskzQ8sadb2jbN/1jQxGu8TD0f0+iNZrPV/J/k6KW1UMfMMNIDeRqmrLdKxBcfDY9Oygjl2ZC/vPkIQ7YkfNUXzI6CtNKUfkF6bhp4= - - secure: I2V/6ZWDf4E8f5Fbj8JrHkZMACDDonD8gkzrLnVyQYaJUDT5IMf4u8DMOfDQfHEGffBwcixZeUfoJg5qauVT4cZ3xAQIJF+EHK8GYQsZVH+Nwc5g/+DyzOxFQJagbi7WDBRywmuM9hdpiC/vSI5wrfPyOhyurrkj3gpJqvu+WXJtWUvw+6yWCVWm31MSxUIq7EM1CWDGaybJ57ghQE9FCsof3KGnXQtTEBHJJlgwRHOgt6uyTNM81m+e/JxNnxVW/hpyWukk+TSnufuIApNkxo+v8hVQ+G5OyEy7Oy+S34slbJyShLeEMRulemPur7Ej7iDXp8wyXGLfPc24baYQNf7leQoLMO/UO1AKDkCrfYGQDSeT/chDH1qJ8ounkAq2hRdlTE5wzLi2C1iv6fO3NIQIGlIf6Jy7E0K9FMFITbJkCqAw4m6nwriaSjub5rDNUqfNe6cXfagu8XhLThvbQotGoG+8522w30gPhDpcJWGWgGoNRQdkyj5Y4cvldCgMlyP5fM37zEuHHkulTc9btlVxuId4b21dizrt0v4gTZUY6Z4dbCbmmSDoH0wtPpeh14OFLesNsUrIZ6UtdDWSBWoMDXErA5JZRNPcFxeCVhdzbCzp2Y/ZDASDCo0lqkCaGX5i6k1ux1+IH0M6MDtfu7dE1oKgjEgqcSvW5fccXeA= - - secure: tzCZ3/4fX6zBzDCeC/TuotD6dKV8XyJr1c77NtWfEar33zkXOd/OiR2rDduLtQVYRM2NZ9FSw6ifAKzPQv7qlq0XXU2WA8Oyb5h1bd0Ud/WDIFLgYrV38AVbwAtTs4m2HbGzSrf+qBU4tT98ezFwBFVDN/pYYjuRVS4UbGdwBPfc7zRxm9uOiUWVCfpHRGpgMKDign+6YoGRWdZ2hnMeqra5kfpWm4PyeR/9tcLTEPMJVxENdL+/TewDeQQrm067H5Dc39PGQkkWsNqjz7FvpuOjBOq7gzvodoo4ctEip8V7OqOpzghj0pQp27U9vgLTN8h0HFGvJEDS4mNXVmlqoI2bw7PXerJNfKJ8z4Nmp3uosuNc8bfW7KKNqi5Ui5uMinZfBRgIFON001M/cTA0gENlQ1PflAYS9CyemWHDdQPUWZQrg2uFgRarv60Ekz2ZkebItRy+kEsdX7RvIO/pc6hfjsn1Uhve1oyjS9+B4LM8K5g/FANw7JtH39xCmtCTLsYnCYdR6UnI/B7rZd6sScasZH+spDMvACCRsCO3njSb+6Fmhq8OhT5mnpGiKTgGYUI85eHNST0txQuYM4IDbh4F1Or7lq5KA4n8tb7UIvb80q6O1rD5Y1xgY8sHOCuh9B/b+OmzbOy7Fp5zcqZ87fDX8hKMavp2CLZCAdJogt8= - - secure: YLW1JOsAyGfw+kJofncvBij13BYcr7wpsJvFwpfcAP/RZSqjBtmPRk3c6pc5KvGac1l4JuuxVaLOIW9iXxKk94vLQC3aO8LILgGoWcFWTFQ4kyo1r0WwWp0jhTlZLx+QjtaH2L1C0nbQlC6rK3CBksoXCjZGVx7c+7D2opBwlSgWkbXBntDEWxOrJT1nD/xF2if5nj0FgshxMylzv7WduFT7+m2D2A+xE+DJ9JBrLxndpV9cjeuRs7BNgpmO7FCxv4xzmuJYIquIJlxtcH/bvdXdJ4bun8Hpx8r7EUMXIjaevNroLtK/HP7PaG/i8eComtt6C/51o2IcaWBG0IO5zbYlYQABo9Xs+ZaiLh18/JjZPysQzsAL0FycF4WDJExSpikW949LPeuj3qwr9FHNr0rZ5kHrT4UBL32jTfXHyKgAGb9Gqxn9oLXNQWOM+g/4ptUpzcPyfcSimM9YyH4ERdE3cWGj92Ti1FN4OMji6jBbpCwDeeR22MRNYivVkwyat/golxwUecVYwpZWvlrK9tLc1xtdOF/V63OFZuXlFyLvgU64u3W9Z/nLNhrFzrgHuKtzPGoy/qI8arPZHcDeDS/yVgD3/qlZYpdN3Q309HtiPivV9mLtfFIBRFZAtIki+djOhy7jvkNYVfl4BWKwDq1QweUxKK7vOFxcNQwoIU4= - - secure: qTiF4vixug42nEWIksHFdl/YhF65v5h13LOHsV7zA0ive82Gn2RMleE6rbjLQekmrF90+E3kWrE9qBNzqMWSVnERM+/7lMVgJ5H++FJN5WN0mAKcY5fPVu4hGBhK1mAnu4/QQ5FivU/wOUtsLtfW5E8dlgvP0gQbsIj7FOfyMH1H4fKHxR6Th4rcIC74r0ZwwgXWg4JAX8eGvRR/7IyTy/xfmiuVTfrHfmcLtZWhudDgiFYGT3tIsLtfS2O1FPh5K1+kOUoZ6ZAlP9KGyULjRQij9WoWtz6wekBdKmAYGHwxXIkifBrPcrfC0DYA7ewWfNqLJAaPlkLQ2B8pFNjg/PhyY3WMRu9AE9BAa5Vgbi/EfnbAe8FlbDvK1oKYtuUyDUrot9w9EGoQ9uXNvJneqwSxAkK1ZON+7nkrxfVb3fKKIC53aQ/2OntCqkFly4sQwswmsZiAdSYFCbipj6zrre3dfFUkqCoccX4xSFg00Pkml6+DkywTxfZlz/bw8Q7aovjd8c94UsJrTJO47y8HdopKc5orJZOq8O1km1HN1emZbdA0Rx1z9BkNite0ff36K1gjG5CdgZnd9G+EiYcQfpSVYCjx+zJ5fZ3OQrSsQxGojsSFvJHt/kRmjAaNsdOQsqrusBUmjx32Mm4IghEI1ZTiaLWiATdtSB9Rcgyc2Rw= - - secure: N2QrEVbYRnng7lbx8tpdb6dWXneGCxwZTKLJmVDNeohLS53Xa7tw3N48uZz6o4AaVaUhkGJwgeOHy+n+ZqeEDC7ObfiMoREOm8rqY0n2Vh0kc5rMmqLbcIeZtn3SfJKNlvGs5GCK+sVoGJilt2z7dwqIxtu07G5QBmTIgpG+hb3XHBmUHf16CvK0MURxV/0X5c+Y44FTqXPG05vyyhPXOMiRLfe76vohna2RF7DRxrqZwvJe7Y2Zkf6wwBxfFq8BAK6vmseqVjLJPp9SAOVWohIZmf0T9AcqsU/YGljFYGbQu6BeX0Zw0z1R3w2TqaMTw6b47i43w32l0DFLc5MvIUtxkFseAH+ukhp8WsrQTHKaKBqQrDzoI8zZxN+An7cBdOty30SjFGPfIEHKNywAX/22ezuhH1/+a7YZ7DGBkKdHYqqhKHHyICPT3CUu5ZqbP+hU65vcH9gsXykijay/J2zj+hmYLC9FEIUsNzboAv3bwHvinsuCFHboiHn96MUDshOVtMaMoc2mhlbl00coPjkEHAFT2rDmzPOUK4yDUSrpdpObBZkYt9I/aQA+a/N+bvSyQWqXICoUVGDBCqrp1vCcLFnB3JSExdI7AqmNwzNVXi7lFfqG31x6sTpMkqKroKWF7lSqzDchFBZLY5R1IpRkXHUEWXdK1OtWSnXz0vo= + - secure: HGVuIoixtDSZHOQ27Fft72vO6TxTtOb/AIobv/jDEZRe0FZ5yStdZIuj8FVavbFWOTM/7qFKLWXXP8JqBiu6L1WjCPPo6tjJn53KoXW49AJ7wzp9DN6sAh9HNp8qtUYaejUMYEW+LAsoZro0fTDZ8obXSjUmJ9yzz+rM62WtXoznVOXuY1lKazUwMwUiPKfG2pCSCSc1Xj/4gKPog9JfdSfEe+MdnrTlFC23oVowrOhzb4pErMfz1tY7Qp0mid8KGycNludEbuzZaPgCKDySHBup85o8Gh4smZVIEmFHPci96Ch9LbNd4xyuBws9hRnCaRP/yaFJn32Ast8FS3ZNPp2vAEPLXkhcyyA4I05xCqbKLoWdbT6VLjNYrptZsVXjE9xTjydQplErTNoS4VK0Pr1XaL0Ahl9fW2QSo6Z8tFbNieGZwAxOqYtEDzJ1Xt/fExPyyzidG01v8/rzL4f3JW6DgLlNqY+UCZrc/ZmNkVrK2+bi7hezeQ6F16IknzVyqIkQICo8TKqKiAXrgDHM8YTmrl10qGSj3npSQCtaCsVjqsOKohmqS5BfwXImJ9ts+d/V4kluqdEbWisrOrhF1k1GckVo3EmG1iW5siN34/SZ/ym5SRCBKMUOEZizbCyCE1aZrbU9eFNIu7Bhqzj0xyaKNsZAujdvS5pXTuenhkE= + - secure: gjYWCnwSvecHf76Pk31xobW2Wfc0zJr+B61cV9ePvdCN9o47R+1A0pGVJGkYzO+LhPcCY0X29mPUMSLUTwAz3GYFVTpFCyeNjs/HLuoA0AIztoVMPQrtrNey1g/QQ/lmaurVz1if8SSEaU9BxjcVVD/qzLGxZgu2bPKylfytAm0mzQrpjG/nVeD9usA6ZQMZLsaSUDtV/r18OC9yOz0gs6jwQh3RNqvJCzxXe1Zm79gkNoHxXT11O4U8R8aiXMMpVzvy6329u2s/zLsJdsMBUDP+VPUE6i4zhUL/MIOjnFR6gqOR79hE2PTzkzj3r16JP3+ciI/qhIqwiX7oJ3Rto0fP2P8sSGLcwkiQyL8SYt3ez5Kk4OHIz8Vy9yqi+DflRrT4/l6tLxwlh9BPjfLVHS0/fQBAKykNk+dFOLCeXcd0FvYHqbWIPPfkHkRb4a6FmqxBUyW/ZypR4WRDjaEvF0RELOyOjRDhXpD8Re/HbtzekdmrkJC48flEPLyCgBCyGeyoiPM7UfeFKuwqZYQVLMxyABClZ+uUj99d5rwB6Junx6YFFKhqTzBRK2A7BYBX6nFbsj1XqE4BjbRQpsXdHp5KeCsHMuZAccNMzoMtNp2e8vCpGXJxgPgQ1/llAzpnDjctps1VDGh6whjykFEcQNkOd5FtO0FMbSl4NtDYsQw= + - secure: F7utexrDUTmSmXcnoUKDdcIEztc3ejVOoIeWXowZCeFL+/BbMJhAUU5fFvnvY+i/X7BaoSBhwD6SQ/5QspCRA97EemaSevGa7bIzI91O9YJuUCYPf6G3QBdjeJmC+XDmK2jmcAqPowzkMLJ9U+FRmHGEM1qWhH9mQ/Q7m8nR9J8VsHBfF2c73PqWsq33YaIk6PVCiMu8xcNKx69P80O0/Xy0CTtRQNwHto/7WG14sH3Z9wJua3h3MCKMz94DEohyC9PgZ6+NNamJa4do71tWdy3lXR1+UrdQh+lxdDpVICkz8AhGaV7cRcOnM7CBnr1oYIGrCaTyo/H9fg6NKYrit24Eu3U/A+nEpb7KFvmHL5KrEAfuOgOOEy7OSySKq4Pli1hmsOXK6NBDPTuN216mk/MKAQUq0iC8UpLDHWFqJhKG3wC3vo+m19dN66tobw0w9BTJxyABiASRjvP9QDxMiKe3AGBncj2aQuIOsfN170xa2e31NIcppDId6y7ugp2C56pjrm2Bj2tW+timr0MKqrs0pDqfmxdQZgacKAqKrzOlsSF3uageLEod8eMi0YA7biq2s8wsPlyF5rEHO+eXOQNcyfDevFUmNfk6vei3KjTTmYa7Jx94NZhuQa+QFTZbksQxUxlXAuLVl3cDTMFooJGH1r8g7DmYhtRifKuOFWo= + - secure: LA9OmvihLy6QRZXdLhAVzy4R+anTmGN6a2xNMdjtQZl7xbJH9aCmSCquTZPcjRnfqovxnijns5sLFTBXxpQ457jw9aDwsJSsSQP+t8xF12blC3/XFKZBSkwQVbXe8DIgLj0GgRnPatgeCokQshDsYYbdPJc5bNmDFO7+BtLarvRSZlXmeLtNp3EzxE6MiDbIS3Pz2ewzRxelHj1A5z3GI/OSpOcrAOlc3HLX6xsnuyalwwUld7aDRuy3pazzFUZoFVR37ymW9oyExS4nbpWCkqqYeOY2W38U7M3/ydbPQp3DmNBiiXsyq/hGbed53XdaR7txZVZK7vv/sml+gbeA0EI/bg8oMzYQ/jPAGxVriBE29E0nCmJ4Ub3Qp7AQpXqmB4qNOoGQ24zt64tSdQIYdQL+GZHuD2dZVy0/7kqYFi7cJApEcSASCC/AEgFtR6Qp/i2WfMLVVBYxhFXli6P2ea3AnuKs3PRyWb0oK4PibfNfxA1O9QdCYKgbd0VF0rTajxrieJkTGgxksmpTKemFM87BL+MVsK8Ak8MyMtGj1Zd7ajtH/9tTK8HJu9jR5NoI3B71Zo2zM+Hw5VZN7w4h67qoo2bEQoEjWc2c+26OI1McBcQtgTvIBtQLOnPaLA2MwYBaQy2z6v/OhjW/OhG/eD/IqMO7l+WUKsO3zM0XDCk= + - secure: foqHSPc6KaU9qysSgXCzrFACG/BxSTc9pusHyMULXIgRGMK1OPU+wGReqo6eA8u369CDr0JTdqpFn2XPdKnVwxYtKRsewHiJoqZkr8Rv1OG8dJhY04F6oz1Vj+0LO6KdU8TNwjSYZ/eXB9RX/vpS10H6o3bNEnq8Cfh0KBk04RnQa4ZNz9phLzLHBEgJuTwyVkQyAxmjlctEaMGztzhPQyPSniBunURz2oyYHlnqDGAq4wPqU6dEPpbKxesGGCci51b7SvQtUq/xO5zng1NGyhUsnVaZmYPJREC8A1u6EAyB9Fvt4YpjsfKgMEnGHQ5HLHR5sh8tqQ0MdeAf/7sCEqOh2DLh5RZ7ZYR9i+aR1hjsxI2j8+8pJi8ZGKpzBEJApYQq/pGIDyD6iptuX0J8er7yvf4PZNqZGYYnz7ACKUOHdDCzGJYw7nvjn0dZMUWbFvaqppsfH79NZutw9DwsZqWHN+hSh3dELurZOgKSSupehy5NeL2FviTUGzBPe2i4ngHo430BJ4o17q7fTllyLNeL1x2PW1PbKVUfP0IJ7t6WQXx9TnXvs3d6xQU8xDEJCH2TjG9dBnoUcXOHez9I+EDQK8jBAfGeEocr0yScH/0pjcsc+5vFovWkorRxvb8gYFyjuAhzDeh/5zQ11/weLCnz8N+Z6PB1vSPreQP8o2A= + - secure: f1S2vw73gnWirrj+lQ4CTLhASXdxsiSZIWNvMS3Zg49KuA2eqMnzSrm3YyJDwpxkD24DtC1iDXNr0jg2WcELf09sd7hrBYi3KX6jOX7c6haaVIMt5K/5IC66Cm6+RvLrPtgfSt2WD0lc4zvKKqlPqHTz9vDyXlRc1vvCUUR5lVwRRQZ+rtl3CDPsS77AJ32kfraA0nRqc6J1BYHEtZ9n7X8InZ2Z5Ztzpu08zMkS1R+x5Wk7CRlcctDYocohNQ9oYKVEL0y+Z2Snf+ybRz5hLhx7AkB3bvF/2J0cWlbtdjVuOGPotJCe6Fq+bRqgheq50UYZD69EtyHcqoYdVD/3p1W4sFEcR3e21xAzpAZdTHg9Tddm0bqb5M7uFtNNSFEJgvUxgOdUpe0IBbrL9P107yO7J17zeVHO3X3/BHZJRlkTAvEqiEW5plvivsxio6HdUlNqyOO0fj5if9wxIJN8eXCOfiQ4W3PyNb/R16i5Tpkv0Spf3jb6qrADBVlUrVRFC/ejUUu9ALBhFvR2VWv5l0uWItv6h1EPH+9RESS9HByXjKgyca/Q8xZighQmc64VDEdgnZSU129dR0lCKInpZME2UxzsV+of1A2Qm1lt5b2PJKPspeJxxLKaEaD5mQYsQpzeLI+ms44raL4Z/U4sPHre5nPiuaMnfDup8T1kk7Y= + - secure: BRZQQQUyPjTU8FWqm7ZEJ+RAe5GxBMD6jCWWxktrCsYeCpzxb/xS5ZVsmCzmle/hehti7iBSrPZXCm84/sUU2YSUKEg8BV6CuRpMVSW2ykd7f7nJa26BCaFBnEUqiNapJ3bSzfrWl6R3y2mI0b4HmHqAET6TFDXHMJn5gp8rCHByBVGrlSkThtM6ETf+In66r7JAhOR8mclna7RnOx1eIVxiXd0DdeScIW+i9FIUeXZlXmpASyY59ryqnzqqlFPrwrsPGchoTCwXhnjEYnbBj5Jp1RGnGSDb8Lhz5uhF8iDwHxrUkdW1D53XO0oAmH5ksaiTmUSvV1suWiZQnusvhbdgA2tBS6WQ5w9mvfAsSG5M/nxowhmfzTJSuv6k1XRqhxX64bRkujQ/I4EZJN4ar1fYv9RwCHqfgcsDgWVWFJNCwagxwypo8dBDOtja2S1OvVW9qqteF5g7Kf9lrEqtvsgxQZiG6pF9gNmymfHxk1C/7Au+qQr1eZ5G38/WuSXgsZbChisVlk5LSF1mTk8OgQzQ+qNGAcCoMaGak9jhuMFv+sGjmRoT1mikngD7ZbaH9dAnpYYV+WyJKDvh4Fb116vCYzcwcz+h3fFJoXa/Jl/x3yCc1GOFbMuV5jVf4IP2gQmxdNzn3WNbrtBEuy9zlMqRdeF6WYc42t8cWq3BrsU= diff --git a/build.gradle b/build.gradle index 86fc7eb..f9e86be 100644 --- a/build.gradle +++ b/build.gradle @@ -15,9 +15,11 @@ plugins { id 'org.asciidoctor.convert' version '1.5.3' } -version "1.0.2.BUILD-SNAPSHOT" +//version "2.0.0.BUILD-SNAPSHOT" +version "2.0.0.M1" group "org.grails.plugins" +apply plugin: 'java-library' apply plugin:"eclipse" apply plugin:"idea" apply plugin:"org.grails.grails-plugin" @@ -33,36 +35,34 @@ repositories { maven { url "https://repo.grails.org/grails/core" } } -dependencyManagement { - imports { - mavenBom "org.grails:grails-bom:$grailsVersion" - } - applyMavenExclusions false -} - configurations { documentation } +configurations.all { + resolutionStrategy.eachDependency { DependencyResolveDetails details -> + if (details.requested.group == 'org.mongodb') { + details.useVersion(mongodbJavaDriverVersion) + } + } +} + dependencies { provided "org.springframework.boot:spring-boot-starter-logging" provided "org.springframework.boot:spring-boot-autoconfigure" provided "org.grails:grails-core" - profile "org.grails.profiles:plugin:3.1.8" - provided "org.grails:grails-plugin-testing" - compile("de.flapdoodle.embed:de.flapdoodle.embed.mongo:1.50.5") { + profile "org.grails.profiles:plugin" + provided "org.grails:grails-gorm-testing-support" + api("de.flapdoodle.embed:de.flapdoodle.embed.mongo:2.2.0") { exclude group: "commons-io" - exclude group: "org.apache.commons" + exclude group: "org.apache.commons", module: "commons-lang3" exclude group: "net.java.dev.jna" exclude group: "org.slf4j" } - provided "org.grails.plugins:mongodb:5.0.8" - documentation "org.codehaus.groovy:groovy-all:2.4.6" + provided "org.grails.plugins:mongodb" + documentation "org.codehaus.groovy:groovy-all" } -task wrapper(type: Wrapper) { - gradleVersion = gradleWrapperVersion -} grailsPublish { userOrg = 'grails' githubSlug = 'grails-plugins/grails-embedded-mongodb' @@ -104,4 +104,24 @@ task apidocs(type: Groovydoc) { task docs(type:Copy, dependsOn:[apidocs, asciidoctor]) { from "$buildDir/asciidoc/html5" into "$buildDir/docs" -} \ No newline at end of file +} + +bootRun { + ignoreExitValue true + jvmArgs( + '-Dspring.output.ansi.enabled=always', + '-noverify', + '-XX:TieredStopAtLevel=1', + '-Xmx1024m') + sourceResources sourceSets.main + String springProfilesActive = 'spring.profiles.active' + systemProperty springProfilesActive, System.getProperty(springProfilesActive) +} + +tasks.withType(GroovyCompile) { + configure(groovyOptions) { + forkOptions.jvmArgs = ['-Xmx1024m'] + } +} + +bootJar.enabled = false diff --git a/gradle.properties b/gradle.properties index 5ef1562..e0a625c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,5 @@ -grailsVersion=3.1.8 -gradleWrapperVersion=2.13 +gormVersion=7.1.0.M2 +grailsVersion=4.1.0.M2 +gradleWrapperVersion=3.5 +groovyVersion=3.0.5 +mongodbJavaDriverVersion=4.0.3 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 9411448..62d4c05 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8d130c8..622ab64 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Fri Nov 27 23:09:32 CET 2015 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-bin.zip diff --git a/gradlew b/gradlew index 9d82f78..fbd7c51 100755 --- a/gradlew +++ b/gradlew @@ -1,4 +1,20 @@ -#!/usr/bin/env bash +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed 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 +# +# https://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. +# ############################################################################## ## @@ -6,20 +22,38 @@ ## ############################################################################## -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null APP_NAME="Gradle" APP_BASE_NAME=`basename "$0"` +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" -warn ( ) { +warn () { echo "$*" } -die ( ) { +die () { echo echo "$*" echo @@ -30,6 +64,7 @@ die ( ) { cygwin=false msys=false darwin=false +nonstop=false case "`uname`" in CYGWIN* ) cygwin=true @@ -40,28 +75,14 @@ case "`uname`" in MINGW* ) msys=true ;; + NONSTOP* ) + nonstop=true + ;; esac -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then @@ -85,7 +106,7 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then MAX_FD_LIMIT=`ulimit -H -n` if [ $? -eq 0 ] ; then if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then @@ -105,10 +126,11 @@ if $darwin; then GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" fi -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; 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 @@ -134,27 +156,30 @@ if $cygwin ; then else eval `echo args$i`="\"$arg\"" fi - i=$((i+1)) + i=`expr $i + 1` done case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; esac fi -# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules -function splitJvmOpts() { - JVM_OPTS=("$@") +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " } -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 8a0b282..5093609 100755 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,3 +1,19 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + @if "%DEBUG%" == "" @echo off @rem ########################################################################## @rem @@ -8,14 +24,17 @@ @rem Set local scope for the variables with windows NT shell if "%OS%"=="Windows_NT" setlocal -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - set DIRNAME=%~dp0 if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome @@ -46,10 +65,9 @@ echo location of your Java installation. goto fail :init -@rem Get command-line arguments, handling Windowz variants +@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,17 +78,13 @@ 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 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + @rem Execute Gradle "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% diff --git a/src/main/groovy/org/grails/compiler/injection/MongoApplicationClassInjector.groovy b/src/main/groovy/org/grails/compiler/injection/MongoApplicationClassInjector.groovy index c21deec..4ca9df2 100644 --- a/src/main/groovy/org/grails/compiler/injection/MongoApplicationClassInjector.groovy +++ b/src/main/groovy/org/grails/compiler/injection/MongoApplicationClassInjector.groovy @@ -2,7 +2,6 @@ package org.grails.compiler.injection import grails.compiler.ast.AstTransformer import groovy.transform.CompileStatic -import javassist.compiler.CompileError import org.codehaus.groovy.ast.ClassHelper import org.codehaus.groovy.ast.ClassNode import org.codehaus.groovy.ast.expr.ClassExpression diff --git a/src/main/groovy/org/grails/plugin/embedded/mongodb/EmbeddedMongoDBGrailsPlugin.groovy b/src/main/groovy/org/grails/plugin/embedded/mongodb/EmbeddedMongoDBGrailsPlugin.groovy index 67c0bc8..4958b0b 100644 --- a/src/main/groovy/org/grails/plugin/embedded/mongodb/EmbeddedMongoDBGrailsPlugin.groovy +++ b/src/main/groovy/org/grails/plugin/embedded/mongodb/EmbeddedMongoDBGrailsPlugin.groovy @@ -20,7 +20,7 @@ import org.grails.datastore.mapping.mongo.MongoDatastore class EmbeddedMongoDBGrailsPlugin extends Plugin { - String grailsVersion = '3.1.0 > *' + String grailsVersion = '3.3.11 > *' String author = 'James Kleeh' String authorEmail = 'kleehj@ociweb.com' String title = 'Mongo Embedded Integration Test Plugin' @@ -32,7 +32,7 @@ class EmbeddedMongoDBGrailsPlugin extends Plugin { def scm = [url: 'https://github.com/grails-plugins/grails-embedded-mongodb'] int getPort() { - config.getProperty(MongoDatastore.SETTING_PORT, int, ServerAddress.defaultPort()) + config.getProperty(MongoDatastore.SETTING_PORT, Integer, ServerAddress.defaultPort()) } IFeatureAwareVersion getVersion() { diff --git a/src/main/groovy/org/grails/plugin/embedded/mongodb/MongoTestExeuctionListener.groovy b/src/main/groovy/org/grails/plugin/embedded/mongodb/MongoTestExeuctionListener.groovy index dfebe00..e881dfc 100644 --- a/src/main/groovy/org/grails/plugin/embedded/mongodb/MongoTestExeuctionListener.groovy +++ b/src/main/groovy/org/grails/plugin/embedded/mongodb/MongoTestExeuctionListener.groovy @@ -1,6 +1,6 @@ package org.grails.plugin.embedded.mongodb -import com.mongodb.MongoClient +import com.mongodb.client.MongoClient import com.mongodb.client.MongoDatabase import grails.config.Config import grails.core.GrailsApplication diff --git a/src/test/groovy/org/grails/plugin/embedded/mongodb/EmbeddedMongoDBGrailsPluginSpec.groovy b/src/test/groovy/org/grails/plugin/embedded/mongodb/EmbeddedMongoDBGrailsPluginSpec.groovy index 9888202..518504c 100644 --- a/src/test/groovy/org/grails/plugin/embedded/mongodb/EmbeddedMongoDBGrailsPluginSpec.groovy +++ b/src/test/groovy/org/grails/plugin/embedded/mongodb/EmbeddedMongoDBGrailsPluginSpec.groovy @@ -27,12 +27,12 @@ class EmbeddedMongoDBGrailsPluginSpec extends Specification { given: GrailsApplication grailsApplication = Mock(GrailsApplication) { 1 * getConfig() >> { - new PropertySourcesConfig([grails: [mongodb: [version: "3.2.1"]]]) + new PropertySourcesConfig([grails: [mongodb: [version: "4.0.2"]]]) } } expect: - new EmbeddedMongoDBGrailsPlugin(grailsApplication: grailsApplication).getVersion() == Version.V3_2_1 + new EmbeddedMongoDBGrailsPlugin(grailsApplication: grailsApplication).getVersion() == Version.V4_0_2 } void "test version release candidate"() {
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies: