Update travis config:

* Use oracle jdk8
* Revised travis test config
* Update travis keys
* Remove old keys

.gitignore

@@ -8,3 +8,4 @@
 target
 .DS_Store
 *.versionsBackup
+*.jkutner.profile

.travis.profile

@@ -1,8 +1,11 @@
 #!/bin/sh
 
 if test $TRAVIS_PULL_REQUEST == "false"; then
-    export HEROKU_TEST_USERS=$(openssl des3 -d -salt -in .heroku.test.users.des3 -k $HEROKU_TEST_USERS_DES_KEY)
+    user1="$CI_TEST_USER1_NAME"
+    token1="$CI_TEST_USER1_TOKEN"
 
-    openssl des3 -d -salt -in .gpg-private-key.asc.des -out gpg-private-key.asc -k $GPG_PRIVATE_KEY_DES_KEY
-    gpg --import gpg-private-key.asc > /dev/null
+    user2="$CI_TEST_USER2_NAME"
+    token2="$CI_TEST_USER2_TOKEN"
+
+    export HEROKU_TEST_USERS=\[\{\"username\":\"${user1}\",\"apikey\":\"${token1}\",\"defaultuser\":\"true\"\},\{\"username\":\"${user2}\",\"apikey\":\"${token2}\",\"defaultuser\":\"false\"\}\]
 fi

.travis.yml

@@ -1,6 +1,6 @@
 language: java
 jdk:
-- openjdk6
+- oraclejdk8
 env:
   global:
   - secure: 4F3gN34XI1iFEkqPY2+bVNUqaw4M2DoeJncOsxQ1YxwCDqs/ploKXcuf9RJ8irjayHw/BUOJQSgGyj0JadxLfgI55rQqSSL5R9OdVChJHNb4I0hUjbDNpb0Fn5m33LYOYKL9OfoGGGojgo8QKYcWTylGRyehPjZFE/f309SQWSg=
@@ -9,5 +9,13 @@ env:
   - secure: 3Ou7HQm/yJ3hq1lahArMymNHbsnEuE6GKDLU9DKfOqLSXqumOzbQXlDIV3QNUkINH95ii+bbEI0IeY8sroA8OOdNsSXvWPkPsvuO7eUAObh4Drnt3UJi7v0Ti41c+fy9WTXBymB4eLgQ0zEExLvFSGcHnr5qRfqUVaWtKelXzX8=
   - secure: J2tZhDo9yb/nJm01d21Gy7BmoTw06e4nXskhdBMj/P5xLkGLVHUibXko4/gNbSxqYjPl+ZPq+tyxcJF5ioU6EwWRLvPkMF+UULW6X+CBLBc8fwJVqxnFbOInBicBFzSeHooUqNv8J0PhRO6FSStHo3Lo/M55Y1u6lbU5u8VPGo4=
   - secure: 34Gg8t9TwVVeL5k2vsVcLqbTlYWCb4dkNLLSS2FAafEzJmi9s25ptXfmxIBfxzZ/r84Y36Yrt6MvIjpV7CLF7tJrkH8Fm5JkA5wF+jdQMgiMAe9/LinlvFCcF4MqORD6o/KkaO/hUi4QRJfEjcbJUTxu/wa2aS5DN/7aniylKcc=
-before_script: . ./.travis.profile
+  # CI_TEST_USER1_NAME
+  - secure: "TYqxJs1LBZRjpFI5MPn+ev7BpZ8jEcqAXU7euTdhTEa+ypvc0B80UDbo2d93jo7RhYdMG3AMQMm18xeSEADAXblIddsObGkQTjn8dpEYfPNC0N7pyM8ZAc5F8R6yFUFhV4CKb0KkafOa5AYzQ4tdzp+3P1RcyMoHtYheab6AAqQ="
+  # CI_TEST_USER1_TOKEN
+  - secure: "vsBI5Hb+p0ie07sQ4r3EULq873BpsDOm2A8pNXGvnlSeZguEOxmislgnxmSLUhPnE0Xl/mjrb6jL+eAwaRWaf0a67nyafK8sPmQJmgpx4ZRr4qLXZKi78aXDxSL9e8bqdhT8J1HmzvfabGg7RBGPdHZc0V06Th6psXg7GE1ougY="
+  # CI_TEST_USER2_NAME
+  - secure: "Qq51xiRhc6yB/ghffCK2xhy3lpDI3NV2MgYd5MZ1haBQDdAFNvYjFr4Eix+iusDfmTrfK2sIVx4nRCzOt3N9APeh5/W2OgPEeYpPSs5Y5Qw4S+vSu03fp2SsftI/KBotNeMNXwB5nqXnFKbOXwHRa/p79lb9bX4qEq4xIJA/mfY="
+  # CI_TEST_USER2_TOKEN
+  - secure: "Cppme1KWX4Yty1X824bvVLRJgHcQCSxzu+NdvnnryfkgNXFTDMS9RLkF2aAZEY/+MM5ra649bZE4q/7SzNC2DahiC6fobxmvFzGo0t51BCOjxofLyTh9kHSye9irF15KTDpjV7R4cLmaTtfAAMuCJMKXrcPSsmc+H6TmC9bC7oc="
+before_script: ". ./.travis.profile"
 after_success: test $TRAVIS_PULL_REQUEST == "false" && test $TRAVIS_BRANCH == "master" && mvn deploy --settings=.travis.settings.xml -P prepare-for-central -DskipTests

heroku-api-integration-tests/pom.xml

@@ -136,7 +136,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.10</version>
+                <version>2.19.1</version>
                 <configuration>
                     <skipTests>${heroku-api-integration-tests.skipTests}</skipTests>
                     <failIfNoTests>true</failIfNoTests>
@@ -148,6 +148,12 @@
                         <suiteXmlFile>src/test/resources/testng-httpclient-gson.xml</suiteXmlFile>
                         <suiteXmlFile>src/test/resources/testng-jersey-client.xml</suiteXmlFile>
                     </suiteXmlFiles>
+                    <properties>
+                        <property>
+                            <name>surefire.testng.verbose</name>
+                            <value>2</value>
+                        </property>
+                    </properties>
                 </configuration>
             </plugin>
             <plugin>

pom.xml

@@ -87,7 +87,7 @@
 
     <properties>
         <heroku.jar.version>${project.version}</heroku.jar.version>
-        <testng.version>6.0</testng.version>
+        <testng.version>6.8.21</testng.version>
         <guice.version>4.1.0</guice.version>
         <apache.commons-httpclient.version>4.4</apache.commons-httpclient.version>
         <finagle.version>6.39.0</finagle.version>