diff --git a/.travis.yml b/.travis.yml index 76b9a78..e528120 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,18 +1,31 @@ dist: xenial language: java -os: - - linux jdk: + - openjdk8 - openjdk11 before_install: - - rm ~/.m2/settings.xml || true + - rm ~/.m2/settings.xml || true - ulimit -c unlimited -S - - mvn -N io.takari:maven:wrapper after_success: - - bash .travis_after_success.sh + - bash ci/after_success.sh cache: directories: - - $HOME/.m2 - -notifications: - email: false + - "$HOME/.m2" +deploy: + - provider: script + script: bash ci/deploy-snapshot.sh + on: + repo: dropwizard/dropwizard-health + tags: false + branch: master + jdk: openjdk8 + - provider: script + script: bash ci/deploy-release.sh + on: + repo: dropwizard/dropwizard-health + tags: true + jdk: openjdk8 +env: + global: + - secure: RPsipHHqg22GuRtj09bjq09RXyg9PvV2JeQKtPwafpT2DRQjMwQi4A5aeO8YW2J4lx0vBNScNkXvRvvqE7hVWahV3WFdbz6KT+uFtgTceoYpJp9J24mpYpv6f/K8LotqIP0uMloSZXzO97DT/yIzU0MqOzROqw7Ss1K4P0chde6HDDu7f4N7Og6BC8wyiJ4uhlwGoa27Xi59PooIw1zsEXjPhVpYgMCi3iF57i19gOverNhJ4SlaQtg+5/Ie91L7fBSn3hWdsi2bUCh3kM17HCCPOVJmO5fT48CcJzyNjGmA4i2EWub8dl7ssCHXbCRKyWywyo2vryKdjMxvOXUG46ISJgEo1S+2Z+lmOIbxklfPVzqc41UMe/kETXMs0JCKiJ8JAI6neEgSOCxB+jOByRa5zmEMNAkT/oNp0bllG0EawK46rG4shUkFy39n6rxDa360UYpFP2/Go0lMU0dodf41F5CW5FN9yLvgGl1Gv3ysRquLxO1rhqyQmFdcw7K7igvKGbhpluSRUHw5LD02yqJsyrNesWndVEz+9KjHvq++bk1SjDJZN2nQN/i/X+e5EMfXLxKIxAD7rwUPFz1Q2N+qLUJObL3TJPHlDiezYhzSnLvGWrI4gCwktBA6/TS3/7TRdTfK064XsTOw8FcTVUSTgbk/pK+mc51JyT6yhJQ= + - secure: BjplEOJujhM6DQWIxsyEnnw473GXHEQfndDlHZnFXB3lU6NYvK6mDXWUANRjD4JL3knvxazxk/TKPgw2pblL1mY6zs2HCMzaa7xlNzuoasNsT0ZygprbipalSxxl8+O5S1efuiAtrLwLHatahBKDN+dB9WygSiNG8ZbU2NlfsExQ/Id9on0Zpa6o5OioxDcQFpgaF2IQNiCBi+YOX1gyVbwEd/fFpLDQaIimZmxZzKy4f/T6v06TUfaZJBagB+pjVTjIOxpOLE50yIX+EWHdAGURwptXnHGsjjBQUy0sg9oVN8MlobZA6Kw6mhvh+x6JnTuC/B4/netWQWzWimLnUsee4GgaBSgiBH4GaMseRWZ2ajMJLir872N9FhaIPnwjRTeKgSsQ+UPnWl98ZGywYEmUcy6adcZ9ccLFhb6dI6HESyOvxBIL0Zbvc7F8KActM3DxJTZDoiCketB1ETh2urYuJXQ8ZGhMaRZWVvJ/1cYa4sI9Y3dArn03aQEYjfe0QY1jfGayZOx4t2snDVyL/wV/JWAbP2HZt7LC+OYhY+OXJCjpPXdaRB/W2qNR6WQ0UJpB4p5RlcUFsYKc8a02cSbW+4J5MkJvTfV+PnPXkrQVeea0vE7Gh6RFnYluVkNxDq0u5FIy2JF0ak8VUiDOk+uFzwdzAw/QDBH0OyPSoTk= diff --git a/.travis_after_success.sh b/.travis_after_success.sh deleted file mode 100644 index 68e5cdc..0000000 --- a/.travis_after_success.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash - -if [[ "${TRAVIS_JDK_VERSION}" != "openjdk11" ]]; then - echo "Skipping after_success actions for JDK version \"${TRAVIS_JDK_VERSION}\"" - exit -fi - -if [[ -n ${TRAVIS_TAG} ]]; then - echo "Skipping deployment for tag \"${TRAVIS_TAG}\"" - exit -fi - -if [[ ${TRAVIS_BRANCH} != 'master' ]]; then - echo "Skipping deployment for branch \"${TRAVIS_BRANCH}\"" - exit -fi - -if [[ "$TRAVIS_PULL_REQUEST" = "true" ]]; then - echo "Skipping deployment for pull request" - exit -fi - -./mvnw -B deploy --settings maven_deploy_settings.xml -Dmaven.test.skip=true diff --git a/README.md b/README.md index a425fc9..bfb7849 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,6 @@ # dropwizard-health +[![Build Status](https://travis-ci.org/dropwizard/dropwizard-health.svg?branch=master)](https://travis-ci.org/dropwizard/dropwizard-health) +[![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.dropwizard.modules/dropwizard-health/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.dropwizard.modules/dropwizard-health/) Provides a health check implementation that performs ongoing monitoring of an application's dependencies and includes an endpoint that can be called by a load balancer to determine if the application is healthy and thus able to receive diff --git a/ci/.gitignore b/ci/.gitignore new file mode 100644 index 0000000..f636c48 --- /dev/null +++ b/ci/.gitignore @@ -0,0 +1 @@ +dropwizard.asc diff --git a/ci/after_success.sh b/ci/after_success.sh new file mode 100755 index 0000000..3ba1547 --- /dev/null +++ b/ci/after_success.sh @@ -0,0 +1,8 @@ +#!/bin/bash +set -e +set -uxo pipefail + +if [[ "${TRAVIS_JDK_VERSION}" == "openjdk8" ]]; then +# ./mvnw coveralls:report -B -q +# exit $? +fi diff --git a/ci/deploy-release.sh b/ci/deploy-release.sh new file mode 100755 index 0000000..cb65887 --- /dev/null +++ b/ci/deploy-release.sh @@ -0,0 +1,9 @@ +#!/bin/bash +set -e +set -uxo pipefail + +# Decrypt and import signing key +openssl aes-256-cbc -K $encrypted_da5c7df06829_key -iv $encrypted_da5c7df06829_iv -in ci/dropwizard.asc.enc -out ci/dropwizard.asc -d +gpg --armor --import ci/dropwizard.asc + +./mvnw -B deploy --settings 'ci/settings.xml' -DperformRelease=true -Dmaven.test.skip=true diff --git a/ci/deploy-snapshot.sh b/ci/deploy-snapshot.sh new file mode 100755 index 0000000..b1e23e5 --- /dev/null +++ b/ci/deploy-snapshot.sh @@ -0,0 +1,5 @@ +#!/bin/bash +set -e +set -uxo pipefail + +./mvnw -B deploy --settings 'ci/settings.xml' -Dmaven.test.skip=true diff --git a/ci/dropwizard.asc.enc b/ci/dropwizard.asc.enc new file mode 100644 index 0000000..ac8646e Binary files /dev/null and b/ci/dropwizard.asc.enc differ diff --git a/ci/settings.xml b/ci/settings.xml new file mode 100644 index 0000000..c461298 --- /dev/null +++ b/ci/settings.xml @@ -0,0 +1,12 @@ + + + + ossrh + ${env.CI_DEPLOY_USERNAME} + ${env.CI_DEPLOY_PASSWORD} + + + diff --git a/maven_deploy_settings.xml b/maven_deploy_settings.xml deleted file mode 100644 index 85635ee..0000000 --- a/maven_deploy_settings.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - sonatype-nexus-snapshots - ${env.CI_DEPLOY_USERNAME} - ${env.CI_DEPLOY_PASSWORD} - - - - - - - diff --git a/pom.xml b/pom.xml index e5ba01d..dc5a382 100644 --- a/pom.xml +++ b/pom.xml @@ -8,19 +8,7 @@ io.dropwizard.modules dropwizard-health - 1.0.0-SNAPSHOT - - - - org.apache.maven.plugins - maven-compiler-plugin - - 11 - 11 - - - - + 1.3.11-1-SNAPSHOT jar Dropwizard Health @@ -80,9 +68,14 @@ UTF-8 UTF-8 - 1.3.10 - 2.20.0 - 3.0.0 + 1.8 + 1.8 + true + true + + 1.3.11 + 2.23.2 + 3.1.6 @@ -102,6 +95,12 @@ io.dropwizard dropwizard-core + + javax.xml.bind + jaxb-api + 2.3.1 + runtime + @@ -133,4 +132,82 @@ + + + release + + + performRelease + true + + + + true + EDA86E9FB607B5FC9223FB767D4868B53E31E7AD + + + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + none + true + + + + attach-javadocs + + jar + + + + + + org.apache.maven.plugins + maven-gpg-plugin + + + sign-artifacts + verify + + sign + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + + ossrh + https://oss.sonatype.org/ + true + + + + nexus-deploy + deploy + + deploy + + + + + + + +