Merge pull request Netflix#158 from rspieldenner/1xtravis

Remove wrong keys

.travis.yml

@@ -4,12 +4,12 @@ jdk:
 sudo: false
 install: "./installViaTravis.sh"
 script: "./buildViaTravis.sh"
-env:
-  global:
-  - secure: JReOX/9ZzNHP0CWrw2KEQ699fcWH+59kR7WjJTPglYMhIDsrcQlSV+AKPfXVuEh71HanWDaEjVtw1i0nMiZGd8k8jgU5iMbOaO1PmpjTxEHB97vnh9xexYaPsL1wzKlj51fEfwLX26SS3z7kRrvT4tQp/2A11aLqNVLJENEJUrE=
-  - secure: BSCZkXsCLzPQmFrojsE9m5zdB7LUnUSVjtgDvvZjqjOac6HaKEr0uBxCIpizR/GPGZA4sNypuSD6jtsaHTU3TGKfNCTzz2QwIwvpVrmGNqXR3Tv/p+grNMEVCVA6P3jpMWY1P0zg7m+OTiyF6roAZXc6LftOzygox2lDPK85D3M=
-  - secure: UYgocA/3TXjgIaoZRmSCzA0Ed3xImJxuQUw6GV/HUeHWoQyCD5myBpQcdIkAaQsJnNWY6h587oL3yDvIVjycVb2/9uhUAQ5NHjz5oT4D4aNECpQvdcHivAtGPfH5jZV6Cj57Q5hLeedCG0oeWamiZcR6AlSkT/FMlP0lhAPJFNM=
-  - secure: GtgBxV/2hQ9kPXpTAY9Iq7gi8+DaGGgu7KuEtAUw0nLenl2CIY3GLU3cP0oAbvtKDcKlbmYhfTLgj7pDoDy4ZrfmCTBnKNoDqOAZjNfRLnrlEi3x2KL7VMgnWPqyemOHoAnGq3URXEr363GKNhBtrynehiXJNtVTxmOD0JS/Smg=
 cache:
   directories:
-  - $HOME/.gradle
+  - "$HOME/.gradle"
+env:
+  global:
+  - secure: eCJZsdb6dhCyD9qnxzabonrqSn02l+vtoYX/v3DED7AZi5SnbC7iloy7borBm3yz9xcd5ajxuke+Y9eLzLx79DfE9B8Z2/xL1Yx2xSIgFBD8FgFAq62Okdi71SYwP11yGIqLNf0FWmT5UCWZ94nN0QzX7pfagWc2LQ/r+EI+XVs=
+  - secure: WVfJ5Cix+pIY5BKek9YeaSRKRnUFZZ7WUTDcfQ+64N+BoU0QUMoFt+VDaeigXKauDybUQ47SkVV7HdnBIwIO6wM1dVbw8UHWIa/Y346pxnCOqNsyk2eE6pqgIa2RoQgq2Jx34WBYJVtQ8eMvRF0H33jGUZefov64B5ocZVtf/yY=
+  - secure: Kj/AIbAO0Iao1umA0hct3aoJR5244m8R9/c9mmVPrtO/gwWin2r82kjdwT62RbQHZqGTTXfBNLUFe//QwQgkUhyJUIvLkmA6tjcJnmpWJUhpZoJMgzTxMueTebDCtsri8haFf5AUD5eAge6EIYcB0hQc4g2QTH9Thqiqa17m77U=
+  - secure: eKgq3A10rhjFS0oP4KtOvtc9ZcyDkAA/0NABsaMpnHW8phO+/nax3wUgMVzWyz4vzaItB56NmyenpE+3NP5PIoLBmxsOq8Cbt8mZAieWWg6oJdW5w/AMaVbvEnAoewNhxj0CCiSloBDSS+J6y79EdT5uh1vjMHkAQARJO6tVdt0=

build.gradle

@@ -6,7 +6,7 @@ buildscript {
 }
 
 plugins {
-    id 'nebula.netflixoss' version '2.2.9'
+    id 'nebula.netflixoss' version '3.0.0'
 }
 
 ext.githubProjectName = rootProject.name

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
+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}" build snapshot 
+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
+    ;;
+  *)
+    ./gradlew -Prelease.travisci=true -Prelease.useLastTag=true -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" -PsonatypeUsername="${sonatypeUsername}" -PsonatypePassword="${sonatypePassword}" final
+    ;;
+  esac
+else
+  echo -e 'WARN: Should not be here => Branch ['$TRAVIS_BRANCH']  Tag ['$TRAVIS_TAG']  Pull Request ['$TRAVIS_PULL_REQUEST']'
+  ./gradlew build
+fi

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Aug 19 00:23:55 PDT 2015
+#Thu Sep 10 13:23:01 PDT 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.6-bin.zip

gradlew

@@ -42,11 +42,6 @@ case "`uname`" in
     ;;
 esac
 
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
 # Attempt to set APP_HOME
 # Resolve links: $0 may be a link
 PRG="$0"
@@ -114,6 +109,7 @@ fi
 if $cygwin ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
     ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`