5 files changed, 22 insertions, 30 deletions
diff --git a/packages/grails/grails.gradle b/packages/grails/grails.gradle
index 1998b61..f046605 100644
--- a/packages/grails/grails.gradle
+++ b/packages/grails/grails.gradle
@@ -1,28 +1,13 @@
-buildscript {
-  repositories {
-    mavenLocal()
-    mavenCentral()
-  }
-  dependencies {
-    classpath 'org.xapek.yvesf:gradle-download-task:0.1-SNAPSHOT'
-  }
-}
-
-task download(type: org.xapek.yvesf.gradle.DownloadTask) {}
-
 task unzip(type: Copy) {
+    from zipTree(downloadTask.dest)
     into file("${buildDir}/unpacked/dist")
     eachFile { FileCopyDetails fcd ->
         fcd.path = fcd.path.substring(path.indexOf('/')+1)
     }
 }
-unzip.dependsOn(download)
+unzip.dependsOn(downloadTask)
 
 ospackage {
     into "/opt/${project.name}"
     from unzip.outputs.files
 }
-
-project.afterEvaluate {
-    unzip.from zipTree(download.destFile)
-}
diff --git a/packages/grails/grails2.2.1/build.gradle b/packages/grails/grails2.2.1/build.gradle
index cee5d9d..bf16499 100644
--- a/packages/grails/grails2.2.1/build.gradle
+++ b/packages/grails/grails2.2.1/build.gradle
@@ -1,6 +1,8 @@
 version '2.2.1'
 
+ext.downloadTask = makeDownloadTask(
+  url: "http://dist.springframework.org.s3.amazonaws.com/release/GRAILS/grails-${project.version}.zip",
+  sha256: '4ec22ff45718a0f4948261f15f7c46e67ab0c2294d83d6c3eddb110d00f9af1d')
+
 apply from: '../grails.gradle'
 
-download.source "http://dist.springframework.org.s3.amazonaws.com/release/GRAILS/grails-${project.version}.zip"
-download.sha256sum '4ec22ff45718a0f4948261f15f7c46e67ab0c2294d83d6c3eddb110d00f9af1d'
diff --git a/packages/grails/grails2.3.11/build.gradle b/packages/grails/grails2.3.11/build.gradle
index 6e16c4f..cee4a03 100644
--- a/packages/grails/grails2.3.11/build.gradle
+++ b/packages/grails/grails2.3.11/build.gradle
@@ -1,6 +1,7 @@
 version '2.3.11'
 
-apply from: '../grails.gradle'
+ext.downloadTask = makeDownloadTask(
+  url: "http://dist.springframework.org.s3.amazonaws.com/release/GRAILS/grails-${project.version}.zip",
+  sha256: 'c53e01a9d98c499f91d7c7d54312dbdfd33f99ffcdec8bc4946036e4bea2c8e1')
 
-download.source "http://dist.springframework.org.s3.amazonaws.com/release/GRAILS/grails-${project.version}.zip"
-download.sha256sum 'c53e01a9d98c499f91d7c7d54312dbdfd33f99ffcdec8bc4946036e4bea2c8e1'
+apply from: '../grails.gradle'
diff --git a/packages/grails/grails3.0.x/build.gradle b/packages/grails/grails3.0.x/build.gradle
index b4f810e..7b26a5a 100644
--- a/packages/grails/grails3.0.x/build.gradle
+++ b/packages/grails/grails3.0.x/build.gradle
@@ -1,6 +1,8 @@
-version '3.0.12'
+version '3.0.17'
 
-apply from: '../grails.gradle'
+ext.downloadTask = makeDownloadTask(
+  url: "https://github.com/grails/grails-core/releases/download/v${project.version}/grails-${project.version}.zip",
+  sha256: '8b5ace2b9fdc357a7641119bccf8740b3d49a2cbdeab9109b99a3ad69bd4c4f3')
+downloadTask.acceptAnyCertificate true
 
-download.source "https://github.com/grails/grails-core/releases/download/v${project.version}/grails-${project.version}.zip"
-download.sha256sum 'd3b0cf0966a42e3e76ecac593e81c96655b222fa2cc5b5940d1842c8a4753c11'
+apply from: '../grails.gradle'
diff --git a/packages/grails/grails3.1.x/build.gradle b/packages/grails/grails3.1.x/build.gradle
index 22c9a96..6bada1f 100644
--- a/packages/grails/grails3.1.x/build.gradle
+++ b/packages/grails/grails3.1.x/build.gradle
@@ -1,6 +1,8 @@
-version '3.1.0'
+version '3.1.10'
 
-apply from: '../grails.gradle'
+ext.downloadTask = makeDownloadTask(
+  url: "https://github.com/grails/grails-core/releases/download/v${project.version}/grails-${project.version}.zip",
+  sha256: '4a09d4a3c051a2f11974b1f8b4c7c69339820875b4f4a9e6652682d3144f59c2')
+downloadTask.acceptAnyCertificate true
 
-download.source "https://github.com/grails/grails-core/releases/download/v${project.version}/grails-${project.version}.zip"
-download.sha256sum '35bd209d5f85ec6d4c5b152eb9a33142e2ac6cb67496b0853b472214140a9c53'
+apply from: '../grails.gradle'