diff --git a/.travis.yml b/.travis.yml index fc3db82..0200cea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,26 +2,4 @@ language: java dist: trusty jdk: - oraclejdk8 -- openjdk8 -install: -- "./gradlew assemble -PSONATYPE_USERNAME=${SONATYPE_USERNAME} -PSONATYPE_PASSWORD=${SONATYPE_PASSWORD}" -before_script: -- openssl aes-256-cbc -pass pass:$ENCRYPTION_PASSWORD -in $DEPLOY_DIR/pubring.gpg.enc - -out $DEPLOY_DIR/pubring.gpg -d -- openssl aes-256-cbc -pass pass:$ENCRYPTION_PASSWORD -in $DEPLOY_DIR/secring.gpg.enc - -out $DEPLOY_DIR/secring.gpg -d -script: -- "./gradlew clean build -PSONATYPE_USERNAME=${SONATYPE_USERNAME} -PSONATYPE_PASSWORD=${SONATYPE_PASSWORD}" -deploy: - provider: script - script: "./publish/publish-patch.sh" - on: - branch: master -env: - global: - - DEPLOY_DIR="`pwd`/publish" - - secure: o5b3Te69mL0sXmjFFmyjF4T028KrIUP4Guo/3blyycvaPd5xDQemWKjb8XIn7NQRUpcmNgoUxlPAHzdAbkiyoyWB5jk16JzNY1Z7QHB2GrKN2XN49NaQuAbEgBm4dJcqaKE7R5kCO4JvBCjrcjAilsp2hLRq6irNHtW3AiVhxxz9vtcr0y7IICaF3lztHSSTVSbZnIr6nET2iS+9GHbN2e3dEDUxdM4ytx8keITWT2GkWBbTucsGH67s2dDVCrvIKTCrWKfPsroDsudkJSU8B/gFwSF4+LEQwtORebrGZsBGoT5KtpDGaP2NPE8Rw4N8LGiM5ABT3L8LHr0GkT0COd8AVp1YQ8eFlHjaBeDu+vhdn/KxIqrzdCln0eoTRBxsNQ82J8ySvgC6M42u6AVeIV/LDPDcTtjzxY95V4HhupWFOuOGBlXP7jdGsUviJkRZQiIJs7/xGNSGTlHPI+2xjWHqtHE0AcL+ZYnDYShfIqSHpfpYJ7ruZ0C2quMKS53czQlSYUKVVMNBrbYUQhwn5OOu6Rvx/AtYwS1e/SzguC4QT3fIldMagm8kQADplpjpyXd1F7usN6eDhH5baunRfkA7BNrmksuQ4iMdadI0AHF+m2hQ//pZw8OPPe2Yw/LlzKNyoLHlRXLmjW11NVeY6jYrVxAPd3Jl14X1zcGVHsc= - - secure: VSaJ4bvwtnmzKpuu72dX4vn/ftqG4OQcnSR23+TqhanXDaWe45T3ef+4Yjbn+3EQqYklp/wV/shPz03am5xJ8Ec79k6B/vnV69W0NzzJ4kME/jWM1s258e6c9PzonFqM43WgYJ/Gvg1XoVe1K6B3c8dYPZVcJVU0peuVTFKJ7PZjBxaQPYKpaIEg0XvUTj2E/Ke2NTjwZDL1FmRx2arnJmPo/UzAPTM6HU3U6XdcnB0hA2g27F0Y2a/9lerg0oIi9Zd1QCI+BvgU2ma10AuYlqtbDaHJpWWWpIuaM3OluRCDim1hQm4tuDXUMZtq11M+mGVYz6o0dHcvWSIk8OJvDMBq++4J/BxRvv4Ti8jMvR/WbJ1puaY1hjH2IinK7bzgML7TD9ZKWc12rFdrHyv39gN9dIarfL6EjC9fE/++xitRMFDhietaA1FZ9NrHQjVb3RPkhzsun6Zy6J59sX7xQ/xbMhFXf1ED/GfBuoKL5+FYwc953L76Qa0uOq+9022mKFc3bHYXmh1STUEYmw6+TXlFqHI0rQt3vkO54HAlVAo+F4/IhFmirD6Uqc1M17KH0Wy8XShITa4oDFZT9JBDvaZpQvoujYLoAaALI4SRwqMj+62IpporurvfRv601UwiCjDVlanWOn0AX8R8B2J79TsTeODrSKYmekuimSd4ed8= - - secure: oRBBFUPGBn2qTUee80WtIZNPXDlRj3RfUmXDv1J/ZxOlhrRqM+rhqkz9hEFy7L0FjUQfF8g3jqkUUdSYA+sa60StUHJsJZSqbUfWV6lg3m4zzpKnHitdvThDB7vxfY3MRGSInkIWRNwCkMpUK9pupqPOhC5XZM1WGDgL0znQwWDEiQIujBn5CzR5xNj9dAiORxNJZpkDxJqwJxcf6yImQQmPJ23R4WoJH3Hk5fzeNM8QdV3mnmffAILFR1madrVET2SiUAeY2jKrQsxOhg3S1Cdu0gEc5QkCEQ1hioVPOS2uNhqr8dILmqedfssXzhuF9lqcb0W3vfMykRcEhO6em/2IH+wSFTVJNNelntxOBdWru/LUDhFF/LjjYp2r5dVmqbTKgSSrcD+cWzTpOtV96TYyfUb4BmwMKrjVpaIxOKY+2u6Fx+/hFoPyyoU+ZfnLQZdZ/yAyQBIgEAVGMCKWFV9MnXptSofPgNbDWepsJRD3XzV/ovuVEZG45NPahW8J0KThREHC2tTs0tfZcjovZbhOjvphDL25m+YnynahNMtQxS6EeopzOwQ9jQX3ieiXiwqX/18TWHMEKatH9UeDYrkEBeSk8N/Vm/Ml9LVvkwZSrMQEoy9C91J43HG/jmpPyHNFebk0MvKCF1eUFCt3JJ7Ini8Rodnc7sy02MRncMU= - - secure: mOsDSvdCOxMBueE6YrGaoPUswXqZrbl5LyZoquJziZpDyGq+Gh09a7xphNEsg4ABcKoJicRO7HS3PGjIHZXQOKE8JR+v2lC0gm0P9LO6A3PNXYxweRh2dk9GdptaUslnX4xw5+s8MO44JAXCUrHIZfasGKmBg8azUGFeW+wj/6TdfO8lBQkK9aaacOKyyUBglqK8uK6VEs1dRc6bESx+qaDLIPvaL6rXtK5pdWdMQqw5cSn3wnMPtUuVwSME/Rjkg2JRz9UO08pFMNYOejOsoXJ5ZSYBKfRf+fOlv9l5uTUmEDxhQTutfSK3tWrqDPzLrNe23jjR1uKG/6lBVGRSRsuKziNVMrRaB+38nPx6vTNS0pjRYsKoLYQrMdwV/5bFEVKIB1COUvoevv3925UTEDY3sJM7OkPo6+STTAAIAeSFdEZ+0R7LaTjEXKvoGLN5yN7dQnyQqkjnNo2wrf3vC3mGo2TgsidhKsabJjkPK+2KgxTGg6aZji/c4aLmkZ3bQ/d9ldYqXMINKYVB37zxjfB1P7ClW+cZ2IyIkh3ex7UsVKlik2VqCU+GE4os/VWHQ7owNGp09MuaHhQuGT6Bbcgraily+pi30SOWpw6690OOlyT9z+h6P72WzLe18KRsq0rJz2ifS6Df4y7Tz9IpemErd6AJoZkqLwmO5qAUWCQ= - - secure: fEYdvIWbWC8M+1XjCzCRhk5tvhJUT2tEvC9EPHZNHcgJTbQwlDc6aE3ZETepS/9rPgQk1f37uE9oJeel/4Fh8RYuUQKZJfySE78dDpC4dmBeId8CJWJnUGec2pbzMei6pt4REc37ZlijfaSHWHqb2A4L/ell6KHBmzwawkJ9pq6QBmVYLCU0xRPwqeMQWtwct/hRbyk5kRgKn9aEkRtN30kbmrpKukaIfFnI/60k6lBXYY03Z0Odddu8feR6x5C5Pblz/ZqkH6Ap+L8uzNuj703wn9iwmGQi4weh3vGaH4qPlRAzEQ+S/lZwnMw+r6V0S8XAyGHSFh9Diz/d6zt86Za2r9BjfUEADopYrScx1nj4c7KuiflGMUIfDCO8AgAWLPOy6izxMqHRhe5s1Ys2a1RckhhsJOIxUSyiqqWWoN00jSGDI4O8gtuHEQiuUnwqdnoj1Aj+KIcrs5WTjf1cYn1F6TgHCtzlloYtexyKVBZSTC77tpQpZdfW4XYzTKNy2dUf6tXBvdWZ9qLZIhXM+zldTtrmM95kF8GstphIzlwtw5ailelxMesTOT6GHQsb4n2qBWh69BQ8OyzJtMP7yioMDLjnA34U9DWXnhKrErvbU6bvnmSQtM6tHa+rmnmrUvijilK8U0KwoeqNe63xqitHp/4sVzI6BQUG7dWzKFI= +- openjdk8 \ No newline at end of file diff --git a/build.gradle b/build.gradle index e32382b..2261c5a 100644 --- a/build.gradle +++ b/build.gradle @@ -10,10 +10,6 @@ buildscript { } } -plugins { - id 'net.nemerosa.versioning' version '2.6.1' -} - apply plugin: 'java' apply plugin: 'org.springframework.boot' @@ -59,13 +55,4 @@ artifacts { archives javadocJar, sourcesJar } -versioning { - releaseBuild = VERSIONING_RELEASE_BUILD - releaseMode = VERSIONING_RELEASE_MODE - displayMode = VERSIONING_DISPLAY_MODE - branchEnv = ['TRAVIS_BRANCH','GIT_BRANCH', 'BRANCH_NAME'] - dirty = { t -> t } - releases = ['release'] -} - apply from: 'publishToMaven.gradle' diff --git a/publish/publish-patch.sh b/publish/publish-patch.sh deleted file mode 100755 index e258519..0000000 --- a/publish/publish-patch.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/env bash -set -x - -set -e - - -main() { - - echo "Current Branch Version with travis : ${TRAVIS_BRANCH}" - echo "Current TAG Version with travis : ${TRAVIS_TAG}" -./gradlew versionFile -PSONATYPE_USERNAME=${SONATYPE_USERNAME} -PSONATYPE_PASSWORD=${SONATYPE_PASSWORD} - - -# if [ ${TRAVIS_BRANCH} != "master" ]; then - -# ./gradlew clean build -PSONATYPE_USERNAME=${SONATYPE_USERNAME} -PSONATYPE_PASSWORD=${SONATYPE_PASSWORD} -# -# ./gradlew versionFile -PSONATYPE_USERNAME=${SONATYPE_USERNAME} -PSONATYPE_PASSWORD=${SONATYPE_PASSWORD} -# -# export $(cat build/version.properties | xargs) -# -# GIT_TAG=${VERSION_DISPLAY} -# -# echo "Tag Version is : ${GIT_TAG}" -# -# ./gradlew uploadArchives -PSONATYPE_USERNAME=${SONATYPE_USERNAME} -PSONATYPE_PASSWORD=${SONATYPE_PASSWORD} -# -# git tag ${GIT_TAG} -# -# git push --tag - -# fi - - -} - - -main $* - diff --git a/publish/publish-release.sh b/publish/publish-release.sh deleted file mode 100755 index ff1e2a3..0000000 --- a/publish/publish-release.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash -set -x - -set -e - - -main() { - - echo "Current Branch Version with travis : ${TRAVIS_BRANCH}" - - if [ ${TRAVIS_BRANCH} != "master" ]; then - - ./gradlew clean build -PVERSIONING_RELEASE_BUILD=true -PVERSIONING_RELEASE_MODE=tag -PVERSIONING_DISPLAY_MODE=base -PSONATYPE_USERNAME=${SONATYPE_USERNAME} -PSONATYPE_PASSWORD=${SONATYPE_PASSWORD} - - ./gradlew versionFile -PVERSIONING_RELEASE_BUILD=true -PVERSIONING_RELEASE_MODE=tag -PVERSIONING_DISPLAY_MODE=base -PSONATYPE_USERNAME=${SONATYPE_USERNAME} -PSONATYPE_PASSWORD=${SONATYPE_PASSWORD} - - export $(cat build/version.properties | xargs) - - GIT_TAG="${VERSION_DISPLAY}" - - ./gradlew uploadArchives -PVERSIONING_RELEASE_BUILD=true -PVERSIONING_RELEASE_MODE=tag -PVERSIONING_DISPLAY_MODE=base -PSONATYPE_USERNAME=${SONATYPE_USERNAME} -PSONATYPE_PASSWORD=${SONATYPE_PASSWORD} - - git tag ${GIT_TAG} - - git push --tag - - fi - -} - - -main $* - diff --git a/publish/pubring.gpg.enc b/publish/pubring.gpg.enc deleted file mode 100644 index 95418e1..0000000 Binary files a/publish/pubring.gpg.enc and /dev/null differ diff --git a/publish/secring.gpg.enc b/publish/secring.gpg.enc deleted file mode 100644 index 14d8ed3..0000000 Binary files a/publish/secring.gpg.enc and /dev/null differ