aboutsummaryrefslogtreecommitdiff
path: root/bigtop_toolchain
diff options
context:
space:
mode:
authorOlaf Flebbe <of@oflebbe.de>2015-05-09 20:43:37 +0200
committerOlaf Flebbe <of@oflebbe.de>2015-05-09 20:43:37 +0200
commit52077c6250925b8f470f0027ea79b077190e8e16 (patch)
tree5d96536242fb4b0af3db66f5c6c6c832356fd6c7 /bigtop_toolchain
parentc2d39603b8148116e68e3d6a3036857fd5480cd4 (diff)
parent1540c4e28c5df593ec6101135eb288a76165ea04 (diff)
downloadbigtop-odpi-52077c6250925b8f470f0027ea79b077190e8e16.tar.gz
Merge branch 'master' of ssh://diskstation/volume1/git/bigtop
Diffstat (limited to 'bigtop_toolchain')
-rw-r--r--bigtop_toolchain/manifests/deps.pp4
-rw-r--r--bigtop_toolchain/manifests/gradle.pp10
2 files changed, 7 insertions, 7 deletions
diff --git a/bigtop_toolchain/manifests/deps.pp b/bigtop_toolchain/manifests/deps.pp
index 585cdfd1..2c20a459 100644
--- a/bigtop_toolchain/manifests/deps.pp
+++ b/bigtop_toolchain/manifests/deps.pp
@@ -30,9 +30,9 @@ class bigtop_toolchain::deps {
unless => "/usr/bin/test -f /usr/src/apache-maven-3.0.5-bin.tar.gz",
}
- exec {"/usr/bin/wget http://services.gradle.org/distributions/gradle-2.0-bin.zip":
+ exec {"/usr/bin/wget http://services.gradle.org/distributions/gradle-2.4-bin.zip":
cwd => "/usr/src",
require => Package[$packages::pkgs],
- unless => "/usr/bin/test -f /usr/src/gradle-2.0-bin.zip",
+ unless => "/usr/bin/test -f /usr/src/gradle-2.4-bin.zip",
}
}
diff --git a/bigtop_toolchain/manifests/gradle.pp b/bigtop_toolchain/manifests/gradle.pp
index 16021f80..2c0081f3 100644
--- a/bigtop_toolchain/manifests/gradle.pp
+++ b/bigtop_toolchain/manifests/gradle.pp
@@ -17,16 +17,16 @@ class bigtop_toolchain::gradle {
include bigtop_toolchain::deps
- exec {'/usr/bin/unzip -x -o /usr/src/gradle-2.0-bin.zip':
+ exec {'/usr/bin/unzip -x -o /usr/src/gradle-2.4-bin.zip':
cwd => '/usr/local',
refreshonly => true,
- subscribe => Exec["/usr/bin/wget http://services.gradle.org/distributions/gradle-2.0-bin.zip"],
- require => Exec["/usr/bin/wget http://services.gradle.org/distributions/gradle-2.0-bin.zip"],
+ subscribe => Exec["/usr/bin/wget http://services.gradle.org/distributions/gradle-2.4-bin.zip"],
+ require => Exec["/usr/bin/wget http://services.gradle.org/distributions/gradle-2.4-bin.zip"],
}
file {'/usr/local/gradle':
ensure => link,
- target => '/usr/local/gradle-2.0',
- require => Exec['/usr/bin/unzip -x -o /usr/src/gradle-2.0-bin.zip'],
+ target => '/usr/local/gradle-2.4',
+ require => Exec['/usr/bin/unzip -x -o /usr/src/gradle-2.4-bin.zip'],
}
}