From a94590adccae8302ae01886c1fcb935a5db31614 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Wed, 17 Jul 2013 13:49:36 -0700
Subject: [PATCH] Install maven after Java is installed.

* modules/jenkins/manifests/slave.pp: Ensure that maven is installed
after we install Java so that we can control the version of Java that is
installed. Without this maven will pull in whichever version of Java it
has in its dependency list.

Change-Id: I36b27ea654c31c71aaca2d4a8f93e0557c7b4930
---
 modules/jenkins/manifests/slave.pp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/jenkins/manifests/slave.pp b/modules/jenkins/manifests/slave.pp
index 35911b61e6..79418ca947 100644
--- a/modules/jenkins/manifests/slave.pp
+++ b/modules/jenkins/manifests/slave.pp
@@ -88,7 +88,8 @@ class jenkins::slave(
       }
 
       package { $::jenkins::params::maven_package:
-        ensure => present,
+        ensure  => present,
+        require => Package[$::jenkins::params::jdk_package],
       }
 
       if ! defined(Package[$::jenkins::params::python3_dev_package]) {