Skip to content

Commit 6c2c704

Browse files
Restore openjdk6 testing
1 parent 4f867b9 commit 6c2c704

File tree

3 files changed

+13
-3
lines changed

3 files changed

+13
-3
lines changed

.gitignore

+4
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,7 @@ logs
3131

3232
# snapshots
3333
sonatype.sbt
34+
35+
# Vagrant
36+
/.vagrant/
37+

.travis.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
language: scala
22
jdk:
33
- oraclejdk8
4+
- openjdk6
5+
46
scala:
57
- 2.10.4
68
- 2.11.4
@@ -9,7 +11,7 @@ sbt_args: "'set resolvers += \"Sonatype OSS Snapshots\" at \"https://oss.sonatyp
911
before_script:
1012
- jdk_switcher use openjdk6
1113
- export JAVA6_HOME=$JAVA_HOME
12-
- jdk_switcher use oraclejdk8
14+
- jdk_switcher use $TRAVIS_JDK_VERSION
1315

1416
after_success:
1517
- >

Vagrantfile

+6-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
55
VAGRANTFILE_API_VERSION = "2"
66

7-
Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
8-
config.vm.box = "ubuntu/trusty64"
7+
Vagrant.require_version ">= 1.7.0"
98

9+
Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
1010
if Vagrant.has_plugin?("vagrant-cachier")
1111
config.cache.scope = :box
1212
end
@@ -15,6 +15,10 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
1515
config.omnibus.chef_version = :latest
1616
end
1717

18+
config.vm.box = "ubuntu/trusty64"
19+
20+
config.vm.network "forwarded_port", guest: 5005, host: 5005
21+
1822
config.vm.provider :virtualbox do |v|
1923
v.memory = 2048
2024
v.cpus = 2

0 commit comments

Comments
 (0)