From b7b696399bece63b2d363d4912d3f079b2a17045 Mon Sep 17 00:00:00 2001 From: Artem Ivantsov Date: Sun, 10 Jan 2016 15:02:09 +0200 Subject: [PATCH] fix maven download url;move maven version to attr --- attributes/default.rb | 1 + metadata.rb | 4 ++-- recipes/default.rb | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/attributes/default.rb b/attributes/default.rb index 86b0b63..ad5d0ad 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -2,4 +2,5 @@ default['cookbook-qubell-build']['dest_path'] = "/tmp" default['cookbook-qubell-build']['dest_name'] = "ROOT" default['cookbook-qubell-build']['target'] = "/tmp/mvn" +default['cookbook-qubell-build']['maven_version'] = "3.2.1" default['cookbook-qubell-build']['artifacts'] = [] diff --git a/metadata.rb b/metadata.rb index 4b10a70..2e2dcf6 100644 --- a/metadata.rb +++ b/metadata.rb @@ -1,7 +1,7 @@ name "cookbook-qubell-build" version "0.3.0" -depends "git", "2.7.1" +depends "git", "2.7.0" depends "java", "1.11.7" depends "yum", "2.3.1" -depends "apt", "2.3.9" +depends "apt", "2.7.0" diff --git a/recipes/default.rb b/recipes/default.rb index 3dda5e6..c9df657 100644 --- a/recipes/default.rb +++ b/recipes/default.rb @@ -26,9 +26,9 @@ to "/usr/bin/mvn3" end when "rhel" - mvn_version = "3.2.1" + mvn_version = node['cookbook-qubell-build']['maven_version'] remote_file "/opt/apache-maven.tar.gz" do - source "http://mirror.olnevhost.net/pub/apache/maven/binaries/apache-maven-#{mvn_version}-bin.tar.gz" + source "http://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/#{mvn_version}/apache-maven-#{mvn_version}-bin.tar.gz" end bash "unpack apache-maven" do