bigtop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ofle...@apache.org
Subject bigtop git commit: BIGTOP-2146: Upgrade bigtop toolchain ant version to 1.9.6
Date Mon, 16 Nov 2015 13:04:09 GMT
Repository: bigtop
Updated Branches:
  refs/heads/master 855c112e8 -> 1156139d9


BIGTOP-2146: Upgrade bigtop toolchain ant version to 1.9.6


Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/1156139d
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/1156139d
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/1156139d

Branch: refs/heads/master
Commit: 1156139d97b1f2d639a0c5a7575ceac9abb999e8
Parents: 855c112
Author: Olaf Flebbe <of@ofleb.be>
Authored: Mon Nov 16 13:57:37 2015 +0100
Committer: Olaf Flebbe <of@ofleb.be>
Committed: Mon Nov 16 13:57:37 2015 +0100

----------------------------------------------------------------------
 bigtop_toolchain/manifests/ant.pp  | 17 +++++++++++------
 bigtop_toolchain/manifests/deps.pp |  5 -----
 2 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/bigtop/blob/1156139d/bigtop_toolchain/manifests/ant.pp
----------------------------------------------------------------------
diff --git a/bigtop_toolchain/manifests/ant.pp b/bigtop_toolchain/manifests/ant.pp
index bf2d7f7..1ac754f 100644
--- a/bigtop_toolchain/manifests/ant.pp
+++ b/bigtop_toolchain/manifests/ant.pp
@@ -14,19 +14,24 @@
 # limitations under the License.
 
 class bigtop_toolchain::ant {
+  $ant =  'apache-ant-1.9.6'
 
   include bigtop_toolchain::deps
 
-  exec {'/bin/tar xvzf /usr/src/apache-ant-1.9.5-bin.tar.gz':
+  exec {"/usr/bin/wget http://archive.apache.org/dist/ant/binaries/$ant-bin.tar.gz":
+    cwd     => "/usr/src",
+    unless  => "/usr/bin/test -f /usr/src/$ant-bin.tar.gz",
+  }
+
+  exec {"/bin/tar xvzf /usr/src/$ant-bin.tar.gz":
     cwd         => '/usr/local',
-    refreshonly => true,
-    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"],
+    creates     => "/usr/local/$ant",
+    require     => Exec["/usr/bin/wget http://archive.apache.org/dist/ant/binaries/$ant-bin.tar.gz"],
   }
 
   file {'/usr/local/ant':
     ensure  => link,
-    target  => '/usr/local/apache-ant-1.9.5',
-    require => Exec['/bin/tar xvzf /usr/src/apache-ant-1.9.5-bin.tar.gz'],
+    target  => "/usr/local/$ant",
+    require => Exec["/bin/tar xvzf /usr/src/$ant-bin.tar.gz"],
   }
 }

http://git-wip-us.apache.org/repos/asf/bigtop/blob/1156139d/bigtop_toolchain/manifests/deps.pp
----------------------------------------------------------------------
diff --git a/bigtop_toolchain/manifests/deps.pp b/bigtop_toolchain/manifests/deps.pp
index 9ec2c20..d265708 100644
--- a/bigtop_toolchain/manifests/deps.pp
+++ b/bigtop_toolchain/manifests/deps.pp
@@ -18,11 +18,6 @@ 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.5-bin.tar.gz":
-    cwd     => "/usr/src",
-    require => Package[$packages::pkgs],
-    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.3.3/binaries/apache-maven-3.3.3-bin.tar.gz":
     cwd     => "/usr/src",


Mime
View raw message