Stabilizing Travis and Maven builds (yahoo#454)

* Tweaking the memory
*Switching to openJdk
*Fixing whitelist branch bug
* Cleaned up duplicated dependency warning.

.travis.yml

@@ -3,12 +3,7 @@ dist: trusty
 language: java
 
 jdk:
-- oraclejdk8
-
-addons:
-  apt:
-    packages:
-    - oracle-java8-installer
+- openjdk8
 
 cache:
   directories:

CHANGELOG.md

@@ -52,6 +52,8 @@ Current
 
 ### Fixed:
 
+- [Fix deploy branch issue where substrings of whitelisted branches could be released](https://github.com/yahoo/fili/issues/453)
+
 - [Fix availability testing utils to be compatible with composite tables](https://github.com/yahoo/fili/pull/419)
     * Fix availability testing utils `populatePhysicalTableCacheIntervals` to assign a `TestAvailability` that will serialize correctly instead of always `StrictAvailability`
     * Fix internal representation of `VolatileIntervalsFunction` in `DefaultingVolatileIntervalsService` from `Map<PhysicalTable, VolatileIntervalsFunction>` to `Map<String, VolatileIntervalsFunction>`

fili-security/pom.xml

@@ -46,9 +46,5 @@
             <groupId>com.yahoo.fili</groupId>
             <artifactId>fili-core</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.yahoo.fili</groupId>
-            <artifactId>fili-core</artifactId>
-        </dependency>
     </dependencies>
 </project>

pom.xml

@@ -634,6 +634,9 @@
                     <artifactId>maven-surefire-plugin</artifactId>
                     <version>2.16</version>
                     <configuration>
+                        <forkCount>1</forkCount>
+                        <reuseForks>true</reuseForks>
+                        <argLine>-Xmx3G</argLine>
                         <redirectTestOutputToFile>true</redirectTestOutputToFile>
                         <includes>
                             <include>%regex[.*Spec.*]</include>

travis/deploy.bash

@@ -48,8 +48,8 @@ if [[ ${MAVEN_RETURN_CODE} -ne 0 ]]; then
 fi
 
 # Only publish whitelisted branches
-WHITELISTED=$(echo ${PUBLISH_WHITELIST} | grep ${TRAVIS_BRANCH})
-if [[ "${WHITELISTED}" == "" ]]; then
+WHITELISTED=$(for a in ${PUBLISH_WHITELIST}; do if [ ${TRAVIS_BRANCH} = ${a} ]; then echo true; fi; done;)
+if [[ "${WHITELISTED}" != "true" ]]; then
     echo "INFO Do not flag for publication, this is not a whitelisted branch: ${TRAVIS_BRANCH}"
     exit 0
 fi