diff --git a/.travis.yml b/.travis.yml
index c51cafc70..c165ec748 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,8 +9,20 @@ sudo: false
jdk:
- oraclejdk8
-script:
- - ./gradlew --info check -x test
+install: "./installViaTravis.sh"
+
+script: "./buildViaTravis.sh"
+
+cache:
+ directories:
+ - "$HOME/.gradle"
after_failure:
- - if [ -f /home/travis/build/Netflix/Hystrix/hystrix-core/build/reports/tests/test/index.html ]; then lynx -dump /home/travis/build/Netflix/Hystrix/hystrix-core/build/reports/tests/test/index.html; fi
\ No newline at end of file
+ - if [ -f /home/travis/build/Netflix/Hystrix/hystrix-core/build/reports/tests/test/index.html ]; then lynx -dump /home/travis/build/Netflix/Hystrix/hystrix-core/build/reports/tests/test/index.html; fi
+env:
+ global:
+ - secure: PKFOXNElIioKzR25ekT5PN9FITsQnORw8GjaYdVZecdO1nIZ89vt9UmI1UnD4Jm1qsLm2o+Bv77KCU6L0bQiFernyl9400OGEVHRiXl4UuNIkWOruVgRM5BBQixbvLzqP9ul9qxNDXhB8oP/wXGMVeBEKxutb1/0AXnLlLspF9U=
+ - secure: XvRKpxC/Qh4k2LIAdFgaIEP0UW9OCoIDXt4o8494drLD/VVOZX9Ig8trFqHtfZrwBiI3zpe0XKJEPNHHAap+MyQ4SpXv13VFDGPhQCdgfcnJ4mj1Nf34J1nFRj/nZsgC99gn28qExY9tB+9IJ4MmidUvGgzN4Q7y21XbvRmmk34=
+ - secure: FEeb9KksyAPPzEqRZCWpSr2rPh1kJV/ltNYpyIhM1W+jCf3IVESluGGbZD2ufzv6toGNUzXF82i/bWkNOP4FFnGcYltZ/2OiVQHdZliP4k2xW4Kvl1bMAXkAHstoNoOQqgupnt3SRc/WYe1zfc3FsHW0ADwRpBDFkFdhro1rSRo=
+ - secure: dkJ2w6CIxwo5qIh3sw59PvXvs+ht/hsuaP3IM47rMDo0FcqC86ZhjoWesizmktK7aU5K8A786xP4VZIbGWcrC++Igq3feLwhreCGVNAgLSoE5o7uRTmD3Rd9Z2TEZgKnxPyHoSv2G6H73Kgm64r+6JTpgamB84vgymhnDVbmIes=
+ - secure: PFeXGAjK07eBNbOTFq9AjNsQGlIN+H01TAcX1NraFdoEEIM+qvdf6hVK81d0dmceQvR7r0ZBGXOAI+x8/6otBqFB/8nb10Yhl2Qzw+ZlO/Au1kIrhLYrev1Z4xa9ZzgdIbGeLB2QHjbEnaXPekIE/qwTkEL4qssP7YGFG7uVhhE=
diff --git a/build.gradle b/build.gradle
index 15e60a933..a207aaeae 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,6 +23,10 @@ allprojects {
}
apply plugin: 'net.saliman.cobertura'
+
+ tasks.withType(Javadoc) {
+ options.addBooleanOption('Xdoclint:none', true)
+ }
}
subprojects {
@@ -34,8 +38,6 @@ subprojects {
sourceCompatibility = 1.6
targetCompatibility = 1.6
-
-
group = "com.netflix.${githubProjectName}"
eclipse {
diff --git a/buildViaTravis.sh b/buildViaTravis.sh
new file mode 100755
index 000000000..b85e84e2d
--- /dev/null
+++ b/buildViaTravis.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+# This script will build the project.
+
+if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
+ echo -e "Build Pull Request #$TRAVIS_PULL_REQUEST => Branch [$TRAVIS_BRANCH]"
+ ./gradlew build -x test
+elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" == "" ]; then
+ echo -e 'Build Branch with Snapshot => Branch ['$TRAVIS_BRANCH']'
+ ./gradlew -Prelease.travisci=true -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" -PsonatypeUsername="${sonatypeUsername}" -PsonatypePassword="${sonatypePassword}" -Prelease.scope=patch build snapshot -x test
+elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" != "" ]; then
+ echo -e 'Build Branch for Release => Branch ['$TRAVIS_BRANCH'] Tag ['$TRAVIS_TAG']'
+ case "$TRAVIS_TAG" in
+ *-rc\.*)
+ ./gradlew -Prelease.travisci=true -Prelease.useLastTag=true -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" -PsonatypeUsername="${sonatypeUsername}" -PsonatypePassword="${sonatypePassword}" candidate -x test
+ ;;
+ *)
+ ./gradlew -Prelease.travisci=true -Prelease.useLastTag=true -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" -PsonatypeUsername="${sonatypeUsername}" -PsonatypePassword="${sonatypePassword}" final -x test
+ ;;
+ esac
+else
+ echo -e 'WARN: Should not be here => Branch ['$TRAVIS_BRANCH'] Tag ['$TRAVIS_TAG'] Pull Request ['$TRAVIS_PULL_REQUEST']'
+ ./gradlew build -x test
+fi
\ No newline at end of file
diff --git a/hystrix-core/build.gradle b/hystrix-core/build.gradle
index 8955c78e9..683cf91d7 100644
--- a/hystrix-core/build.gradle
+++ b/hystrix-core/build.gradle
@@ -23,6 +23,8 @@ javadoc {
windowTitle = "Hystrix Javadoc ${project.version}"
}
options.addStringOption('top').value = '