From 10dc0cccca7b4c446ad47a31b7d18d59cb2d43ac Mon Sep 17 00:00:00 2001 From: Andrea Turli Date: Tue, 24 Nov 2015 12:12:10 +0100 Subject: [PATCH] Add CI with Travis --- .buildscript/deploy_snapshot.sh | 26 ++++++++++++++++++++++++++ .buildscript/settings.xml | 9 +++++++++ .gitignore | 1 + .travis.yml | 25 +++++++++++++++++++++++++ README.md | 2 ++ a4c-brooklyn-plugin/pom.xml | 15 +-------------- brooklyn-tosca-dist/pom.xml | 4 ++-- brooklyn-tosca-transformer/pom.xml | 3 +-- pom.xml | 4 ++-- 9 files changed, 69 insertions(+), 20 deletions(-) create mode 100755 .buildscript/deploy_snapshot.sh create mode 100644 .buildscript/settings.xml create mode 100644 .travis.yml diff --git a/.buildscript/deploy_snapshot.sh b/.buildscript/deploy_snapshot.sh new file mode 100755 index 0000000..6f0b6f4 --- /dev/null +++ b/.buildscript/deploy_snapshot.sh @@ -0,0 +1,26 @@ +#!/bin/bash +# +# Deploy a jar, source jar, and javadoc jar to Sonatype's snapshot repo. +# +# Adapted from https://coderwall.com/p/9b_lfq and +# http://benlimmer.com/2013/12/26/automatically-publish-javadoc-to-gh-pages-with-travis-ci/ + +SLUG="cloudsoft/brooklyn-tosca" +JDK="oraclejdk7" +BRANCH="master" + +set -e + +if [ "$TRAVIS_REPO_SLUG" != "$SLUG" ]; then + echo "Skipping snapshot deployment: wrong repository. Expected '$SLUG' but was '$TRAVIS_REPO_SLUG'." +elif [ "$TRAVIS_JDK_VERSION" != "$JDK" ]; then + echo "Skipping snapshot deployment: wrong JDK. Expected '$JDK' but was '$TRAVIS_JDK_VERSION'." +elif [ "$TRAVIS_PULL_REQUEST" != "false" ]; then + echo "Skipping snapshot deployment: was pull request." +elif [ "$TRAVIS_BRANCH" != "$BRANCH" ]; then + echo "Skipping snapshot deployment: wrong branch. Expected '$BRANCH' but was '$TRAVIS_BRANCH'." +else + echo "Deploying snapshot..." + mvn clean source:jar javadoc:jar deploy --settings=".buildscript/settings.xml" -Dmaven.test.skip=true + echo "Snapshot deployed!" +fi diff --git a/.buildscript/settings.xml b/.buildscript/settings.xml new file mode 100644 index 0000000..eeedbf9 --- /dev/null +++ b/.buildscript/settings.xml @@ -0,0 +1,9 @@ + + + + sonatype-nexus-snapshots + ${env.CI_DEPLOY_USERNAME} + ${env.CI_DEPLOY_PASSWORD} + + + diff --git a/.gitignore b/.gitignore index 10f1aae..90c521f 100644 --- a/.gitignore +++ b/.gitignore @@ -33,4 +33,5 @@ ignored runtime *.pyc +*.out diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..fdc1578 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,25 @@ +language: java + +jdk: + - oraclejdk7 + +after_success: + - .buildscript/deploy_snapshot.sh + +env: + global: + - secure: "ZHAN9WNnj6gmUBSTxKq/J2wnYJBrBmtjDDZIsS3buq1NVEdOyqapIKo6bSJ4u5N1q1ajphb4OKWwg55qkPxzVTcq/b9z2cLdevfBp2CWRBcQ9ag3kpDSzIurVDTNm8yw4uxurhVEHxHmtWgN+bgae7TskX73ApWajddpz73sI7NFqumhAIE+2Bm1IUf/kpIMZ129lUNd/3+AZXiZim7T+Un8q5+JDw3s7tX9Va3gRskC6SgH9PMusO14N2EoFdrHf3iLRhY/2RWdGWUCDr6Pm8R8Absj1dj1Sz78uPnxNMNtLwEKq7nC2ZyI0y7EVmKwPKuBEXJTRauLbVDHsAa1KNzN6RXA4dwdLnlQc3r8G/nXqEAKaHU6RB2bcdcFV5cbh/Buk2pkJ28fHitCOObWlnotSnOqksVsvRL7m6YLEH/Qdt/PhyzqngoJBr2k7knrCMmbpolmQwzTGfYrA9C7q/2so1a1mD/Q7K2krR0d2i0HK/zVnNVwUM+8QWCVnwKHlZ5nUCW9sk3OQa3qTxeaahzzBSdzrFsLNGiidPkLbR0TK4z24dRnTYyUpff94pPG2qqWBgWO+iz44gJGbG2DT9XcOvIy4bVJZ05ujLdjMIbefCvjZTaHzu7JzZUxg4lU4wAsXeMI0CPwYe7SRQNEmJ5VhUm1y4FvoLeNOQOdmxE=" + - secure: "gqP9t3ggDqYVgEHyjZwZB+vh/zCLpAZbFOagGLV2eHXe+1Krbap/3aeNeihKJ7o88uYDgNmVN7u8zlSafUnwSXn1MenXde2MUAbGeXdMAbULBFnZI5JNGpa20tQbL8dkGBSqHqg7z7uT/hr2OcM8r0/NgI5jIqIgj2MRW+tjvOXJy4yi19xiol+DPT7++MnBxvPrNHU4TVAK5jjCx/L+016RVPTsUWqKYAlKObpTTE/TuTjQFE2/Eqw1GAGPdsF1js4pQkQhcgFSxnB2shjjruRaqYW/7I/zpjVeluuuwaYwm03wMFRIr+Kx/UiBeR9zT0xYnbAJaZreW4Ty1GzzXlBU1CNvhzwXfSkgKzcIEi3XI7B6jKLjw33jHmbEStlQcu/xovSCXQW5MaJ4uBKToOLajZmbImyYAlWWNka1Bww9XuIQ4mN6Sp8xM1Wm4VFjCp8PGqDqhKKPiM4VQ86GS8uoS9QzO7U4MRxpG/zUP6m6BAFs5kuLzsNNLupohEs1gCP6ky2Wc7e9AIiAsCLDs7OEWHxeEZbJ1RBSVB5h7RQ41GmQjrbDntTJqGDDYNt1yi5KjXP4Bd6Pe1X1Gwb58SJZ1gYEnu8WqpWFqVMIGfsI9Jkky+RaRLoIz5PwrTqiFj20b95MAhpC9neZzHhB1i1XwzalTQ6fnbRbz+2isQ0=" + +branches: + except: + - gh-pages + +notifications: + email: false + +sudo: false + +cache: + directories: + - $HOME/.m2 diff --git a/README.md b/README.md index 9a4a14a..dbafb14 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ brooklyn-tosca === +[![Build Status](https://travis-ci.org/cloudsoft/brooklyn-tosca.svg?branch=master)](https://travis-ci.org/cloudsoft/brooklyn-tosca) + ## Overview This package provides support for [Apache Brooklyn](http://brooklyn.io) diff --git a/a4c-brooklyn-plugin/pom.xml b/a4c-brooklyn-plugin/pom.xml index 7811035..23b35d3 100644 --- a/a4c-brooklyn-plugin/pom.xml +++ b/a4c-brooklyn-plugin/pom.xml @@ -3,7 +3,7 @@ 4.0.0 - org.apache.brooklyn.tosca + io.cloudsoft.brooklyn.tosca brooklyn-tosca-parent 0.9.0-SNAPSHOT ../pom.xml @@ -17,17 +17,6 @@ the best of both worlds. - - - repo.opensource.fastconnect.org - https://fastconnect.org/maven/content/repositories/opensource - - - repo.opensource.snapshot.fastconnect.org - https://fastconnect.org/maven/content/repositories/opensource-snapshot - - - 1.12.6 @@ -67,7 +56,6 @@ httpmime ${httpclient.version} - org.projectlombok @@ -75,7 +63,6 @@ ${lombok.version} provided - junit diff --git a/brooklyn-tosca-dist/pom.xml b/brooklyn-tosca-dist/pom.xml index 172f89e..cb1b420 100644 --- a/brooklyn-tosca-dist/pom.xml +++ b/brooklyn-tosca-dist/pom.xml @@ -5,7 +5,7 @@ 4.0.0 - org.apache.brooklyn.tosca + io.cloudsoft.brooklyn.tosca brooklyn-tosca-parent 0.9.0-SNAPSHOT ../pom.xml @@ -23,7 +23,7 @@ - org.apache.brooklyn.tosca + io.cloudsoft.brooklyn.tosca brooklyn-tosca-transformer ${project.version} diff --git a/brooklyn-tosca-transformer/pom.xml b/brooklyn-tosca-transformer/pom.xml index 4306ad4..a9c7930 100644 --- a/brooklyn-tosca-transformer/pom.xml +++ b/brooklyn-tosca-transformer/pom.xml @@ -5,7 +5,7 @@ 4.0.0 - org.apache.brooklyn.tosca + io.cloudsoft.brooklyn.tosca brooklyn-tosca-parent 0.9.0-SNAPSHOT ../pom.xml @@ -71,6 +71,5 @@ 1.9.0 test - diff --git a/pom.xml b/pom.xml index e9e912d..2147a8f 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ 0.9.0-SNAPSHOT - org.apache.brooklyn.tosca + io.cloudsoft.brooklyn.tosca brooklyn-tosca-parent pom @@ -24,7 +24,7 @@ 1.7 - 1.1.0-SM7-SNAPSHOT + 1.1.0-SM8-SNAPSHOT 4.1.4.RELEASE