This is an automated email from the ASF dual-hosted git repository. xhsun pushed a commit to branch te_elr_migration in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git
commit 99a952c209179582e018d5ce183b0037c5f47cf9 Author: Xiaohui Sun <[email protected]> AuthorDate: Tue Apr 21 16:01:49 2020 -0700 [TE] ELR migration for Thirdeye --- .travis.yml | 4 +++- .travis/.travis_install.sh | 4 ++-- .travis/.travis_set_deploy_build_opts.sh | 8 ++++---- ...y_build_opts.sh => .travis_te_nightly_build.sh} | 21 ++++++++++++++++----- thirdeye/pom.xml | 11 +++++++++-- thirdeye/thirdeye-frontend/package.json | 9 ++++----- thirdeye/thirdeye-frontend/pom.xml | 12 ++++-------- thirdeye/thirdeye-frontend/yarn.lock | 22 +++++++++++++++------- thirdeye/thirdeye-hadoop/pom.xml | 2 +- thirdeye/thirdeye-pinot/pom.xml | 15 ++++++++++++++- 10 files changed, 72 insertions(+), 36 deletions(-) diff --git a/.travis.yml b/.travis.yml index 84dfceb..7dbc160 100644 --- a/.travis.yml +++ b/.travis.yml @@ -67,9 +67,11 @@ jobs: - ./.travis/.travis_quickstart_openjdk.sh 13 - stage: deploy script: - - travis_wait 40 ./.travis/.travis_nightly_build.sh + - travis_wait 60 ./.travis/.travis_te_nightly_build.sh env: global: - secure: R3NdobUAThkk6BBzXapek6PiuWHWa1ldnJBvXpk2TAi7Lua/Ctgg8EHCSve7+MK4SU3XFJSi1th32+VSy0K/ARfdVcxiVh6EJSL/Nw0LRQSvGk7VjO382SsWCFoJuZBBqjy9DfBgRLdoqEPfulIBC0XBxjJ+4xedRptkZo7+TAAvtB8Y32EA5ve+Z4cdJipLF1tviL5q2rVbkNXucYUYO2XIv5HOzF2Xy3Hw6lsNrHpbes2CLEkoMiLOQ30zfbXZT/5Xd6OhQNmoZJ9gKziT1opiN2AJMPv269K8FFJZTrDZX74/thq9wmeF4X4f3wPA7EbTupooj0i9LPzb8Xev1QKAsxBtHyRm9NGYOXM06c2yKiGsDtT4HZYQGk4m8/89moe3oGnEwvw/JLu5RvLIZzFE2cBhHrcxRAJgHLIr80+kebNg/YstNlDL+rmP0b9NRrGIVw5OO2BT27ZBgsMFmjnujQtCUJ [...] - secure: Hj71ADg7ZgQpn8PUbEjaz1RrjkPfPCpGksp+WDjE6jf+oDvl55ILQhPgNcxIy81UcxS3Gmx6UWteVGkNV4Fi59TJIQ8KPbQ9RU2FFVXcxHH2TmkOvdNezwkJIFUw0TNMCbRAXgDj7ov75BM6lLi271GfqPVg9pB504Bc43WohnV6lDo/y93Z/xWbuFk5uJ+cogAJme3pvYHxBNlNzwIYnNAAqrEb+YKsRuux3qWLTlm1guT78g3C9wl/WCelTo1A3hGd12FqFWmowcoQlAyhbnFJ7u7qwfSNTSGCFLYbrUGooXqTZg2B+2QZORT2b5b0P9SXgB2a/UJxXmxkUzbmPGdUJipmQCEemlxwkPCqMW0YSscTDHU5WjSxqy4Cvwa8y+DEpLu06WxAPwjBje53025PvLjsMEfNJ0wsQbm9jkrH0alzICemXyyV5uGBCmuiMv5WqZ70WEpy7xlPlk5aFTwWQRpYJ5 [...] + - secure: UT966a5lgYVtWGvc9AxP66BnIVUxP9+97BAS4JgRO7u+ZJmZr/a/c+lSuNdirMBqilzKlVtCAUdQ3WXNmxf6d49DdoR48VbcXxSVAVj+0ENIiI7bfsvHQu/2IFhIsYpNlEeaI+CWSgpxC4OKwEZGlVx58L/dPZa4WzfeU3dXQy0UoRnRs8aNv2PevMo2/y2uGiWBfFwSNwbpX8Y+CXMnH69BA3c9ZK8dmkkyUwjFBnn+PM0UOl8JSQPxi5pgO7oDOf/NRoQ2Chk2KkWPqnsefE135nOj5ukm+znJWkTksE0zR80PzMaryFLknftL9Ypor/CsZBxlMOms1XJQ0GbJ6tYx5I2hA/mFSagHv3u2LA0ouJmqiOQpiS3PH30W9GAoH0pyaWCnQVZzRA373FQPSOPEVeW/bWFhyjcKPtm3/kZEK/qu3fkwuvrEH2leq6/+BiFO998j5UCnfczd3j6su1IVrItXRH [...] + - secure: CneM/iQUSXpbvkj76CeTijFUYoYmwSyjo9/4mA1vXfYAYHOZP+4zaTi/ImaKif4ycaWwhEBhVNm13h852c2QFG1A2zfYanB6tH4p6bx1GQBnJMyBBwVuCr0FtEJnfjjHL/CzUCSHJXGFKc6W03V5v6gt22FRTEov7OUocLO2r/gnIlxzcKr+bVJw6dY6Z3kRJ8hfY90IJVjglBdBRp/6c9jmKGf1kQFxtbgYhWQK2xv77xQVTbHQXio7BF+CMeBp52G2ys8d+yuIROxj7NvZKpGdQk3bFC0QDVNzo9390UEYdqlNAxnR1bLgPowGfEjSP5KHiMEfrxHbcHaUiWedZ/bfUvBiQ+saWWNmMaokCtVNtPPYWyuZMAzWQWf18/jUl9HM0oUMrHExZ3+XTz5A+4f1/kGGv1tmZAFXIb3jCRmlbgKpzTX915RWAuOla2CRXuj6BWaiRNzAnnEFFbcz8QzItNE9+H [...] \ No newline at end of file diff --git a/.travis/.travis_install.sh b/.travis/.travis_install.sh index 2e6b320..5b676cc 100755 --- a/.travis/.travis_install.sh +++ b/.travis/.travis_install.sh @@ -69,10 +69,10 @@ if [ $noThirdEyeChange -eq 0 ]; then echo "ThirdEye changes only" mvn install -B -DskipTests -Dmaven.javadoc.skip=true -Dassembly.skipAssembly=true ${DEPLOY_BUILD_OPTS} -pl pinot-common,pinot-core,pinot-api -am cd thirdeye/thirdeye-hadoop - mvn clean compile -B -DskipTests + mvn clean compile -B -DskipTests ${DEPLOY_BUILD_OPTS} cd ../.. cd thirdeye/thirdeye-pinot - mvn clean compile -B -DskipTests + mvn clean compile -B -DskipTests ${DEPLOY_BUILD_OPTS} cd ../.. # # skip thirdeye-frontend as re-build happens on test diff --git a/.travis/.travis_set_deploy_build_opts.sh b/.travis/.travis_set_deploy_build_opts.sh index 0dad12b..2a10acc 100755 --- a/.travis/.travis_set_deploy_build_opts.sh +++ b/.travis/.travis_set_deploy_build_opts.sh @@ -18,9 +18,9 @@ # under the License. # -if [ "$TRAVIS_EVENT_TYPE" = "cron" ]; then +# if [ "$TRAVIS_EVENT_TYPE" = "cron" ]; then export DEV_VERSION="-dev-${TRAVIS_BUILD_NUMBER}" export DEPLOY_BUILD_OPTS="-Dsha1=-dev-${TRAVIS_BUILD_NUMBER}" -else - export DEPLOY_BUILD_OPTS="" -fi +# else +# export DEPLOY_BUILD_OPTS="" +# fi diff --git a/.travis/.travis_set_deploy_build_opts.sh b/.travis/.travis_te_nightly_build.sh similarity index 53% copy from .travis/.travis_set_deploy_build_opts.sh copy to .travis/.travis_te_nightly_build.sh index 0dad12b..fb7ea16 100755 --- a/.travis/.travis_set_deploy_build_opts.sh +++ b/.travis/.travis_te_nightly_build.sh @@ -18,9 +18,20 @@ # under the License. # -if [ "$TRAVIS_EVENT_TYPE" = "cron" ]; then - export DEV_VERSION="-dev-${TRAVIS_BUILD_NUMBER}" - export DEPLOY_BUILD_OPTS="-Dsha1=-dev-${TRAVIS_BUILD_NUMBER}" -else - export DEPLOY_BUILD_OPTS="" +if [ -n "${DEPLOY_BUILD_OPTS}" ]; then + echo "Deploying ThirdEye to bintray" + cd thirdeye/ + BUILD_VERSION=$(grep -E "<revision>(.*)</revision>" pom.xml | cut -d'>' -f2 | cut -d'<' -f1) + echo "Current build version: $BUILD_VERSION${DEV_VERSION}" + mvn versions:set -DnewVersion="$BUILD_VERSION${DEV_VERSION}" -q -B + mvn versions:commit -q -B + # Deploy ThirdEye to bintray + mvn deploy -s ../.travis/.ci.settings.xml -DskipTests -q + cd thirdeye-frontend/ + # Deploy ThirdEye frontend to NPM + npm version ${BUILD_VERSION}${DEV_VERSION} + echo "_auth = $NPM_TOKEN" > ~/.npmrc + echo "email = $NPM_EMAIL" >> ~/.npmrc + npm config set //registry.npmjs.org/:_authToken ${NPM_TOKEN} + npm publish fi diff --git a/thirdeye/pom.xml b/thirdeye/pom.xml index db3cb20..460405e 100644 --- a/thirdeye/pom.xml +++ b/thirdeye/pom.xml @@ -22,16 +22,16 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.apache.pinot.thirdeye</groupId> <artifactId>thirdeye</artifactId> - <version>1.0-SNAPSHOT</version> + <version>1.0.0-dev-8</version> <packaging>pom</packaging> <name>thirdeye</name> <modules> - <module>thirdeye-frontend</module> <module>thirdeye-pinot</module> </modules> <properties> + <revision>1.0.0</revision> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <pinot.version>0.1.0</pinot.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> @@ -84,6 +84,13 @@ <json.version>20170516</json.version> </properties> + <distributionManagement> + <repository> + <id>bintray-linkedin-maven</id> + <url>https://api.bintray.com/maven/linkedin/test-repo/thirdeye/;publish=1</url> + </repository> + </distributionManagement> + <licenses> <license> <name>Apache License, Version 2.0</name> diff --git a/thirdeye/thirdeye-frontend/package.json b/thirdeye/thirdeye-frontend/package.json index c0750a7..289a234 100644 --- a/thirdeye/thirdeye-frontend/package.json +++ b/thirdeye/thirdeye-frontend/package.json @@ -1,9 +1,8 @@ { "name": "thirdeye-frontend", - "version": "0.0.0", - "private": true, + "version": "1.0.0", "description": "Thirdeye Frontend WebApp", - "license": "MIT", + "license": "Apache-2.0", "author": "", "directories": { "doc": "doc", @@ -76,7 +75,7 @@ "ember-toggle": "^6.0.0", "ember-tooltips": "^2.9.0-beta.0", "ember-truth-helpers": "^2.1.0", - "eslint-plugin-ember": "^5.0.0", + "eslint-plugin-ember": "~5.0.0", "html2canvas": "^1.0.0-rc.5", "jspdf": "^1.5.3", "keyevent": "^1.1.0", @@ -88,7 +87,7 @@ "toastr": "^2.1.4" }, "engines": { - "node": "10.*" + "node": "12.*" }, "dependencies": { "bower": "^1.8.8", diff --git a/thirdeye/thirdeye-frontend/pom.xml b/thirdeye/thirdeye-frontend/pom.xml index 666feb3..9a3ecac 100644 --- a/thirdeye/thirdeye-frontend/pom.xml +++ b/thirdeye/thirdeye-frontend/pom.xml @@ -3,13 +3,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"; xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.pinot.thirdeye</groupId> - <artifactId>thirdeye</artifactId> - <version>1.0-SNAPSHOT</version> - </parent> <groupId>org.apache.pinot.thirdeye</groupId> <artifactId>thirdeye-frontend</artifactId> + <version>1.0-SNAPSHOT</version> <name>thirdeye-frontend</name> <url>http://maven.apache.org</url> @@ -18,7 +14,7 @@ <plugin> <groupId>com.github.eirslett</groupId> <artifactId>frontend-maven-plugin</artifactId> - <version>1.6</version> + <version>1.9.1</version> <executions> <execution> @@ -28,8 +24,8 @@ <goal>install-node-and-yarn</goal> </goals> <configuration> - <nodeVersion>v10.16.3</nodeVersion> - <yarnVersion>v1.12.0</yarnVersion> + <nodeVersion>v12.16.2</nodeVersion> + <yarnVersion>v1.22.4</yarnVersion> </configuration> </execution> <execution> diff --git a/thirdeye/thirdeye-frontend/yarn.lock b/thirdeye/thirdeye-frontend/yarn.lock index 69f7b01..adbecca 100644 --- a/thirdeye/thirdeye-frontend/yarn.lock +++ b/thirdeye/thirdeye-frontend/yarn.lock @@ -6103,12 +6103,12 @@ ember-resolver@^4.0.0: ember-cli-version-checker "^2.0.0" resolve "^1.3.3" -ember-rfc176-data@^0.2.0: +ember-rfc176-data@^0.2.0, ember-rfc176-data@^0.2.7: version "0.2.7" resolved "https://registry.yarnpkg.com/ember-rfc176-data/-/ember-rfc176-data-0.2.7.tgz#bd355bc9b473e08096b518784170a23388bc973b"; integrity sha512-pJE2w+sI22UDsYmudI4nCp3WcImpUzXwe9qHfpOcEu3yM/HD1nGpDRt6kZD0KUnDmqkLeik/nYyzEwN/NU6xxA== -ember-rfc176-data@^0.3.1, ember-rfc176-data@^0.3.3, ember-rfc176-data@^0.3.5: +ember-rfc176-data@^0.3.1, ember-rfc176-data@^0.3.5: version "0.3.5" resolved "https://registry.yarnpkg.com/ember-rfc176-data/-/ember-rfc176-data-0.3.5.tgz#f630e550572c81a5e5c7220f864c0f06eee9e977"; integrity sha512-5NfL1iTkIQDYs16/IZ7/jWCEglNsUrigLelBkBMsNcib9T3XzQwmhhVTjoSsk66s57LmWJ1bQu+2c1CAyYCV7A== @@ -6499,12 +6499,13 @@ escodegen@^1.6.1: optionalDependencies: source-map "~0.6.1" -eslint-plugin-ember@^5.0.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-ember/-/eslint-plugin-ember-5.2.0.tgz#fa436e0497dfc01d1d38608229cd616e7c5b6067"; - integrity sha1-+kNuBJffwB0dOGCCKc1hbnxbYGc= +eslint-plugin-ember@~5.0.0: + version "5.0.3" + resolved "https://registry.yarnpkg.com/eslint-plugin-ember/-/eslint-plugin-ember-5.0.3.tgz#9f5e2048ab3ddc1548d4d17bf318cf1bb5cf37f1"; + integrity sha512-wPq2N96YQR2/Ob2LfuLQV8BEotHXxiFcuBiHikN8P+2VGzxBeuydafXy/pExuTsU2RHfPiSgyBHavKGy1DYdrQ== dependencies: - ember-rfc176-data "^0.3.3" + ember-rfc176-data "^0.2.7" + require-folder-tree "^1.4.5" snake-case "^2.1.0" eslint-scope@^3.7.1: @@ -12469,6 +12470,13 @@ require-directory@^2.1.1: resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I= +require-folder-tree@^1.4.5: + version "1.4.7" + resolved "https://registry.yarnpkg.com/require-folder-tree/-/require-folder-tree-1.4.7.tgz#fdb5acaeae4aab4a8417f54cf241a9ecc8c8a237"; + integrity sha512-8nkJYEUuMzYdWQcNdMBe04jloJc5RQ6gnHJC7+aHYFFbkqljsxfpPGSy+9NBtw5rSRcXI/2khC+V48atKd0bUQ== + dependencies: + lodash "^4.17.11" + require-main-filename@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"; diff --git a/thirdeye/thirdeye-hadoop/pom.xml b/thirdeye/thirdeye-hadoop/pom.xml index 4a16ea5..a5ecc29 100644 --- a/thirdeye/thirdeye-hadoop/pom.xml +++ b/thirdeye/thirdeye-hadoop/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.apache.pinot.thirdeye</groupId> <artifactId>thirdeye</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${revision}${sha1}</version> </parent> <artifactId>thirdeye-hadoop</artifactId> <name>thirdeye-hadoop</name> diff --git a/thirdeye/thirdeye-pinot/pom.xml b/thirdeye/thirdeye-pinot/pom.xml index e4cf712..299e062 100644 --- a/thirdeye/thirdeye-pinot/pom.xml +++ b/thirdeye/thirdeye-pinot/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.apache.pinot.thirdeye</groupId> <artifactId>thirdeye</artifactId> - <version>1.0-SNAPSHOT</version> + <version>1.0.0-dev-8</version> </parent> <groupId>org.apache.pinot.thirdeye</groupId> <artifactId>thirdeye-pinot</artifactId> @@ -448,6 +448,19 @@ </properties> </configuration> </plugin> + <plugin> + <artifactId>maven-deploy-plugin</artifactId> + <version>2.8.1</version> + <executions> + <execution> + <id>default-deploy</id> + <phase>deploy</phase> + <goals> + <goal>deploy</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> </project> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
