Repository: bigtop Updated Branches: refs/heads/branch-1.0 beae76e91 -> 885cd8f22
BIGTOP-1896. bigtop_toolchain broken bei ant update Signed-off-by: Olaf Flebbe <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/885cd8f2 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/885cd8f2 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/885cd8f2 Branch: refs/heads/branch-1.0 Commit: 885cd8f22337465af07096f8eb3f89bec5d856ba Parents: beae76e Author: Evans Ye <[email protected]> Authored: Sun Jun 14 04:14:22 2015 +0000 Committer: Olaf Flebbe <[email protected]> Committed: Sun Jun 14 18:34:29 2015 +0200 ---------------------------------------------------------------------- bigtop_toolchain/manifests/ant.pp | 10 +++++----- bigtop_toolchain/manifests/deps.pp | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/885cd8f2/bigtop_toolchain/manifests/ant.pp ---------------------------------------------------------------------- diff --git a/bigtop_toolchain/manifests/ant.pp b/bigtop_toolchain/manifests/ant.pp index fab0790..bf2d7f7 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'], } } http://git-wip-us.apache.org/repos/asf/bigtop/blob/885cd8f2/bigtop_toolchain/manifests/deps.pp ---------------------------------------------------------------------- diff --git a/bigtop_toolchain/manifests/deps.pp b/bigtop_toolchain/manifests/deps.pp index 2c20a45..13ac570 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":
