Merge pull request #64 from adriaanm/master

fixup #63

Author: adriaanm

templates/default/jobs/scala/validate/publish-core.xml.erb

@@ -12,7 +12,7 @@
     {:name => "_scabot_pr", :desc => "For internal use by Scabot."}
   ],
   jvmVersion: @branch == "2.11.x" ? 6 : 8,
-  jvmFlavor:  "oracle",
+  jvmFlavor:  @branch == "2.11.x" ? "oracle" : "openjdk",
   buildNameScript: setValidateBuildNameScript)
 %>
   <publishers>

templates/default/jobs/scala/validate/test.xml.erb

@@ -13,7 +13,7 @@
     {:name => "_scabot_pr", :desc => "For internal use by Scabot."}
   ],
   jvmVersion: @branch == "2.11.x" ? 6 : 8,
-  jvmFlavor:  "oracle",
+  jvmFlavor:  @branch == "2.11.x" ? "oracle" : "openjdk",
   buildNameScript: setValidateBuildNameScript)
 %>
   <publishers>