From 20831b39eb2ed6f559f63a09b4a9f1979d36ea1c Mon Sep 17 00:00:00 2001 From: Adam Date: Sat, 11 Mar 2017 14:34:22 -0500 Subject: [PATCH] Use webdev for distribution repository --- .travis.yml | 8 +++----- pom.xml | 6 +++--- travis/build.sh | 10 +--------- travis/runelite.key.enc | Bin 1696 -> 0 bytes travis/settings.xml | 5 ++--- 5 files changed, 9 insertions(+), 20 deletions(-) delete mode 100644 travis/runelite.key.enc diff --git a/.travis.yml b/.travis.yml index 66b128f565..0ce504ac86 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,13 +7,11 @@ addons: packages: - oracle-java8-installer install: true -script: "./travis/build.sh" +script: ./travis/build.sh env: global: - - secure: XkhMC3ytOrlgL4wNFRF3Wi3WxQl1vef1WxUpHn5/k4Y3oLDEJVTv5r06VhJz+hU+drdMPy1cJPmOCRleP+gNdM+Ka53aBaIJ1Hdmxw4vboZ05qHcNR29mi4F0EDvzZf3FtdWz4oXsLF/aW5+ZP4UzPa+jvpYmkvQa7MEM070mDUdWtYP/4N72aa934B/0lbmGithVbItuNabvYb4S+0MEXSTM6WAGE5I+Q+UbOwatHqqwzMZDuScA556XOc9NSDffcwgNKOuD7SmK3JETn3iFMXvSaMv21dL5ehiIJlUDVpQhMLWKlCj9Hh3VqX3ojML12CwO58+oAz4BvnR+pfQR6cC+Q7DyghxGs/+J02rBAJYIFlCCS/PqmrfdmriU8ejb/uiyPCsDNTgpEY9+92Puq/DswliRG+9YI0swN7qDSGzPWqriG7hoFmELHk6OZtX7VlRYNK6M+jfyY12SuPjQF2Mm1h18+A8thq8IXrTAB1FgtH5Or3ZVTuAPwEDBhJuk63uYZd19klINEzktxiB3WEgKCX4YMICKnxikBDXvCMid+tFV9nJclw7xFlOab9+GgkBHDbjcCBVwwPci2ieGVSC3sZb/5SS6whNYBFIO16rNTN+KyAONX4P6WQ6Ffg4FZEzKiU1c+HS0T87x2gUMJsAlTL9dUEcwvWCYLIPsBM= - - secure: sH3m1bxlyUt/wy7edGEhAMvmk65SEKPPFW0rkC2h5dPXNScLmMtnv9Hk+AfmqWHervU0os1OuJjviocjyemY/Hp45WDweNBre4cQK/WBQwPKv+lcOMwqVbqQpQoeuauw42Lz1VBmQ/MqcCxhnXPdagEETgFYPaMYIN0LiUq4j6CMqHMGu1maljJgDc2fRe/OdKU+aAzksfAX+2ZAH3tQ7EBvJT3pP1FoJAOqQqQ5TGWYQ8R/jZSuDQXsBLdvmXzR2J9OPSzByk9PJaYtbKNrpynP9XzpXbr03Jq7Z6Fq1rxv/gjgzi8Rid6e1rJ6R93TbgzOltA8qQF6cVT73MzDCFHte8qCimN7WrH6Rt/Fw+b+t7ROjUjFWLGeJE5ujSbLDtlyaMccmyRx1tmxpTZg3F7FxhhbeYSYWZJ5W7u3Qi3vDKRVQvRh45EIAHVllDX/5hUZB8F8U517DpkXUdUCOPLiDbosJLow2L6RLywmQswIeD3oRGxQjbZ8x90glalq2dm/QIS0Q0s0OOO0+C/CNrEcEQqufSFQRT7m+XU5XMf5Wu/kpPNsRcXGXYj8aXi5mZbnXc3E0XyJhgQlrrWzJUTMI/U0jfFW1+ZZO/8YWlsShIdazWriPuXwBQqJG4Kshe95TcJY1RJc7McN8VUAuCAiJ/KsF3GUbsfWSejt3o0= - # RUNELITE_BACKEND - - secure: psryZwj3/+xW2ZF/pjJR2UqCBVnUOdb8pbMia34yc5vQ2CCB2+ZrtIJyCEBXVpyZEgNj3qwgNtuj2tl1wameBVdrfVBBlkotlM120aeRwvMkmsggcNhTexf9SXcuRD34xGWvN7hF19ZiKBZk6rHWgzkDupFOPEAk/Q0E2swHW/YPeK8MKvRbY+UAK1WkY+TO4aJoVvDq9tc7Jbpj5XDhY6RLUb/96D+SnpBsnUG7GCpZxzavEZPMrGnMgntPlew9nWLHHcBKZbkMgTfD+X1fOrEG+kylOKIkV0afby5diKknVmLTfUUi1HrHUsvmoojcMtpBFN6yFGG7qrQV1DpZ/gZUcavWMNcBqrp03Dkb9Mtv2pnAI/KTERF3EmuzBM7/dmV/gw7Q+DmZBk97MV1ZFTvRcMu8u9OqC2TV9Xao3DqJV4dBA/d2CJrQHHdJopnh5kiEQtsWJvvqV1eLLBXY7EukMgmbYSb8ihOBY8Hi5tlIMit7j/RJCqM6jHlHEN9XcPOmNNab2liPiviWTQrvrantc2UxhgTX40DyhnDmVZIXIyS0ubqhRCgdxKuABS5aLY6SI0byXlQVj1GS1onZm9LxiTM1tq5EgCyQGBa0/6EpQNk1CNUF1dpZC7gOOFLC9nSQaBgRhqU19+6ctWTJjiTo+4WnTvutRZ3ZXoR9CE8= + # REPO_PASSWORD + - secure: b/vNiqFcPkg/7pg5bZ7p68aSYAUgR1stOqCFnTRm4WnMFtiuJwEONPlnOo3GDb5ppJvrJAMpkfBpxwMyapPTPyz2PqOLHpGXWJBxaCLXMiEJCQSOL5eNsv5I20x3lC76xfTXum+nnjimWMiyDIZcMOmdq1k4FAP2loGobRuAycbWSIdXMyIqHNNFTlh6uW4Y6ubOBhl7mvkLMKmbxZOGxBJe/J66TfCihEwwz4uIHxfR/Mf146tJEy8oSTBqyCOxE4xZOa/fdJfKyzri8kcEKQNfgpcULIICfNC9LEuawL1B+hj+PTjW4/bCLgoSzwp7qr/rODvGmz9whGyPwoCtJWbOZg4LoHVkMvKDx8s3ld3E3TNsHfE2OaDdsh6YWHZE4dTw+oDHmjBQQ3Z5MNC2/sXXg8QroczUnve8clq/bNGiodj2LSZRCBGT5uKV/Q7S4hZm9owQu0geUy4zSafDOWrhti3YQK/67hnen4lnY4ESXguNecF+jqe6L5+5sxCnKhFhulXSzDskcezSkO/wHbvEZYuOm191L93jx24vRVB4QEPY6U0OW42Ku08WrxiG8VAkBa4gIye7MCs2EthU6IWxjFhsDV5EolIliKcq0l0dNhAHFFBUHgJ5dGDmhiof6fVS5ixIzNQB4V/PeeCIUs6XdYY6mhsNW1EhPPJ++lE= # TOMCAT_USERNAME - secure: ojn19kLrRjfNGEindivufyogtYVMbUHo5pyQmB5dXd3SojxEUIyYx7o7tYCfFcCQ0AmVZCEwmpU651R/m4cKobbx0suF6epozizhvS93Egc0RR5xXyUAHi0SgEUOf8fsv1V3SYy8gdaqcFFXTg5owtkdnfjjspIqrX8xZoVHItH21g06Izu1Zag+3/ovUrINY6TQM1voMQdBWlLzJ5N/gtY2AfhBGzdqa0tfSrpv23xRu1jrD0jZtE271tCHVlAFM9uJOLOP9nQYBxXC5DAoTgEVZb3yPgyiJgw0vWHneTEF5X+CQ5o7RXJQOWVdLJw5ZKfjLyFyHai44S1TA+x0WvAZjmwQvMlqD3PoTOd8dyz94eRU4lv2FE+bnzLjpBeSwLBl9tk9CketJIaQcOMUUOnuAidvgiKfDkNuMt2q5LcE0qFfjrgY8k8DBtYI13hodGMIIuUP3zXaH4nK2jOfgzVzshCpVk3pwsqtxwDjnTUIFvv8IJO5K5kC6dDlWbH+J7yrX4kPj7GKFxYcdWsjSg59E/qjeeHomqzq7PMj1XqWRgDo4JmqZxU+qgr3f2tabyP8whFdbDZTQgLuX1y0lP+7hUzOwkoi/mnqUAHlj81vRylBcX/gFtI+pJQwD7ZDwLfAmBPrkizetavxTWROnAuOoeRlzseVpclAscM2SEo= # TOMCAT_PASSWORD diff --git a/pom.xml b/pom.xml index ca9ad57ba2..2ce508949a 100644 --- a/pom.xml +++ b/pom.xml @@ -49,7 +49,7 @@ runelite - ${runelite.repository.url} + dav:http://repo.runelite.net @@ -95,8 +95,8 @@ org.apache.maven.wagon - wagon-ssh - 2.10 + wagon-webdav-jackrabbit + 2.12 diff --git a/travis/build.sh b/travis/build.sh index 65798428ed..3d107c19b0 100755 --- a/travis/build.sh +++ b/travis/build.sh @@ -1,15 +1,7 @@ #!/bin/bash if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then - ssh-keyscan -t rsa $RUNELITE_BACKEND > ~/.ssh/known_hosts 2>/dev/null - - openssl aes-256-cbc -d -in travis/runelite.key.enc -out ~/.ssh/runelite -k $SECRET_KEY - chmod 600 ~/.ssh/runelite - - set -o pipefail - mvn clean deploy --settings travis/settings.xml | sed "s/$RUNELITE_BACKEND/REDACTED/g" - exit + mvn clean deploy --settings travis/settings.xml else mvn clean verify --settings travis/settings.xml - exit fi diff --git a/travis/runelite.key.enc b/travis/runelite.key.enc deleted file mode 100644 index f7b427948dbac50f51a1f9fa075118bdb5ee67be..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1696 zcmV;R24DG8VQh3|WM5zHySx(dH2ndJrx6eV{w;K#6XZMcSO|x7U}#liP=-RUj#hU7 zG^zi)e(Lhmn}}Ze(c|Ob-+Kk?dIAJ=jcAkyz=JbUPu)vlwm|*yFl4Tzho25zaqfnL ziGf(M*AT?xk42zXi}fAw4lCfiyWttz)%dqgBlfJ0@D(f7xAl1?K~hZJg}5G??gMXD zN<17P=`g9#7#H`gzo`#JBF&W79!c_`{GaMGk9G!P_+=W>9mkhcLHUS&O$^4mHgSl% z{pbV-oTjZ(-Bq{qDrtPQQ0pHA5HiN3QlO>aSJtYQT`1(^Bhd~Fw7}9Bso&+_<%M|f z6ofn0*UR8rd5P382aKP(vaDu5M|5I|ro)3TsQH&HV>8u=@c7j_EdhzhM8yJ5v*?Ka zagYEr8OR#9)^K*^Qt<9k{-WB4d+aS(vx|$LJR&=@GuEqN3g@3i5KqV4FK<8@j~6}k z7@-A%Pkt7F!tM79H1dlGEy;^vU21o?@-;uavQfh8%06* z(RUBLC<{@C*FB`(Qg=d>>vpVYvB~hUf72*n&K6$JWyhi3&)%T?uL2KVB>()czodr- z(4Gq?axCrKB%_V5ntD|$NV2TCt26PKEjP|H3;|>n5<608()~1aWm;o-%%ixR0fVu;1t|fRu6?3 z)eIBxxUpgI*;wOVC)o6H?2GQHzVGh^q9souLu-!1BP!6+}`0aJh>WAYPC7oD3qQi)OYGdjS zvOZ+#qdpMKv0l&JKo!kU)=K->)t%wD3L>r^oQ<`~Pk;{lCc^!cyNU)HCYt2J2RiPb zA6h!%mN0i>V$-QVy{N#+RZKp>qOHL`xbxJGZ3YVwKNO*aHXQrizGzajppck%1KTz{ zK|V8ey8Oi48k2n0ZFBX84p!gBUD12?#JuHI&6)TgtOH*c{FR-c{U9nJ#mMuY8Ow!1 z2)G3a)T>~<3V!wpMXSL=Tx4i8=8z=g@ujzJcN@zhIeFlb$G7}im@#F_N5n@ER*A+1 zKqoC0_Q(14lk5~vE@n_sM`4-Zz8eo%6p%?K743evH$gEKE8YDM8|ZxroXh3}?J3z0 zV(h5THlt1QCRmAV3`e#0C98Tx=x%g}vzuro)nCZWUnR6)7oUi{N7!#YH+`)MB@Xlf z*-q;+$G!VMn;&FQ?a#I|v@P*U4NVbF=(^%RE95UQ@_Y+~`BE^zM3q6#4jH++(x%H* zx}};j{S1>)RckL^t}g3^e8%cD9=kr8WbwXzm@Z_?%cpctY+Cbk==U#Ptpe|m)?&Fk zH$nD=DmcU{J5A2u1EC&m6B0EM)1-0q-=AB;HAjA!^AplZxi)1bg|~*;^-mEmXX%z4 z0QJnZ3bU`IiSw`N*liqt$9v>yDlXR3kpNo3bgO7Ck65hy=`|UZCs^!|1Q9f-3-%LG zn-VOmQM-)P5DkUaSGKBD&)$Zjy8};h4hRsq&OiVatN94h0z*sLlZtdVTaO>AarH;dzIIBmRk79 z4q)2Fv++Vm3ZV6XHYq!tidd2`i$((1$%qvykNc@gy?E0N8dCUVWYO(_boNM=%`C`i z@CKY5#LchP$q~q%-5k@JSa$uR5=b!US_X$Ur}KBA%ABu5Wwv+=Hc(g>@8X)TcPc;? zP`j^bgx7la`t`lD@KL;1OfwQ=6Jlaz>iJo$i9c{m4Ct={W%*K?1TGK>oGn1Ok=h}|m6;0^|&bk|+^|EB~% zh;{LRye1C>*x}YVzZ+qTcdsU5~EW*sVw{Mema{P)Kz qD}y++mqPkWS_kPx^2VEsM%>X65inOb_ZX3Knx;td<_HZ|k&63#cTV5{ diff --git a/travis/settings.xml b/travis/settings.xml index dab99d4005..639d020557 100644 --- a/travis/settings.xml +++ b/travis/settings.xml @@ -134,8 +134,8 @@ under the License. runelite - runelite - ${user.home}/.ssh/runelite + repo + ${env.REPO_PASSWORD} runelite-tomcat @@ -262,7 +262,6 @@ under the License. runelite - ${env.RUNELITE_REPOSITORY_URL} http://api.runelite.net/manager/text