Skip to content

Commit

Permalink
Upgrade nebula.netflixoss to replace bintray publication and update T…
Browse files Browse the repository at this point in the history
…ravisCi secrets
  • Loading branch information
rpalcolea committed Mar 4, 2021
1 parent 6c85820 commit aa51289
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 28 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,6 @@ bin/
# Scala build
*.cache
/.nb-gradle/private/

# publishing secrets
secrets/signing-key
18 changes: 10 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
language: java
jdk:
- openjdk8
install: ./installViaTravis.sh
script: ./buildViaTravis.sh
install: "./installViaTravis.sh"
script: "./buildViaTravis.sh"
after_success:
- bash <(curl -s https://codecov.io/bash)
- bash <(curl -s https://codecov.io/bash)
cache:
directories:
- $HOME/.gradle
- "$HOME/.gradle"
env:
global:
- secure: aP7v6KUwtPPhRwNeNagPNavLN5mnqW+v5j/QtZxH2UdMIqMDC9SDQ8pOcr27erHrcllnsTiSu74eeSLI32nGgjtwjQqx+g+EVz/ZTHFVsSuPQyuyId1oNuYm0Uvw1RXi1fMSjaU+BvN1xo/t4qHb81PJhSC3OcCUX/BY7pF6SsaIPp6GPVmfNbiwf9Vv+iHztIyEyZAtIXc7YEWdRBvQbpa8phnX23oZ0g+ZQkTJr3yNEVuV+0ml4wR6qikyeUY4mFuZigCkCY9o5wd4tMOU2d3nVPhJ0w2thtgV/o6eh7v8vPmRcsf75O3M9MhgTXtY3EluRRRuGE3cVcZrcG5be+rsiL/LJJ8bUyDg8S+3wZ0uscVYWR1LkYogwi9OBh4V2hZKVd3iyH2s0lyxBm54Z0D+oUPcXI3xb4DgUM94EcguWMcwr6FGBq2js21wAzP3sazDCghX1/F8VLjo+ohOJBdX/Pr/e4siwYLw0K4kCz/YQyyKKXJ8JwUoM1Y5IW+xwhbDNc7w1EOTBg6ih7K+ncF3kQtJNVks3qHh8ZDEwiVWArEHZboL5njaqrxAdazqQSOT72qlCiPy4Y8PtXA639IslLfNvi/n7v1/2TakleglV4NBRmrtlrrx48/7f86IqKjp0+CfIefyivFD6sHH6oAkuNFgtuPsqokQeRWUyzY=
- secure: p/HjhS49oknwfOwt7cBiKltaIAQ0Lq15j8Ju6YYicTlf2YC+79kZvV2wSjEjlCwlvp5QKI8HRNqX1a7Z3+dKkuYqpzjs6/HCZTJhsYO1hsuNrw2RuIDJsTx8feGzopyrvUq4EswIvCai7uX4CKjKY9XJxbuudBFSnpwo2iFDBoYC7fdehWXLsNP/AAb0OlerG+qC15epUfW5JGi7cjBKoNo37uXnxLPNHMZ2J4wUZaTxe/OrZhSZJfjHxAoVMv2UK2S3zU41up3IIMFsXtkbZfTd5b5rUA29pzm0cQovtXzamw0zoL2HE3AbyTEYhTuwQArbnJP/SR8f+tJZ4TqKscMX1GXr6PCnyaYey9hGvGr60vDPJ9za6zXvwy9qzfddgb5I0b6atRU+EtCBdFm2xRCkJZbZs08ENnyXA6f3q9MSAPjKlMSG1G+R5O5b/U/BVZiJNSfIe9UQGDRS2CAT9uSzmdZCj503WxA/e4MCW0X41o1YIcPUQVgrMNLF3GusBtvvz1B/cOWv93FMAUS7G++KUMVGN4smyZ9eCqkV0Y7d7asJJ4a6sl7ixnEOpDiAIL/5/5WE9C40p9LCg435WOdyipPXTfXf+dbQa3tQExjwYmMuKluHkQZLJKPTOvLCa/gWyDtIz936dWl0QRxRISxCnvqjCRO8V/ARrahkWF0=
- secure: ccchdF4BARv4MI9omQpHrP6zHJBKnPOGklukxHZj6oqtoPT/9fDv8bYNTzqFsh1Wup0fMv1qi/aCjzdQO886UsYlgOnoeaJJYl9ld/uubb96vYs0WbAveOX0N7/IZ+cQyewySu6s3X3tzAkTK35yCfV2+EYL1m3L8qvPEKu+Hkbnwp1VBKbyhr5qnW+EAQLfIFvm3EhxbCHlIY4j/bAfsEYH3N0Guwrr5oZqYwKOwBbM40pT6waH/EwrIlgb12LK2NEYWanp73ozKsogd9FLSrFoiaiA8PKdX2aJXbuiEpgl40LA/Lqzqsu4t1Fp6+EGwlmGnpfCl0CZN1S3MpkLnDOwHHd+RHB10XljUatrMbxyt0nPoPgKNo9+A4elsSyCEVm0XCysnBJZfIftSILM7Knm0/pVKcHtulYsB3FbloGEXohczwgHeeKwBJtUBrh8st96MAQD12+JKLSGhmIucVrbRdQhsbN/GmPiwK083gavBnw4S6As+4fyei1NoGCqV1UdzRx2sYBToirTSSyL7WKze5ibFxdaLy3Pd/2RvU2KEKUJx+JpzYH9u0ZslffSQysGhzYCHOOnnllxYh9kFMopYRnmES7SSt5BuX/Y8t0NNsFEjOF5Rv590VxDG+mHljSlCkztoPs1oqTqP/0dMKm+VGPAfjf/2aOleduoUNQ=
- secure: o1ehgSTcKfKiVvyWHz8y6hgdvnnEfeiTIOyW2TW+rxf3xlmToBlSjiZY5GanLG4h5FkZKzhMwQt8WyLUs6/rySSNXItWafno/Y2UjJc3ZUdqLgb/dycPNgCstZiUMDdg59tkNSJj9CD0iJKxIVtseLYCgZaCwMBx0uqteKV+EWj5AdS0T/kI4jZQztSTc7dagNCVT2xETOpJFgvp5waZlS1Slam5Y6WQoIPDj8onqjI6pUMdBK9vbXvTIbncNlO9tsvC7UczHIAbPOXVtsjdaFLfJg2rIHLHX5xfjd768nHvCmhHwZ4OqknhjFtj+4YDBt0oUuezlAg5eSm/eAaAbDP4ViipGP1PGF5FGOrla+pZEIov/QzvXL06aEoOG1VkD01dVzObMoou9OKraxY3xy2c2Wnj2nyItQwrIqhUBiL77iFVLLNnVCKKnpD7ftO4dOqmdev8LaXZKzYduPvUzF6d3NYlOWrK38Z+o4XjK9vXULvdefB+ah6R7I+pYAjQPtHghKwIMmIH6XQp4TxiKdN0B8C7Ywe46FSQQt0IKX5B7u9YxRUSmoPlsPXWIdXFZIyKqm3JQoZoMHCWsnhUdvDKFIvdCweB4OdF67c3sTHxnpBrzoDOFZ8wWB3REzNdrNgP7OBkHzhnDqSAlC+rt8Nxpbc4XB1t3OHiPJ7QFgI=
- secure: qVKe1HfBrLX4CvrgSQNNTZcx3iolNPnkQRG0NRUgcby5+BUYttJmMxbLJbMyMdrsmPElItQ8IZyUR4BLb0bHVYlydmaSe87rduUMbenz+5kl3E6e8C4T+iu7vj5QorMH1QVgcgu4OMPvM0Z1CrkLCcJI2ZJ0q0kHCWpKQkZ5KHIlaBfaNfvD84j58rM6zxQtv3UzcbnI/nIpurdPGZvYGojpFQ6a6cLBB6tneMmhdyUXCEFbGG62Fai9sJcgLtYFFv37762n/tFXlyZJLYoGdQc9C6YRgIQRBlfnEKhQJFP6utlnX8zMlprHIfUfmveBtgH56XGScz5+aAL3jH5naeFmvLHdmkIyKn8G+QoXAzI+ANOKu64j+/4AfIQF96CnohywaLgO3QqkRsOuhn02fgMH0Qz439nYJsqRDgmEEJp9VoQ6j2I6KdDyHHTu8++bO5K8GfXaVxzrigX1ZWZjw4hrdH77Io4yBdrFjwTv+6xrkdzvFZZgPAB019Wl/kR6dMnCYhbWPHtJUKkZkOfzEzRU97FtTGhz4oM4ujb9BbPqTpMKZbTvKE+e2Kb+sA6EUeyDnWtW4nuOIJP9VnBfAIc5XlI3IuHKBV66KBFH6z3qPXfik9vIPljz4loT0G2cJdrN657VjW6Ba6RJUihE6j0YcbKMwsCHzu+3rbR5ZqY=
- secure: jFi6qOyfLvsxE13g0FKlbKhAyIXvRB8ORTrt3HKudRsb1Zx88tdVdomcPltbZybZsZ36PugJn5lfB+E2lBNm0AUq7yzxBq+rVrDk40gHj4V4PXe0sjdC7/A95JkBiMV7gFcoYNPUuy4uNjw6nBbREPcGVTQITZ7Ywb8gx5wfcb3gGck90FWOgDTA6csAZJHtz5e3DTC6AGEHty6BWGv6rbw6WacL8cecfeqq0N/LEinlYmyQ6zQpDGGf9JxjCtwinbZyq4O27HUP0L9EQu525qf6Rvs6kVLLbL3cMK0EjGPMCjBdCDJVMhuXFPNrW8zo7j3es3Jg9ClXhG+bC0AgyQ8vS9NcJZu9VSTaZRrJ05UDEyVH7HaNXMje1vee6z6oeuqArYnzGWvrISqdrtpr3rwghNUCk3J+KBkjxPKouuOQvPtUMRkJFLWTMfR2swFsI6KMzbq3kK1KOESlg0ZWHoz/eDD4DHsf31z1sFHY5v4AXtGOmYSweJB1ipCkuCXsVlhFinsDZLl+YEJ3iJiHlWtcPqEn/RN9JB8gKqklh5aw7JomTRZQF7J7KtU3tPUQyX0QhLg78/rq/5vQgXQrXoMBcQL6RAyCwDv6vhDUBn85tHV/jXsPX3W2QZrVRIYw1WMllXPklUnWttnDY6yTEvnZyqNgxMObe9SeXtt7HFE=
- secure: ltj7FlY08Xs83fzSOFvt+j66CdrMrdEOZOCehDDp3IBAwczcSePx1UJnjfKA8jrbSqAIEmqcpckmp0GnPi/fcIK7BnUQ9B4IcXAwOGXBjgZREvdUdqqkI/5FcGk5AzA6dxBuDHe3FY5ogtd4ZgsrHQ0aBlwOpNRYdQS7DEOkOudaX/m7R4OqBqSSHisLGwEkz4hRdhsIeZ1fx5wqW/xXo9kpN9xM73+MvEQOSQyXTPAo9x86IVdHJv/BM0kZdulxC2muPX4R6Dhu5owkMrkDtuDtTxHSUJMIHf6xzvmQ8C+kX+7LHaj4cshrvXAGkeVZoMExX/HukQpoorrXhPOVDN1BG3LA17Vyqn+IOKun4QX8lkZxxh9lKCE/82xXNZ0aweDkOa8WfzIKfiKbByj2aDxUI9gjQzjVdsIwK3sMzQI+T13g7tvZna9BXqitQU8l76OCKo50IzqZvC8HLQ9o4h2ROemYpCM/BNPnisDCgiSbQ7WJBSQ+Z40BmHnbEGQx4ggiKXdePc5BeQ7IZAdPDFkZs2XcxAN6mPANdHzOKIKzhcUXHoab3drf4P1Bw/KEzMXDqO9+0dzHvqFI484zFNDvODsojL1oXA4W42p6vrKEog/y6VVWRp0+VzX0K2buHNCUpFabGurjS+kwfGSa1sNzS72gGvNPNorA4AWqx7U=
- secure: fpbgmhRc3H391WlSCuCo34w7hcWRT60jbJA6OJlHTxwW/6faotjbPFtp3OL4aKTHkwj1PVBUYk1IJs7HSPaKCnd8j3eTZinb45T14Yi10Qt0QGzDKJgEjMbh3OIlCKLl6lHFWOyy3mDk6UOR8yLPFKyebD2AVsXiQl+0QMKax0gJS2RrCFJz2xnUGqULb3c4k6AALkp8U+DYL8XrqeiZCpqjrkqivrwKn82A+mwPaEPBaGMK0n2ecLi8xhoha8Kjtqqr0nPfV1Gbgpz31A9QcGqtfQB/JVHhdy2T8/ZfTznIE8iCmhDA52yDUE9ZE6A0fS9aGRij85OEZb/zc/wgZjJXhKutKdzO068CHTX78IdHhzgRsRLOZUYcc6EZHu9PO4POt+LnbULoXFnpKaJGiKb1TEdguXO2nc2hLJpSyH+NKrlkOLqtdfDzZ7pHR31KMJtZVmMHByuICKrX6zaQM5pTS1sZQXHwmJSgOg+7iF+6Ax2F8GFAdUERFf4MWAn3jq/rO7gQVjhaic6W/Xz8BlKcdopQDWiV0+uwzQLCzqfRNXEVwHkpkxP0Y3/mFQ6vpsVOrV5o5ZRPQ2E6hprCZ5yEtJdW9xvRXCGIAghKelFUQeFD3j2Y8I+X9jpKQl7rRse4tDq2mesg1vC9uMCZVru7sg7a3qx3Q+GPeDy4JR0=
- secure: X8xGo8/rl/WmnASdfH3hDEldQsBeFrqGpVmtzkabhijsivI0tCoO3ZWF4kfWjgkMxNfI+sJfrT1FeU944RWc7kqXphSJEvtKvEgJ++hdByTRFr7aeRqX9mKXiErUrEpJsqPNmVs7mIlPmvyNphUozygH+Nn2jNATXew1dXKH6L1tCPhzDiKv6MrJ0rK1luEIl2TWyiKz+okTiZDrxZGvkMc1FM+CU71uZTCJXdWe2RroytEwsxlgn17F43sMJOSzppSkH/YZy7LUL5GAIxQrMhvXWHHAwNJiP5NI4+dT3olHunKm/TGQfUXKSHo9ZcsZ3e/fid2lnlfCzzxIbdRcDoQlaUoebjekQ6QglC7RUclEZ2+xpujGeUcGaD3bY15OqWKhwAk5K+TKG8V9LDONA3xlucReLYtCPGKZStBRu/7eHCb/Xr1bJHwajHwU3mXFN5ghYyG0McJUapYmIki/nsnEPAa2+SAdupkI+VyTZHbmZwW6d1bnWsoNd8fFdeiKzEFNfX3QOCVnjt7ko0qDb+eo3us6T9cyppezF3d8rPiVy7HcDUJ/JaWfu3HdKy+FQpQQUtB2hOkxWxdfShywJb/awQ8hh4j9q41+gyongPZfNh2jbY07i9XB13azAMlrPEAoszRSyeA1pBidmjjqCwAhsLaZUXOmi5em5k6fOuY=
- secure: gSRm54MeDaOxNzxyjiq3OhFVZsgnbUXMdFV1dha5HEdi1IOxQQI5UQVlEFjkAT7Eu5XtBvjLQhP3bf3Yao/hrc8q1OegxIxWlroE3YrvY7gO87DNtHPPpH13CxOS8BDdSvEhvhp3QN3bWrybdqSByOo1cdnXrodpn3vVIUr8EH1e5CBDxuzajluzFr1ovMAfr2QjyCGqXzY+3MmvYujKjEx5E7hxmEuQhYwNLqREVq8SMpy2nsDcfMwFBAE9eQN7+GtMxsrlmLnh0dAoAGCK1jhHPBNOsL/KGHMYjyR+r/r2ZhH581Mv5acWLOV5MRm3hIVumym+Vhsxa/uUj/N5C8eAyMU8QzJOOdMoRKlqk1W5AVCeeS21PBJuNQ1gskkdppJUKEFahNYGuOnAs9AMWeziMD56vkQnbXkEa/4OoGwRIItUDt45EPKmWqDBIkLr2g3jKloj25VbosJNTYAITeh3LdPt4LlEi+bEFT9U8abZ0rmNvixhaW0PtPWmAkic7BLQQrwu1YlXPltjZZJrXiIMCKS9YDjQsiWA5Wbns8nrCubwnfY8MVHfgWx9twffXHM0JVtdgSAN1QxyNOZEBWPdEV2hn7OiB1JsMlIt3crhSSerU6WCFn3aYmzi2gwgSC2vcI0GAHr3gWH/n7OHlzWpZK9JuxY+jR6e0zNfnos=
3 changes: 1 addition & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'nebula.netflixoss' version '8.8.1'
id 'nebula.netflixoss' version '9.1.0'
id 'java'
id 'pmd'
id 'com.github.spotbugs' version "4.4.4"
Expand All @@ -10,7 +10,6 @@ group = 'com.netflix.photon'

repositories {
mavenCentral()
jcenter()
/**
* Following represents the location of SNAPSHOTS of RegXMLLib. It should be enabled only when
* necessary to verify changes to the library that are not yet committed to Maven Central.
Expand Down
10 changes: 5 additions & 5 deletions buildViaTravis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,21 @@

if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
echo -e "Build Pull Request #$TRAVIS_PULL_REQUEST => Branch [$TRAVIS_BRANCH]"
./gradlew build jacocoTestReport
./gradlew build
elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" == "" ]; then
echo -e 'Build Branch with Snapshot => Branch ['$TRAVIS_BRANCH']'
./gradlew -Prelease.travisci=true -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" -PsonatypeUsername="${sonatypeUsername}" -PsonatypePassword="${sonatypePassword}" build jacocoTestReport snapshot
./gradlew -Prelease.travisci=true -PnetflixOss.username="$NETFLIX_OSS_REPO_USERNAME" -PnetflixOss.password="$NETFLIX_OSS_REPO_PASSWORD" -Psonatype.signingPassword="$NETFLIX_OSS_SIGNING_PASSWORD" build snapshot
elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" != "" ]; then
echo -e 'Build Branch for Release => Branch ['$TRAVIS_BRANCH'] Tag ['$TRAVIS_TAG']'
case "$TRAVIS_TAG" in
*-rc\.*)
./gradlew -Prelease.travisci=true -Prelease.useLastTag=true -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" -PsonatypeUsername="${sonatypeUsername}" -PsonatypePassword="${sonatypePassword}" candidate
./gradlew -Prelease.travisci=true -PnetflixOss.username="$NETFLIX_OSS_REPO_USERNAME" -PnetflixOss.password="$NETFLIX_OSS_REPO_PASSWORD" -Psonatype.signingPassword="$NETFLIX_OSS_SIGNING_PASSWORD" -Prelease.useLastTag=true candidate
;;
*)
./gradlew -Prelease.travisci=true -Prelease.useLastTag=true -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" -PsonatypeUsername="${sonatypeUsername}" -PsonatypePassword="${sonatypePassword}" final
./gradlew -Prelease.travisci=true -PnetflixOss.username="$NETFLIX_OSS_REPO_USERNAME" -PnetflixOss.password="$NETFLIX_OSS_REPO_PASSWORD" -Psonatype.username="$NETFLIX_OSS_SONATYPE_USERNAME" -Psonatype.password="$NETFLIX_OSS_SONATYPE_PASSWORD" -Psonatype.signingPassword="$NETFLIX_OSS_SIGNING_PASSWORD" -Prelease.useLastTag=true final
;;
esac
else
echo -e 'WARN: Should not be here => Branch ['$TRAVIS_BRANCH'] Tag ['$TRAVIS_TAG'] Pull Request ['$TRAVIS_PULL_REQUEST']'
./gradlew build jacocoTestReport
./gradlew build
fi
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
15 changes: 3 additions & 12 deletions installViaTravis.sh
Original file line number Diff line number Diff line change
@@ -1,16 +1,7 @@
#!/bin/bash
# This script will build the project.

if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
echo -e "Assemble Pull Request #$TRAVIS_PULL_REQUEST => Branch [$TRAVIS_BRANCH]"
./gradlew assemble
elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" == "" ]; then
echo -e 'Assemble Branch with Snapshot => Branch ['$TRAVIS_BRANCH']'
./gradlew -Prelease.travisci=true assemble
elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" != "" ]; then
echo -e 'Assemble Branch for Release => Branch ['$TRAVIS_BRANCH'] Tag ['$TRAVIS_TAG']'
./gradlew -Prelease.travisci=true -Prelease.useLastTag=true assemble
else
echo -e 'WARN: Should not be here => Branch ['$TRAVIS_BRANCH'] Tag ['$TRAVIS_TAG'] Pull Request ['$TRAVIS_PULL_REQUEST']'
./gradlew assemble
if [ "$TRAVIS_SECURE_ENV_VARS" = "true" ]; then
echo "Decrypting publishing credentials"
openssl aes-256-cbc -k "$NETFLIX_OSS_SIGNING_FILE_PASSWORD" -in secrets/signing-key.enc -out secrets/signing-key -d
fi
Binary file added secrets/signing-key.enc
Binary file not shown.

0 comments on commit aa51289

Please sign in to comment.