Merge branch 'master' into feature/conditional-test-acceptance

wttech · Oct 19, 2018 · bdf70e9 · bdf70e9
2 parents 130b315 + 36b8e04
commit bdf70e9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/vagrant/Vagrantfile b/vagrant/Vagrantfile
@@ -74,17 +74,10 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.provision :chef_solo do |chef|
     chef.json = {
       "java" => {
-        "install_flavor" => "oracle",
+        "jdk_version" => "8",
+        "install_flavor" => "openjdk",
         "oracle" => {
           "accept_oracle_download_terms" => true
-        },
-        "jdk" => {
-          "8" => {
-            "x86_64" => {
-              "url" => "http://download.oracle.com/otn-pub/java/jdk/8u181-b13/96a7b8442fe848ef90c96a2fad6ed6d1/jdk-8u181-linux-x64.tar.gz",
-              "checksum" => "1845567095bfbfebd42ed0d09397939796d05456290fb20a83c476ba09f991d3"
-            }
-          }
         }
       },
       "aet" => {

diff --git a/vagrant/metadata.rb b/vagrant/metadata.rb
@@ -24,4 +24,4 @@
 long_description 'Installs/Configures aet-vagrant'
 version          '2.1.6'
 
-depends 'aet', '~> 5.0.0'
+depends 'aet', '~> 5.1.0'