deleted file mode 100644
--- a/modules/packages/manifests/java.pp
+++ /dev/null
@@ -1,36 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-class packages::java {
- anchor {
- 'packages::java::begin': ;
- 'packages::java::end': ;
- }
-
- case $::operatingsystem {
- Darwin: {
- # The dmg is available from https://www.java.com/en/download/manual.jsp
- Anchor['packages::java::begin'] ->
- packages::pkgdmg {
- "java":
- version => "7.0.600",
- os_version_specific => false,
- } -> Anchor['packages::java::end']
- }
- Ubuntu: {
- package {
- "openjdk-7-jre":
- ensure => latest;
-
- # Install icedtea-netx for the javaws command
- "icedtea-netx":
- ensure => latest,
- require => Package["openjdk-7-jre"];
- }
- }
- default: {
- fail("Cannot install on $::operatingsystem")
- }
- }
-}
--- a/modules/toplevel/manifests/slave/qa.pp
+++ b/modules/toplevel/manifests/slave/qa.pp
@@ -1,18 +1,16 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
# All QA slaves (both mozmill-ci and tps-ci) are subclasses of this class.
class toplevel::slave::qa inherits toplevel::slave {
include vnc
- include packages::java
-
class {
gui:
on_gpu => true,
screen_width => 1024,
screen_height => 768,
screen_depth => 32,
refresh => 60;
}