diff --git a/.travis.yml b/.travis.yml index 5d27fcd..ba8d418 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,15 @@ language: java jdk: -- oraclejdk8 -dist: trusty +- openjdk8 +dist: bionic +before_install: +- openssl aes-256-cbc -K $encrypted_8f2a81d544cc_key -iv $encrypted_8f2a81d544cc_iv -in travis/pubring.gpg.enc -out travis/pubring.gpg -d +- openssl aes-256-cbc -K $encrypted_5c292d804727_key -iv $encrypted_5c292d804727_iv -in travis/secring.gpg.enc -out travis/secring.gpg -d script: - mvn verify after_success: - mvn coveralls:report -- test "${TRAVIS_PULL_REQUEST}" == "false" && test "${TRAVIS_BRANCH}" != "master" && mvn deploy --settings travis/settings.xml +- test "${TRAVIS_PULL_REQUEST}" == "false" && test "${TRAVIS_TAG}" != "" && mvn deploy --settings travis/settings.xml -DskipTests=true -Possrh -Prelease cache: directories: - "~/.m2" @@ -16,5 +19,7 @@ branches: - "/^bullet-spark-[0-9]+\\.[0-9]+\\.[0-9]+/" env: global: - - secure: MEsZt40BaBrAcPlvBCdhZRpVRIcD6hwB0vzcsm6m7GRu/MkIyhBG700+OHkAlSBIUW9hXgQjuJCq3YbroEvaJvolmKK78koa77rEM3IlncR6M0QaHhNHyJCiVYeX7jBATVNgxyNxicMxpNvMGKb8vy5S+RXb8pGu+zBHNDH6c1G/xTQKGZC16Ygftk2gsXMb6lKpJ2B6/uDZigEKJCSc44lwdfP5k5Id+AcxLhnLsZEkdCydrboU1Wn0xHwvKHSW074IZ6d7HSLlKmDy/M6S+BMy5nPqn/A28WTHR0hS9MihFOqqMtAmFGPUT43arKXL68BRDOdwEAWi8Eh8iZADURgmOSpuk7semVj2U6JAa5Q9NvEcy/6y964D232fqb2XiLm96ErddlZB/ARJ4g6300xuLSbMEuog/00HUYjXUOBHMMWnGlsLRWrz1eeqdaiMet7OxhOv73IViiY8jEyT/F+cA9w7BtkguJBeECbZTFOESCS5w2IZoP093U7/NQctSKeaf2jz2lyYWBV+y/EayBBf2rx9ejJgsvfkR1k4aAePnQUjMig/99DAjsToK9jutyC0yT5ajMisccHEGOg0uRMblKpZ3Ny92e/70UGf3Esr6mBeRjGW0/LELC2cMgGdwqaiix76H6W32kRhkzsk5lSN137aVCr5JFOx888Rxx0= - - secure: vn/od6wlqpAGqj0AzZpAQ8BXe7qP8zadm8D/8ZyN9YWCUKB0eb3uWkYZw9F1FhYmqoz9E4/TlZFQhwX6SFMpI88BX/OApRvz9iLj8MJnrorfA6QA2omtzIhHweW8dWeRVX58xAqzi5cjqwS/T2M4mVUZjFV7L+nJnL/+wx1cLat5XLi2jSmzOsZ5IJQZAzIptiKSHXQbXIVzS0PgMv9KvgaZALGCFGvYCPQ3QNWH9nPRAwYWfCLUWMMR6c4hRQumwL48SaNFIZZU0/ZtJoP2/5zj9NyMF6y3AGirWoqFNFcM695eUCr0xKLGl2GL91KvykoCWSzAtyOQvPhpBeKjvY7lFtdjr01a8yrOzosdCwejmcJPvI+cn/yufc3crqMJ6BWwU+VkQQ1MynwvBa+XYSmiQRZVXTY+oy71BHGnaIV8z+Z1AWLFxr1kVkugTmkKkjDsj0FoOpSYj/hCoTy8t6IYiQkgnT9DAQa6wSx1JATfp109PnajRLs2wMhiuZ7KD+J5pkMK67+EbIWb/Gch4thToTkEGNBIblbTdbh6C+67HuISZypcMMbHNNBHxCFfdf5TvS0SjAxo5WwzhF1Zfacc57xrT2AFJKZNOcgMjrxQyIlycsS4DKAEyBaBnc8WJz8cgUYCahmEntaAw+3Uirs909HhT2CtkXBBOpdufE8= + - GPG_EXECUTABLE=gpg + - secure: dwgAAbDuk1sVwM9g414quIg7EyXsGTZpeJOXL4goo9He2pBtJnHBetdLPUi2k+k0ZAClRzX8Ej6GVu/3cj3V70beUACtTKUonhPCBaas7fwj1DieZSkCGCtb8UGf6ZkV+5yOXaunqmaOGmTY5fOuUwRZ7BXVSPQeq+jdg3AFKGXVSINCT0p0IOakfW9WfmHfaTUj3v8qsVHEprBpMKzryoriClI4YXVnto4n/UdzQ/6h19G0XyV8RCcQi0E0+xi0AEpndeV139uWaTpKkPpjjwDUtnT38JS4hCAabSEvOgPnQt/1foXw0AxB6eD4iocTI6t8DDb8aYPggYrddJQqN9mc8P3fSxrc7eXCk0USo/+L71k1RXNvhzNkaTAc5NfT7iwMCgLZ+Mb2V8tegz57w+wJ4faf16Kap+ut23JeUHTjFK8BryAY/I7CTdSiTyCgzkyOhfgo3QNAj4w9y1CILn1VTVCFosAef4SovDYhy5xXa7rHzCf17cN0Sazv14f/8ntqitPCDNV2k8UqVlKW/5TIqfC2JxHLF7EsRNVTb+TNgaQ18DCXVXilRnI3eTkw1lNLL3CqS9nSwP2ayYFcX1zp1yY+jV+IiWN84EvR+YI5m7EHDgzHwMgiBq9Km6ZlivLEOrd5uU2HC6BgMmJSVEJBjETpwwun1FgOQiKC85A= + - secure: T+IEBLpSfDRPmHdpibh7onC7DvzVd7CHeyZlE2kQoMGU0My0Cjpbs6F1fCLEdFy8mTvBEFq2swDuihnKf5aSZrPibknix5mDddNjFD25xHJ8Oilwyb76ykIJL+4lC+z4K1OJ5EUBC2EMdRmvFZVmawas4DwyPZMhPMD0RQdn+Z8YunL3qTZ6iBBTnsOtejmhtZX10hx5dmlxRlIBYV5EsTW97ujxVhjcN4wuRUPmELYbjL16wdA8kSjG8ceqx+g1u1jdLxGFdyk7v/33JFLTYHnoJcDbd37eQ7ojelIsLwscyfpfrzxRtc/cuTFrHb2AdYC9Z2nkH8i6ZBrujiYSR94FsIIt0eRrObT6me3AyuqOZbTlYWGOszS0fhLBeSYuKAuMqw3tWV7Zjme4zXjBEl/b3b5Aj+IzsIMddGWfaIHVZkLUsdNHkRDkUxcj/lclWtAkxsIxWFKfyX073xlOrEatIZNg5xCmKv3LEiUsYFobjuisNeMbuGH5u9G6Q3igYfDW/62bGt7IkGImYJvyQjqlW8vLEGQJc99CyFKomtVEn0Nn4i9jNnfwjddfB2If+6CzJP6GaER4nR0MRkxiymRMnoFozOOr/KLu3DfgEb/NsJwqqSNvQ9tvhd9e5u0pc8jp1Y7aDxEASbmK+P31HaTw+DFaZM466d2rZGqxsc0= + - secure: CLOlKfSyAHo0iZFr70gPmKhRXa0FNktAWga3rwa6qyb0Zu/R22v2AZBxZYQEUCS/AJcGRiazK+MqbfQ0k+D5EKM94jIGAICoDeQaHOASTnk2krMfsE0XwYhKCTsBHueroAv0PS5hHZUMjoHnYsRFNppElx/cPEFl1uZvF/RSg9tiXyePQP3L2bVQ11/qFdQn5M+8QZd+yU7NVRYIIp6nPUPLP9ccPMAeEa1B+N7SdezrOmArB0fOf813EnuvVZ/aoWq+PXbTt2Uwkq9SAgJJFA2GBYDA7fmoWnzbStBDiDgLWVuSDh+zCVvh1DzXIfEHsB7ANO0pDomZpR/oPdNuSwvl07v7EjHY1dilVgiib/bgNTGz0qsW8UwHnVgYE8K+GHhQyT+YwKh4lpKHN0a5YCrLJtEGUgnYcdZGy//vYSL0I7Jm5GJYmX7UjLakykIdueTYeaFoJb0SgTPHJXsqewG14bs6SVz8JrlZDCe7AzpO+LRBx0Ntuk8z3u+r3PLiSZSpblMebgbUfeXJCg60Gbsv+k1FFu/zRlVFNokd++bV3NvueKd5RpCk9NNEYD7Y3bdxoOcm4SGRJoqCZgU6b0ADjc7XEvCZp1IwS0sAdkQrrziLM9IBW8On4u1RKxcUpyGgDAHUQNRxwEE6ZySDvfZCN5TYVJ/PPuuIVqVDRw4= diff --git a/Makefile b/Makefile index f6abe17..caa6a4a 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ jar: mvn clean package release: - mvn -B release:prepare release:clean && git checkout `git describe --abbrev=0` -b `git describe --abbrev=0` && git push -u origin HEAD && git checkout master && git pull + mvn -B release:prepare release:clean coverage: mvn clean scoverage:report diff --git a/README.md b/README.md index ea06a21..9129788 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Bullet Spark -[![Build Status](https://travis-ci.com/bullet-db/bullet-spark.svg?branch=master)](https://travis-ci.com/bullet-db/bullet-spark) [![Coverage Status](https://coveralls.io/repos/github/bullet-db/bullet-spark/badge.svg?branch=master)](https://coveralls.io/github/bullet-db/bullet-spark?branch=master) [![Download](https://api.bintray.com/packages/yahoo/maven/bullet-spark/images/download.svg) ](https://bintray.com/yahoo/maven/bullet-spark/_latestVersion) +[![Build Status](https://travis-ci.com/bullet-db/bullet-spark.svg?branch=master)](https://travis-ci.com/bullet-db/bullet-spark) [![Coverage Status](https://coveralls.io/repos/github/bullet-db/bullet-spark/badge.svg?branch=master)](https://coveralls.io/github/bullet-db/bullet-spark?branch=master) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.yahoo.bullet/bullet-spark/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.yahoo.bullet/bullet-spark/) ## Introduction diff --git a/pom.xml b/pom.xml index 3dc0820..8902871 100644 --- a/pom.xml +++ b/pom.xml @@ -6,28 +6,44 @@ jar bullet-spark - - scm:git:ssh://git@github.com/bullet-db/bullet-spark.git - HEAD - + + This is the implementation of Bullet - a real-time query engine - in Apache Spark. + + https://github.com/bullet-db/bullet-spark + + + + Apache License, Version 2.0 + https://www.apache.org/licenses/LICENSE-2.0.txt + + + + ossrh + https://oss.sonatype.org/content/repositories/snapshots + - bintray-bullet-spark-repo - https://api.bintray.com/maven/yahoo/maven/bullet-spark;publish=1 + ossrh + https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - false - - bintray-yahoo-maven - bintray - http://yahoo.bintray.com/maven - - + + https://github.com/bullet-db/bullet-spark + scm:git:ssh://git@github.com/bullet-db/bullet-spark.git + scm:git:ssh://git@github.com/bullet-db/bullet-spark.git + HEAD + + + + + Bullet Developers + bullet-dev@googlegroups.com + Yahoo Inc. + https://github.com/bullet-db + + UTF-8 @@ -38,8 +54,8 @@ 2.12 1.3.0 3.0.1 - 1.2.1 - 1.1.3 + 1.2.2 + 1.1.4 1.9.2 2.6.0 2.2.1 @@ -319,4 +335,50 @@ + + + + release + + + release + + + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.6 + + + sign-artifacts + verify + + sign + + + + --pinentry-mode + loopback + + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.8 + true + + ossrh + https://oss.sonatype.org/ + true + + + + + + diff --git a/travis/pubring.gpg.enc b/travis/pubring.gpg.enc new file mode 100644 index 0000000..b4ff9dd Binary files /dev/null and b/travis/pubring.gpg.enc differ diff --git a/travis/secring.gpg.enc b/travis/secring.gpg.enc new file mode 100644 index 0000000..60b46b5 Binary files /dev/null and b/travis/secring.gpg.enc differ diff --git a/travis/settings.xml b/travis/settings.xml index 80c47af..e36a7a4 100644 --- a/travis/settings.xml +++ b/travis/settings.xml @@ -1,9 +1,26 @@ - bintray-bullet-spark-repo - ${env.BINTRAY_USER} - ${env.BINTRAY_API_KEY} + ossrh + ${env.SONATYPE_USERNAME} + ${env.SONATYPE_PASSWORD} + + + + ossrh + + true + + + ${env.GPG_EXECUTABLE} + ${env.GPG_PASSPHRASE} + false + ${env.TRAVIS_BUILD_DIR}/travis + pubring.gpg + secring.gpg + + +