Merge branch 'master' of github.com:Evolveum/midpoint

Evolveum · May 3, 2016 · 16ce8ff · 16ce8ff
2 parents 6ec41e3 + 44eac6c
commit 16ce8ff
Show file tree

Hide file tree

Showing 13 changed files with 1,028 additions and 967 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -11,13 +11,13 @@ script: travis_wait 120 mvn clean install
 
 addons:
   hostname: localhost # workaround for short hostname
-  apt:
-    packages:
-      - oracle-java8-installer # install newest JDK8
+  #apt:
+   # packages:
+    #  - oracle-java8-installer # install newest JDK8
       #- openjdk-8-jdk
 
 jdk:
   - openjdk7
   - oraclejdk7
   #- openjdk8
-  - oraclejdk8
+  #- oraclejdk8