aboutsummaryrefslogtreecommitdiff
path: root/bigtop_toolchain
diff options
context:
space:
mode:
authorEvans Ye <evansye@apache.org>2015-06-14 04:14:22 +0000
committerOlaf Flebbe <of@oflebbe.de>2015-06-14 18:27:12 +0200
commit9dd475820a9fac0796c9fc2eb499a206b32e47bb (patch)
treec3fd399923f25ddd8c60e1ee6fe931c78daf8e80 /bigtop_toolchain
parent73d4e98d29f9591b7cd3bebf1c9d07e7c06f5af5 (diff)
downloadbigtop-odpi-9dd475820a9fac0796c9fc2eb499a206b32e47bb.tar.gz
BIGTOP-1896. bigtop_toolchain broken bei ant update
Signed-off-by: Olaf Flebbe <of@oflebbe.de>
Diffstat (limited to 'bigtop_toolchain')
-rw-r--r--bigtop_toolchain/manifests/ant.pp10
-rw-r--r--bigtop_toolchain/manifests/deps.pp4
2 files changed, 7 insertions, 7 deletions
diff --git a/bigtop_toolchain/manifests/ant.pp b/bigtop_toolchain/manifests/ant.pp
index fab07907..bf2d7f7d 100644
--- a/bigtop_toolchain/manifests/ant.pp
+++ b/bigtop_toolchain/manifests/ant.pp
@@ -17,16 +17,16 @@ class bigtop_toolchain::ant {
include bigtop_toolchain::deps
- exec {'/bin/tar xvzf /usr/src/apache-ant-1.9.4-bin.tar.gz':
+ exec {'/bin/tar xvzf /usr/src/apache-ant-1.9.5-bin.tar.gz':
cwd => '/usr/local',
refreshonly => true,
- subscribe => Exec["/usr/bin/wget $bigtop_toolchain::deps::apache_prefix/ant/binaries/apache-ant-1.9.4-bin.tar.gz"],
- require => Exec["/usr/bin/wget $bigtop_toolchain::deps::apache_prefix/ant/binaries/apache-ant-1.9.4-bin.tar.gz"],
+ subscribe => Exec["/usr/bin/wget $bigtop_toolchain::deps::apache_prefix/ant/binaries/apache-ant-1.9.5-bin.tar.gz"],
+ require => Exec["/usr/bin/wget $bigtop_toolchain::deps::apache_prefix/ant/binaries/apache-ant-1.9.5-bin.tar.gz"],
}
file {'/usr/local/ant':
ensure => link,
- target => '/usr/local/apache-ant-1.9.4',
- require => Exec['/bin/tar xvzf /usr/src/apache-ant-1.9.4-bin.tar.gz'],
+ target => '/usr/local/apache-ant-1.9.5',
+ require => Exec['/bin/tar xvzf /usr/src/apache-ant-1.9.5-bin.tar.gz'],
}
}
diff --git a/bigtop_toolchain/manifests/deps.pp b/bigtop_toolchain/manifests/deps.pp
index 2c20a459..13ac5705 100644
--- a/bigtop_toolchain/manifests/deps.pp
+++ b/bigtop_toolchain/manifests/deps.pp
@@ -18,10 +18,10 @@ class bigtop_toolchain::deps {
$apache_prefix = nearest_apache_mirror()
include bigtop_toolchain::packages
- exec {"/usr/bin/wget $apache_prefix/ant/binaries/apache-ant-1.9.4-bin.tar.gz":
+ exec {"/usr/bin/wget $apache_prefix/ant/binaries/apache-ant-1.9.5-bin.tar.gz":
cwd => "/usr/src",
require => Package[$packages::pkgs],
- unless => "/usr/bin/test -f /usr/src/apache-ant-1.9.4-bin.tar.gz",
+ unless => "/usr/bin/test -f /usr/src/apache-ant-1.9.5-bin.tar.gz",
}
exec {"/usr/bin/wget $apache_prefix/maven/maven-3/3.0.5/binaries/apache-maven-3.0.5-bin.tar.gz":