Repository: incubator-gearpump Updated Branches: refs/heads/master e281c4a35 -> aec49f5b6
[GEARPUMP-237] remove manually downloading sbt launcher jar on travis Author: manuzhang <[email protected]> Closes #110 from manuzhang/fix_resolver. Project: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/commit/aec49f5b Tree: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/tree/aec49f5b Diff: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/diff/aec49f5b Branch: refs/heads/master Commit: aec49f5b6bbd7b3501f6f6e15aacbc9fb2286f41 Parents: e281c4a Author: manuzhang <[email protected]> Authored: Tue Nov 15 12:28:32 2016 -0800 Committer: Kam Kasravi <[email protected]> Committed: Tue Nov 15 12:28:32 2016 -0800 ---------------------------------------------------------------------- .travis.yml | 34 ++++++++++++++++------------------ project/BuildGearpump.scala | 5 ++--- project/plugins.sbt | 3 +-- 3 files changed, 19 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/aec49f5b/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml index 7151f88..e47393c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,23 +1,7 @@ language: - java - scala -sudo: false -before_script: -- mkdir -p $HOME/.sbt/launchers/0.13.13/ -- curl -L -o $HOME/.sbt/launchers/0.13.13/sbt-launch.jar http://dl.bintray.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/0.13.13/sbt-launch.jar -script: -- echo "TRAVIS_PULL_REQUEST" $TRAVIS_PULL_REQUEST -- echo "TRAVIS_BRANCH" $TRAVIS_BRANCH -- echo "TRAVIS_TAG" $TRAVIS_TAG -- echo "repo" $TRAVIS_REPO_SLUG -- set -o pipefail; skipLogs="Resolving |Compiling |Done updating|Updating |scoverage|coverage-report"; - if [[ $TRAVIS_PULL_REQUEST != "false" || $TRAVIS_REPO_SLUG != "apache/incubator-gearpump" ]]; - then sbt -jvm-opts project/travis/jvmopts clean +assembly scalastyle test:scalastyle it:scalastyle unidoc coverage +test | grep -v -E "$skipLogs"; - elif [[ $TRAVIS_BRANCH == "master" ]]; - then sbt -jvm-opts project/travis/jvmopts clean +assembly +publish | grep -v -E "$skipLogs"; sbt -jvm-opts project/travis/jvmopts scalastyle test:scalastyle it:scalastyle unidoc coverage +test | grep -v -E "$skipLogs"; - elif [[ $TRAVIS_TAG != "" ]]; - then sbt -jvm-opts project/travis/jvmopts clean +assembly +packArchiveZip | grep -v -E "$skipLogs"; - fi +sudo: required jdk: - oraclejdk8 addons: @@ -28,10 +12,24 @@ scala: - 2.11.8 cache: directories: - - $HOME/.m2 + - $HOME/.m2/repository + - $HOME/.sbt - $HOME/.ivy2 git: depth: 1 +script: +- echo "TRAVIS_PULL_REQUEST" $TRAVIS_PULL_REQUEST +- echo "TRAVIS_BRANCH" $TRAVIS_BRANCH +- echo "TRAVIS_TAG" $TRAVIS_TAG +- echo "repo" $TRAVIS_REPO_SLUG +- set -o pipefail; skipLogs="Resolving |Compiling |Done updating|Updating |scoverage|coverage-report"; + if [[ $TRAVIS_PULL_REQUEST != "false" || $TRAVIS_REPO_SLUG != "apache/incubator-gearpump" ]]; + then sbt -jvm-opts project/travis/jvmopts clean +assembly scalastyle test:scalastyle it:scalastyle unidoc coverage +test | grep -v -E "$skipLogs"; + elif [[ $TRAVIS_BRANCH == "master" ]]; + then sbt -jvm-opts project/travis/jvmopts clean +assembly +publish | grep -v -E "$skipLogs"; sbt -jvm-opts project/travis/jvmopts scalastyle test:scalastyle it:scalastyle unidoc coverage +test | grep -v -E "$skipLogs"; + elif [[ $TRAVIS_TAG != "" ]]; + then sbt -jvm-opts project/travis/jvmopts clean +assembly +packArchiveZip | grep -v -E "$skipLogs"; + fi after_success: - if [[ $TRAVIS_PULL_REQUEST != "false" || $TRAVIS_REPO_SLUG != "apache/incubator-gearpump" || $TRAVIS_BRANCH == "master" ]]; then bash <(curl -s https://codecov.io/bash); http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/aec49f5b/project/BuildGearpump.scala ---------------------------------------------------------------------- diff --git a/project/BuildGearpump.scala b/project/BuildGearpump.scala index 1a52c40..8c9e438 100644 --- a/project/BuildGearpump.scala +++ b/project/BuildGearpump.scala @@ -41,10 +41,9 @@ object BuildGearpump extends sbt.Build { val commonSettings = Seq(jacoco.settings: _*) ++ sonatypeSettings ++ Seq( resolvers ++= Seq( + // https://repo1.maven.org/maven2 has been added by default "apache-repo" at "https://repository.apache.org/content/repositories";, - "maven1-repo" at "http://repo1.maven.org/maven2";, - "maven2-repo" at "http://mvnrepository.com/artifact";, - "sonatype" at "https://oss.sonatype.org/content/repositories/releases";, + Resolver.sonatypeRepo("releases"), "clojars" at "http://clojars.org/repo"; ) ) ++ http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/aec49f5b/project/plugins.sbt ---------------------------------------------------------------------- diff --git a/project/plugins.sbt b/project/plugins.sbt index 5f88b5e..0a6a562 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -16,8 +16,7 @@ * limitations under the License. */ -resolvers += Resolver.url("fvunicorn", - url("http://dl.bintray.com/fvunicorn/sbt-plugins";))(Resolver.ivyStylePatterns) +resolvers += Resolver.bintrayIvyRepo("fvunicorn", "sbt-plugins") resolvers += Classpaths.sbtPluginReleases
