Upgrade nebula.netflixoss to replace bintray publication and update T…

…ravisCI secrets
Netflix · Mar 2, 2021 · 3c43cae · 3c43cae
1 parent e1d1c11
commit 3c43cae
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 31 deletions.
diff --git a/.gitignore b/.gitignore
@@ -114,3 +114,6 @@ node-v4.4.0-darwin-x64
 env
 
 !/gradle/wrapper/gradle-wrapper.jar
+
+# publishing secrets
+secrets/signing-key
diff --git a/.travis.yml b/.travis.yml
@@ -1,46 +1,50 @@
 dist: xenial
 addons:
-  postgresql: "9.6"
+  postgresql: '9.6'
 language: java
 jdk:
-  - openjdk8
+- openjdk8
 services:
-  - mysql
-  - postgresql
-  - docker
+- mysql
+- postgresql
+- docker
 git:
   depth: false
 install: true
 before_script:
-  - cat "$TRAVIS_BUILD_DIR/travis/config/mysql/my.cnf" | sudo tee -a /etc/mysql/my.cnf
-  - sudo service mysql restart
-  - mysql -u root -e 'create database genie;'
-  - psql  -U postgres -c 'create database genie;'
+- cat "$TRAVIS_BUILD_DIR/travis/config/mysql/my.cnf" | sudo tee -a /etc/mysql/my.cnf
+- sudo service mysql restart
+- mysql -u root -e 'create database genie;'
+- psql  -U postgres -c 'create database genie;'
 script: "./travis/buildViaTravis.sh"
 after_success:
