restored travis changes

Author: andy1138

.travis.yml

@@ -2,7 +2,7 @@ language: scala
 
 env:
   global:
-    - PUBLISH_JDK=openjdk6 # admin/build.sh only publishes when running on this jdk
+    - PUBLISH_JDK=openjdk7 # admin/build.sh only publishes when running on this jdk
 # Don't commit sensitive files, instead commit a version encrypted with $SECRET,
 # this environment variable is encrypted with this repo's private key and stored below:
 # (See http://docs.travis-ci.com/user/environment-variables/#Secure-Variables.)
@@ -11,12 +11,15 @@ env:
 script:
   - sbt ++$TRAVIS_SCALA_VERSION clean update compile test
 scala:
-  - 2.11.0
+  - 2.11.1
 jdk:
-  - openjdk6
+  - openjdk7
+  - oraclejdk7
+  
 notifications:
   email:
     - [email protected]
+    - [email protected]
 
 # if we get weird timeouts, see https://github.com/spray/spray/pull/233
 # 'set concurrentRestrictions in Global += Tags.limit(Tags.Test, 1)'