-  - bash <(curl -s https://codecov.io/bash)
+- bash <(curl -s https://codecov.io/bash)
 before_cache:
-  - rm -f  "${HOME}/.gradle/caches/modules-2/modules-2.lock"
-  - rm -fr "${HOME}/.gradle/caches/*/plugin-resolution/"
-  - rm -f  "${HOME}/.gradle/caches/*/fileHashes/fileHashes.bin"
-  - rm -f  "${HOME}/.gradle/caches/*/fileHashes/fileHashes.lock"
+- rm -f  "${HOME}/.gradle/caches/modules-2/modules-2.lock"
+- rm -fr "${HOME}/.gradle/caches/*/plugin-resolution/"
+- rm -f  "${HOME}/.gradle/caches/*/fileHashes/fileHashes.bin"
+- rm -f  "${HOME}/.gradle/caches/*/fileHashes/fileHashes.lock"
 cache:
   directories:
-    - "${HOME}/.gradle/caches/"
-    - "${HOME}/.gradle/wrapper/"
-    - genie-ui/node_modules/
-    - genie-ui/.gradle/nodejs
-    - genie-ui/.gradle/npm
+  - "${HOME}/.gradle/caches/"
+  - "${HOME}/.gradle/wrapper/"
+  - genie-ui/node_modules/
+  - genie-ui/.gradle/nodejs
+  - genie-ui/.gradle/npm
   timeout: 1000
 env:
   global:
-    - secure: fDTw7flEHvAMikDBMr9g5itVC9pHxW1To2tnZKQnP+FO0CDkFBYctSHxRzhahPYryWiKtSSsFVslpCaKXs2Q6vFuTJE7GW1ZhGMtP7oxtOMWLUWL/yK8YHsG7M+ReEn/oBF4jtrkBFJPF3FXzjLa5MiK1+eSnEe6u5V2xiLrbHY=
-    - secure: g8oRT4YUr2VyO6h8+Pm+MvSgPyfEtd+ndCxF70F0SUj5eNV9SFt7yYOn6V6Mxx9eEyZMQSdPed+70+94Nd8yD+cjIGHNnlvKt6V/Q4i09XxhT3/ZiM8B9qRd1eGON0mEaU5Bl+918CGEIVCVsfLPGLVpItaSz2Tda46EDOdRHO8=
-    - secure: c0LFCj1KBTEIFSWlpRGgaei86bfrpnSr8qmMOu/S4dl2JRnCnW9AHmrmQzYhd5NlNPugOAncYk9lnkxA7xqtDlv/Ih4YKBaeP924hwLWO//0tKgxhF1dr0dHI+bRKURvcSyLXFDNFjuXUrw4SalBLbZCmiNFzJLMmy2Lvs9UTso=
-    - secure: Nv1mMLy2XX+bYziq536KbNg/mAVDTaLw3q3bKP2Mil3JVicXxYVbkEo+DK2O4rsuT7JNbyroN6/3x7xT9qBo4X7vzCjU91QUAxq5t0SmG0FW+oAIApHWTum307b5XS2UyqV/88gg1O6g9or3bKmDLUsJ1A/+fsASozA207a7zls=
-    - secure: GNQsJ9ylRN9UXWQ20+Ba7NrgmO9SykkLUzO30x0RpicH+uphSPXs785cQuDgPheRs0eTisco/31m7PeqfdS/4KuJ/BI2FwLuCt3uTKvhYgSr/rd7iVb4ldHChmfAjSF+cytLKQd2xPvOveTbX4+/mQfdH0f7WXyxA/zpu18nHPk=
-    - secure: RWtT5UaOQsNaR4x74Lq3UYVaXfY+j+O5eYmPTHhQ6z+mG/cFxZF+2f4W/yHh8WRB+eMvjG0DWb48cEnHSzTC41wsg0fbEu1T7Iv0OglnZVbkzEG+JsyDsqRm4r/HsjXopNIcR+lQ5gpE85PLVTaOdzgH7W44nlo581bR0dkV88o=
-    - secure: a5QmXCWR7wwEf/poWSj3PDAb6VICKqTTw3qbNjQwSvCzaCYtZZmxLbruQQlKOyR6W4j2VMrp2Ip5xrBjlCrOTvkFymPY3L+EwbPxsXbO4uhzs43BNFLhDon/Duv3TRhnedkqP0s8hN1ylxCbcID0UUPXQGrhnu8mb5QlDUx2mr8=
+  - secure: GNQsJ9ylRN9UXWQ20+Ba7NrgmO9SykkLUzO30x0RpicH+uphSPXs785cQuDgPheRs0eTisco/31m7PeqfdS/4KuJ/BI2FwLuCt3uTKvhYgSr/rd7iVb4ldHChmfAjSF+cytLKQd2xPvOveTbX4+/mQfdH0f7WXyxA/zpu18nHPk=
+  - secure: RWtT5UaOQsNaR4x74Lq3UYVaXfY+j+O5eYmPTHhQ6z+mG/cFxZF+2f4W/yHh8WRB+eMvjG0DWb48cEnHSzTC41wsg0fbEu1T7Iv0OglnZVbkzEG+JsyDsqRm4r/HsjXopNIcR+lQ5gpE85PLVTaOdzgH7W44nlo581bR0dkV88o=
+  - secure: a5QmXCWR7wwEf/poWSj3PDAb6VICKqTTw3qbNjQwSvCzaCYtZZmxLbruQQlKOyR6W4j2VMrp2Ip5xrBjlCrOTvkFymPY3L+EwbPxsXbO4uhzs43BNFLhDon/Duv3TRhnedkqP0s8hN1ylxCbcID0UUPXQGrhnu8mb5QlDUx2mr8=
+  - secure: FOaD8iziaGD8VLYddcjVTKJa1KajLsKfjHuZYzS8SsLJy3sDkkvGxrWKM4/KKnj+o4sO496glia1KmKpvYwlZxHEqB2+4vLmhnl6aY8J+/frvPh6PDWDQgebe5QizJpw9SH6+tVmxpBsJX9pfrC90Khn7nLfMePXkKzjtVvrSTY=
+  - secure: TSg8vIJl05jWBYtbq9A5h3NO8poO3cJohSl0np2J2xSQoOr0dt0Pm8nw2qS+245BhtIHliVRxvE3sV/fBDAuejAXNlXzcj+CgHqraj/pvmfeYsUHZXvUgmhqoU6b+ZZNDxTInjXVxbVH8xAsCY11wrCU7s7Wl+KgL2+Ud8cIkKo=
+  - secure: Fs3Z6YmZxZQLIRJvcXT68ZUKJz2iJJnLmBotYIuA6lpee3HfYTFY6Sw32vYJkPv9L2ov3UmKLq7Kiv0b4n3CphK62EpzE4sCz1sZZTgnacoKtzxu32Eg26zhXmNho0DNiuVReuJ8ZqzlgwAXNqHx/9ioojN1w1Ayg/BhwMxKm7U=
+  - secure: CmakZrqAn8xUZH6uekI1u4umWfW5zMhig5QUz2SGjSOi+IKEGct4J7UnPd/fsqQA13uTUOaQp661FZE91jT5jK89Ur9hhqSp7m3MCU8KH+XS9W3CmmPKAy1IXUw+K6Z3dEC9i+HX3vB4AjWmX42PDjjTXnqXwF16gtFq6dvKRZo=
+  - secure: Xl4RhyQdFe9gm0flEgPQ8TIVPCg7Qn1DDU96dnUkaHlEhn7Y7UqGZEO5MMnrcLMehclTNq9Lne9piD6C6RqNVH0Y9VkApT/OhRrsbCqXWE07m8pVeMERCWGZzpCxCnfbskLLKSv1pK5YI6VGMWcZwdNLibMntNURZYE3cEI0df0=
 notifications:
   slack:
     secure: H5nS+GX6TYTU27ur6YFG5OgrQeUbzXLok5ub6+xcmyYEeVPpnQ1Gg/wKqTAGsP9j6tAkqPpxgYT9i9Do6eyTEplK6bTvQVyhilsEDtxGJbUO8XOE9TSo6jAe/lD3EB5l46gxFID+Hg9IkPii4LwEabP7PVehrB1JfNZ6QDgSRRM=
+before_install:
+- openssl aes-256-cbc -K $encrypted_d34093053982_key -iv $encrypted_d34093053982_iv
+  -in secrets/signing-key.enc -out secrets/signing-key -d
diff --git a/build.gradle b/build.gradle
@@ -14,7 +14,7 @@ buildscript {
 
 plugins {
     id "com.github.kt3k.coveralls" version "2.10.2"
-    id "nebula.netflixoss" version "8.10.0"
+    id "nebula.netflixoss" version "9.1.0"
     id "org.ajoberstar.grgit" version "4.1.0"
     id "org.ajoberstar.git-publish" version "3.0.0"
     id "org.springframework.boot" version "${spring_boot_version}" apply false

diff --git a/secrets/signing-key.enc b/secrets/signing-key.enc
diff --git a/travis/buildViaTravis.sh b/travis/buildViaTravis.sh
@@ -19,18 +19,18 @@ if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
   ${GRADLE} ${GRADLE_OPTIONS} javadoc asciidoc dockerBuildAllImages
 elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" == "" ] && [ "$TRAVIS_BRANCH" == "dev-snapshot" ]; then
   echo -e 'Build Development Snapshot'
-  ${GRADLE} ${GRADLE_OPTIONS} -Prelease.travisBranch=$TRAVIS_BRANCH -Prelease.travisci=true -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" -PsonatypeUsername="${sonatypeUsername}" -PsonatypePassword="${sonatypePassword}" snapshot dockerPush -x check
+  ${GRADLE} ${GRADLE_OPTIONS} -Prelease.travisBranch=$TRAVIS_BRANCH -Prelease.travisci=true -Prelease.useLastTag=true  -PnetflixOss.username=$NETFLIX_OSS_REPO_USERNAME -PnetflixOss.password=$NETFLIX_OSS_REPO_PASSWORD  -Psonatype.signingPassword=$NETFLIX_OSS_SIGNING_PASSWORD snapshot dockerPush -x check
 elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" == "" ]; then
   echo -e 'Build Branch with Snapshot => Branch ['$TRAVIS_BRANCH']'
-  ${GRADLE} ${GRADLE_OPTIONS} -Prelease.travisBranch=$TRAVIS_BRANCH -Prelease.travisci=true -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" -PsonatypeUsername="${sonatypeUsername}" -PsonatypePassword="${sonatypePassword}" snapshot codeCoverageReport coveralls gitPublishPush dockerPush
+  ${GRADLE} ${GRADLE_OPTIONS} -Prelease.travisBranch=$TRAVIS_BRANCH -Prelease.travisci=true -Prelease.useLastTag=true  -PnetflixOss.username=$NETFLIX_OSS_REPO_USERNAME -PnetflixOss.password=$NETFLIX_OSS_REPO_PASSWORD  -Psonatype.signingPassword=$NETFLIX_OSS_SIGNING_PASSWORD snapshot codeCoverageReport coveralls gitPublishPush dockerPush
 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\.*)
-    ${GRADLE} ${GRADLE_OPTIONS} -Prelease.travisci=true -Prelease.useLastTag=true -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" -PsonatypeUsername="${sonatypeUsername}" -PsonatypePassword="${sonatypePassword}" candidate codeCoverageReport coveralls gitPublishPush dockerPush
+    ${GRADLE} ${GRADLE_OPTIONS} -Prelease.travisci=true -Prelease.useLastTag=true  -PnetflixOss.username=$NETFLIX_OSS_REPO_USERNAME -PnetflixOss.password=$NETFLIX_OSS_REPO_PASSWORD  -Psonatype.signingPassword=$NETFLIX_OSS_SIGNING_PASSWORD candidate codeCoverageReport coveralls gitPublishPush dockerPush
     ;;
   *)
-    ${GRADLE} ${GRADLE_OPTIONS} -Prelease.travisci=true -Prelease.useLastTag=true -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" -PsonatypeUsername="${sonatypeUsername}" -PsonatypePassword="${sonatypePassword}" final codeCoverageReport coveralls gitPublishPush dockerPush
+    ${GRADLE} ${GRADLE_OPTIONS} -Prelease.travisci=true -Prelease.useLastTag=true  -PnetflixOss.username=$NETFLIX_OSS_REPO_USERNAME -PnetflixOss.password=$NETFLIX_OSS_REPO_PASSWORD  -Psonatype.signingPassword=$NETFLIX_OSS_SIGNING_PASSWORD final codeCoverageReport coveralls gitPublishPush dockerPush
     ;;
   esac
 else