19 files changed, 178 insertions, 228 deletions
diff --git a/packages/gradle-bin/build.gradle b/packages/gradle-bin/build.gradle
index aca89db..3721987 100644
--- a/packages/gradle-bin/build.gradle
+++ b/packages/gradle-bin/build.gradle
@@ -1,22 +1,19 @@
-import org.xapek.yvesf.gradle.DownloadTask
+version '3.1'
 
-version '2.10'
-
-task download(type: DownloadTask) {
-    source "https://services.gradle.org/distributions/gradle-${project.version}-all.zip"
-    sha256sum '496d60c331f8666f99b66d08ff67a880697a7e85a9d9b76ff08814cf97f61a4c'
-}
+final download = makeDownloadTask(
+    url: "https://services.gradle.org/distributions/gradle-${project.version}-all.zip",
+    sha256: '43be380834a13e28e9504c21f67fe1a8895ab54f314a6596601896dca7213482')
 
 task unpack(type: Copy) {
-    from zipTree(download.destFile)
-    into file("${buildDir}/unpacked/dist")
-    eachFile { FileCopyDetails fcd ->
-        fcd.path = fcd.path.substring(path.indexOf('/')+1)
-    }
+  from zipTree(download.dest)
+  into file("${buildDir}/unpacked/dist")
+  eachFile { FileCopyDetails fcd ->
+    fcd.path = fcd.path.substring(path.indexOf('/') + 1)
+  }
 }
 unpack.dependsOn(download)
 
 ospackage {
-    into "/opt/${project.name}"
-    from unpack.outputs.files
+  into "/opt/${project.name}"
+  from unpack.outputs.files
 }
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'
diff --git a/packages/groovy-bin/build.gradle b/packages/groovy-bin/build.gradle
deleted file mode 100644
index 35ef994..0000000
--- a/packages/groovy-bin/build.gradle
+++ /dev/null
@@ -1,28 +0,0 @@
-import org.xapek.yvesf.gradle.DownloadTask
-
-subprojects {
-    task download(type: DownloadTask) {}
-
-    task unzip(type: Copy) {
-        into file("${buildDir}/unpacked/dist")
-        eachFile { FileCopyDetails fcd ->
-            fcd.path = fcd.path.substring(path.indexOf('/')+1)
-        }
-    }
-    unzip.dependsOn(download)
-
-    ospackage {
-        into "/opt/${project.name}"
-        from unzip.outputs.files
-    }
-
-    project.afterEvaluate {
-        download.source "http://dl.bintray.com/groovy/maven/apache-groovy-binary-${project.version}.zip"
-        unzip.from zipTree(download.destFile)
-    }
-
-    activator.bin['groovysh'] = "/opt/${project.name}/bin/groovysh"
-    activator.bin['groovy'] = "/opt/${project.name}/bin/groovy"
-    activator.bin['groovyConsole'] = "/opt/${project.name}/bin/groovyConsole"
-    activator.env['GROOVY_HOME'] = "/opt/${project.name}"
-}
diff --git a/packages/groovy-bin/groovy-bin-2.4.5/build.gradle b/packages/groovy-bin/groovy-bin-2.4.5/build.gradle
index 866f8b0..6ce2338 100644
--- a/packages/groovy-bin/groovy-bin-2.4.5/build.gradle
+++ b/packages/groovy-bin/groovy-bin-2.4.5/build.gradle
@@ -1,2 +1,3 @@
 version '2.4.5'
-download.sha256sum '87e8e9af1f718b84c9bca5a8c42425aadb9e97d8e4ad64e0c91f7c1454cd4caa'
+ext.sha256sum = '87e8e9af1f718b84c9bca5a8c42425aadb9e97d8e4ad64e0c91f7c1454cd4caa'
+apply from: '../groovy.gradle'
diff --git a/packages/groovy-bin/groovy.gradle b/packages/groovy-bin/groovy.gradle
new file mode 100644
index 0000000..6a42d6d
--- /dev/null
+++ b/packages/groovy-bin/groovy.gradle
@@ -0,0 +1,22 @@
+final download = makeDownloadTask(
+    url: "http://dl.bintray.com/groovy/maven/apache-groovy-binary-${project.version}.zip",
+    sha256: sha256sum)
+
+task unzip(type: Copy) {
+  from zipTree(download.dest)
+  into file("${buildDir}/unpacked/dist")
+  eachFile { FileCopyDetails fcd ->
+    fcd.path = fcd.path.substring(path.indexOf('/') + 1)
+  }
+}
+unzip.dependsOn(download)
+
+ospackage {
+  into "/opt/${project.name}"
+  from unzip.outputs.files
+}
+
+activator.bin['groovysh'] = "/opt/${project.name}/bin/groovysh"
+activator.bin['groovy'] = "/opt/${project.name}/bin/groovy"
+activator.bin['groovyConsole'] = "/opt/${project.name}/bin/groovyConsole"
+activator.env['GROOVY_HOME'] = "/opt/${project.name}"
+\ No newline at end of file
diff --git a/packages/gwt-chromium/build.gradle b/packages/gwt-chromium/build.gradle
index b85eb77..63f16f9 100644
--- a/packages/gwt-chromium/build.gradle
+++ b/packages/gwt-chromium/build.gradle
@@ -1,101 +1,99 @@
-import org.xapek.yvesf.gradle.DownloadTask
-
 //chrome nightly build, one of the last with npapi
 final revision = '242519'
 version "34-r${revision}-1"
 
-task downloadChrome(type: DownloadTask) {
-    source "http://gsdview.appspot.com/chromium-browser-continuous/Linux_x64/${revision}/chrome-linux.zip"
-    sha256sum '7269d35b51fb16ebd11af92cdaba933fb73f8984949952888e30fab63dc78df8'
-}
+final downloadChrome = makeDownloadTask(
+    url: "http://gsdview.appspot.com/chromium-browser-continuous/Linux_x64/${revision}/chrome-linux.zip",
+    sha256: '7269d35b51fb16ebd11af92cdaba933fb73f8984949952888e30fab63dc78df8')
 
 task unpackChrome(type: Copy) {
-    from zipTree(downloadChrome.destFile)
-    into file("${buildDir}/chromeLinuxUnpacked")
-    eachFile { FileCopyDetails fcd ->
-        // makes out of 06__ (_=don't care) 0655
-        // means    rwx______ => rwxr-xr-x
-        // or also  r-x______ => r-xr-xr-x
-        def mode = fcd.mode >> 6
-        fcd.mode = (mode << 6) | ((mode & 5) << 3)  | mode & 5
-    }
+  from zipTree(downloadChrome.dest)
+  into file("${buildDir}/chromeLinuxUnpacked")
+  eachFile { FileCopyDetails fcd ->
+    // makes out of 06__ (_=don't care) 0655
+    // means    rwx______ => rwxr-xr-x
+    // or also  r-x______ => r-xr-xr-x
+    def mode = fcd.mode >> 6
+    fcd.mode = (mode << 6) | ((mode & 5) << 3) | mode & 5
+  }
 }
 unpackChrome.dependsOn(downloadChrome)
 
-task downloadGwtPlugin(type: DownloadTask) {
-    source 'https://clients2.googleusercontent.com/crx/blobs/QgAAAC6zw0qH2DJtnXe8Z7rUJP3brylTnXsqSLH8EJLp' +
-            'Cpq2560pdQWMapnnCQsWYAxwMN2Pa2mZkH4aA9in1i3WTJKG0OUyFhe7lScnMNxhS1yjAMZSmuVxRW6MIEDyZkO8bJcfTSNy6GZA2g/' +
-            'extension_1_0_11357.crx'
-    sha256sum '5716f39ca4dadb47f571f65f631a00854487971f42ad24aa3a36a99e78d33134'
-}
+final downloadGwtPlugin = makeDownloadTask(
+    name: 'gwtPlugin',
+    url: 'https://clients2.googleusercontent.com/crx/blobs/QgAAAC6zw0qH2DJtnXe8Z7rUJP3brylTnXsqSLH8EJLp' +
+        'Cpq2560pdQWMapnnCQsWYAxwMN2Pa2mZkH4aA9in1i3WTJKG0OUyFhe7lScnMNxhS1yjAMZSmuVxRW6MIEDyZkO8bJcfTSNy6GZA2g/' +
+        'extension_1_0_11357.crx',
+    sha256: '5716f39ca4dadb47f571f65f631a00854487971f42ad24aa3a36a99e78d33134')
 
 task unpackGwtPlugin() {
-    inputs.file(downloadGwtPlugin.destFile)
-    ext.zip = file("${buildDir}/gwtPlugin.zip")
-    ext.unpacked = file("${buildDir}/gwtPlugin")
-    outputs.file(zip)
-    outputs.dir(unpacked)
+  inputs.file(downloadGwtPlugin.dest)
+  ext.zip = file("${buildDir}/gwtPlugin.zip")
+  ext.unpacked = file("${buildDir}/gwtPlugin")
+  outputs.file(zip)
+  outputs.dir(unpacked)
 }
 unpackGwtPlugin {}.dependsOn(downloadGwtPlugin)
 
 unpackGwtPlugin << {
-    def fs = new FileOutputStream(zip)
-    final bytes = inputs.files.first().readBytes()
-    fs.write(bytes, 306, bytes.length - 306)
-    fs.close()
-    project.copy {
-        from zipTree(zip)
-        exclude '_metadata/**'
-        into unpacked
-    }
+  def fs = new FileOutputStream(zip)
+  final bytes = inputs.files.first().readBytes()
+  fs.write(bytes, 306, bytes.length - 306)
+  fs.close()
+  project.copy {
+    from zipTree(zip)
+    exclude '_metadata/**'
+    into unpacked
+  }
 }
 
-task downloadPdfPlugin(type: DownloadTask) {
-    source 'https://clients2.googleusercontent.com/crx/blobs/QgAAAC6zw0qH2DJtnXe8Z7rUJP2i3UKpz0eTiopC2Qlk_FXWm-wYwG' +
-            'N2MPtjDt7LaoCfAScKzPva1bZi2q-9pYXZOibTl1nwFns1ZGCCvKGnyPQ0AMZSmuVlD6-IvZI2Yaw8Sj800M072EC85w/'+
-            'extension_1_1_527.crx'
-    sha256sum ''
-}
+final downloadPdfPlugin = makeDownloadTask(
+    name: 'pdfPlugin',
+    url: 'https://clients2.googleusercontent.com/crx/blobs/QgAAAC6zw0qH2DJtnXe8Z7rUJP2i3UKpz0eTiopC2Qlk_FXWm-wYwG' +
+        'N2MPtjDt7LaoCfAScKzPva1bZi2q-9pYXZOibTl1nwFns1ZGCCvKGnyPQ0AMZSmuVlD6-IvZI2Yaw8Sj800M072EC85w/' +
+        'extension_1_1_527.crx',
+    sha256: '5716f39ca4dadb47f571f65f631a00854487971f42ad24aa3a36a99e78d33134')
+
 
 task unpackPdfPlugin() {
-    inputs.file(downloadPdfPlugin.destFile)
-    ext.zip = file("${buildDir}/pdfPlugin.zip")
-    ext.unpacked = file("${buildDir}/pdfPlugin")
-    outputs.file(zip)
-    outputs.dir(unpacked)
+  inputs.file(downloadPdfPlugin.dest)
+  ext.zip = file("${buildDir}/pdfPlugin.zip")
+  ext.unpacked = file("${buildDir}/pdfPlugin")
+  outputs.file(zip)
+  outputs.dir(unpacked)
 }
 unpackPdfPlugin.dependsOn(downloadPdfPlugin)
 
 unpackPdfPlugin << {
-    def fs = new FileOutputStream(zip)
-    final bytes = inputs.files.first().readBytes()
-    fs.write(bytes, 306, bytes.length - 306)
-    fs.close()
-    project.copy {
-        from zipTree(zip)
-        exclude '_metadata/**'
-        into unpacked
-    }
+  def fs = new FileOutputStream(zip)
+  final bytes = inputs.files.first().readBytes()
+  fs.write(bytes, 306, bytes.length - 306)
+  fs.close()
+  project.copy {
+    from zipTree(zip)
+    exclude '_metadata/**'
+    into unpacked
+  }
 }
 
 ospackage {
-    into("/opt/${project.name}")
-    from(unpackChrome.outputs.files) {
-        exclude '**/en-US.pak'
-    }
-    from(fileTree(dir: 'resources/chrome-profile'))
-    from('resources/rewrite-locale/output.pak') {
-        into 'chrome-linux/locales'
-        eachFile { FileCopyDetails fcd ->
-            fcd.name = 'en-US.pak'
-        }
-    }
-    from(unpackGwtPlugin.outputs.files) {
-        into 'chrome-profile/Default/Extensions/hnmkfcicjochbbdloamlldphmhbbkenb'
-    }
-    from(unpackPdfPlugin.outputs.files) {
-        into 'chrome-profile/Default/Extensions/oemmndcbldboiebfnladdacbdfmadadm'
+  into("/opt/${project.name}")
+  from(unpackChrome.outputs.files) {
+    exclude '**/en-US.pak'
+  }
+  from(fileTree(dir: 'resources/chrome-profile'))
+  from('resources/rewrite-locale/output.pak') {
+    into 'chrome-linux/locales'
+    eachFile { FileCopyDetails fcd ->
+      fcd.name = 'en-US.pak'
     }
+  }
+  from(unpackGwtPlugin.outputs.files) {
+    into 'chrome-profile/Default/Extensions/hnmkfcicjochbbdloamlldphmhbbkenb'
+  }
+  from(unpackPdfPlugin.outputs.files) {
+    into 'chrome-profile/Default/Extensions/oemmndcbldboiebfnladdacbdfmadadm'
+  }
 }
 
 activator.bin['gwt-chrome-persistent'] = "/opt/${project.name}/bin/gwt-chrome-persistent"
diff --git a/packages/idea-iu/idea-iu.gradle b/packages/idea-iu/idea-iu.gradle
index 5afd834..e38fd41 100644
--- a/packages/idea-iu/idea-iu.gradle
+++ b/packages/idea-iu/idea-iu.gradle
@@ -1,16 +1,9 @@
-buildscript {
-  repositories {
-    mavenLocal()
-    mavenCentral()
-  }
-  dependencies {
-    classpath 'org.xapek.yvesf:gradle-download-task:0.1-SNAPSHOT'
-  }
-}
-
-task download(type: org.xapek.yvesf.gradle.DownloadTask) {}
+final download = makeDownloadTask(
+    url: "https://download.jetbrains.com/idea/ideaIU-${project.version}.tar.gz",
+    sha256: sha256sum)
 
 task untar(type: Copy) {
+    from tarTree(download.dest)
     into file("${buildDir}/unpacked/dist")
     eachFile { FileCopyDetails fcd ->
         fcd.path = fcd.path.substring(path.indexOf('/')+1)
@@ -24,8 +17,3 @@ ospackage {
 }
 
 activator.bin['idea'] = "/opt/${project.name}/bin/idea.sh"
-
-project.afterEvaluate {
-    download.source "https://download.jetbrains.com/idea/ideaIU-${project.version}.tar.gz"
-    untar.from tarTree(download.destFile)
-}
diff --git a/packages/idea-iu/idea-iu15/build.gradle b/packages/idea-iu/idea-iu15/build.gradle
index 0159163..dabab4d 100644
--- a/packages/idea-iu/idea-iu15/build.gradle
+++ b/packages/idea-iu/idea-iu15/build.gradle
@@ -1,5 +1,3 @@
 version '15.0.6'
-
+ext.sha256sum = '941a9e0d250c1e21ef2e2beb818cdbdba0acf38e69b74546275d028bc5554a04'
 apply from: '../idea-iu.gradle'
-
-download.sha256sum '941a9e0d250c1e21ef2e2beb818cdbdba0acf38e69b74546275d028bc5554a04'
diff --git a/packages/idea-iu/idea-iu2016/build.gradle b/packages/idea-iu/idea-iu2016/build.gradle
index d4c4414..1cbfea7 100644
--- a/packages/idea-iu/idea-iu2016/build.gradle
+++ b/packages/idea-iu/idea-iu2016/build.gradle
@@ -1,5 +1,3 @@
-version '2016.1.2b'
-
+version '2016.2.5'
+ext.sha256sum = '30a4ddf82b8393fc22803c9335d6cb00087116dd09915e44f40f0433b81b1b3d'
 apply from: '../idea-iu.gradle'
-
-download.sha256sum '033b6f2c13ca954024808a84c8a33ebb15a5548720dedf1dbaebaa97ea93f1e9'
diff --git a/packages/jvmtop/build.gradle b/packages/jvmtop/build.gradle
index a37a66c..ad250a9 100644
--- a/packages/jvmtop/build.gradle
+++ b/packages/jvmtop/build.gradle
@@ -1,14 +1,13 @@
-import org.xapek.yvesf.gradle.DownloadTask
-
 version '0.8.0'
 
-task download(type: DownloadTask) {
-  source "https://github.com/patric-r/jvmtop/releases/download/0.8.0/jvmtop-${project.version}.tar.gz"
-  sha256sum 'f9de8159240b400a51b196520b4c4f0ddbcaa8e587fab1f0a59be8a00dc128c4'
-}
+final download = makeDownloadTask(
+    url: "https://github.com/patric-r/jvmtop/releases/download/0.8.0/jvmtop-${project.version}.tar.gz",
+    sha256: 'f9de8159240b400a51b196520b4c4f0ddbcaa8e587fab1f0a59be8a00dc128c4')
+
+download.acceptAnyCertificate true
 
 task unpack(type: Copy) {
-    from tarTree(download.destFile)
+    from tarTree(download.dest)
     into file("${buildDir}/unpacked/dist")
     eachFile { FileCopyDetails fcd ->
         fcd.path = fcd.path.substring(path.indexOf('/')+1)
diff --git a/packages/maven3/build.gradle b/packages/maven3/build.gradle
index 7cd1db3..da89ff3 100644
--- a/packages/maven3/build.gradle
+++ b/packages/maven3/build.gradle
@@ -1,24 +1,21 @@
-import org.xapek.yvesf.gradle.DownloadTask
-
 version '3.3.9'
 
-task download(type: DownloadTask) {
-    source "http://mirror.switch.ch/mirror/apache/dist/maven/maven-3/${version}/binaries/apache-maven-${version}-bin.tar.gz"
-    sha256sum '6e3e9c949ab4695a204f74038717aa7b2689b1be94875899ac1b3fe42800ff82'
-}
+final download = makeDownloadTask(
+    url: "https://archive.apache.org/dist/maven/maven-3/3.3.9/binaries/apache-maven-${version}-bin.tar.gz",
+    sha256: '6e3e9c949ab4695a204f74038717aa7b2689b1be94875899ac1b3fe42800ff82')
 
 task unpack(type: Copy) {
-    from tarTree(download.destFile)
-    into file("${buildDir}/unpacked/dist")
-    eachFile { FileCopyDetails fcd ->
-        fcd.path = fcd.path.substring(path.indexOf('/')+1)
-    }
+  from tarTree(download.dest)
+  into file("${buildDir}/unpacked/dist")
+  eachFile { FileCopyDetails fcd ->
+    fcd.path = fcd.path.substring(path.indexOf('/') + 1)
+  }
 }
 unpack.dependsOn(download)
 
 ospackage {
-    into "/opt/${project.name}"
-    from unpack.outputs.files
+  into "/opt/${project.name}"
+  from unpack.outputs.files
 }
 
-activator.bin['mvn'] = "/opt/${project.name}/bin/mvn"
-\ No newline at end of file
+activator.bin['mvn'] = "/opt/${project.name}/bin/mvn"
diff --git a/packages/oraclejdk/oracle.gradle b/packages/oraclejdk/oracle.gradle
index d31a33d..dc6020b 100644
--- a/packages/oraclejdk/oracle.gradle
+++ b/packages/oraclejdk/oracle.gradle
@@ -1,15 +1,3 @@
-buildscript {
-  repositories {
-    mavenLocal()
-    mavenCentral()
-  }
-  dependencies {
-    classpath 'org.xapek.yvesf:gradle-download-task:0.1-SNAPSHOT'
-  }
-}
-
-task download(type: org.xapek.yvesf.gradle.DownloadTask) {}
-
 task untar(type: Copy) {
   into file("${buildDir}/unpacked/dist/")
   eachFile { FileCopyDetails fcd ->
@@ -28,20 +16,20 @@ ospackage {
 }
 
 project.afterEvaluate {
-  untar.from tarTree(download.destFile)
+  untar.from tarTree(download.dest)
 }
 
 tasks.activator.dependsOn('untar')
 
-task downloadCertGrid(type: org.xapek.yvesf.gradle.DownloadTask) {
-  source 'https://cafiles.cern.ch/cafiles/certificates/CERN%20Grid%20Certification%20Authority.crt'
-  sha256sum 'dce1eedad3edef466ecaeebfd711291e3b86f72ca8e6b0bba65162fd07a3e642'
-}
+final downloadCertGrid = makeDownloadTask(
+    url: 'https://cafiles.cern.ch/cafiles/certificates/CERN%20Grid%20Certification%20Authority.crt',
+    sha256: 'dce1eedad3edef466ecaeebfd711291e3b86f72ca8e6b0bba65162fd07a3e642'
+)
 
-task downloadCertRoot2(type: org.xapek.yvesf.gradle.DownloadTask) {
-  source 'https://cafiles.cern.ch/cafiles/certificates/CERN%20Root%20Certification%20Authority%202.crt'
-  sha256sum '187f4f7b1315ebd2b72547c1accf2ec4077d51c14a0ce574904a9fdaea8a320c'
-}
+final downloadCertRoot2 = makeDownloadTask(
+    url: 'https://cafiles.cern.ch/cafiles/certificates/CERN%20Root%20Certification%20Authority%202.crt',
+    sha256: '187f4f7b1315ebd2b72547c1accf2ec4077d51c14a0ce574904a9fdaea8a320c'
+)
 
 void keytool(String alias, File cert) {
   final bin = new File(project.buildDir, 'unpacked/dist/bin/keytool')
@@ -59,12 +47,12 @@ void keytool(String alias, File cert) {
 }
 
 final keytoolTask = tasks.create('keytool') {
-  inputs.file tasks.downloadCertGrid.outputs
-  inputs.file tasks.downloadCertRoot2.outputs
+  inputs.file downloadCertGrid.outputs
+  inputs.file downloadCertRoot2.outputs
 }
-keytoolTask.dependsOn(tasks.untar, tasks.downloadCertGrid)
+keytoolTask.dependsOn(tasks.untar, downloadCertGrid)
 keytoolTask << {
-  keytool('cern_grid_ca', tasks.downloadCertGrid.destFile)
-  keytool('cern_root2_ca', tasks.downloadCertRoot2.destFile)
+  keytool('cern_grid_ca', downloadCertGrid.dest)
+  keytool('cern_root2_ca', downloadCertRoot2.dest)
 }
 tasks.activator.dependsOn(keytoolTask)
 \ No newline at end of file
diff --git a/packages/oraclejdk/oraclejdk7/build.gradle b/packages/oraclejdk/oraclejdk7/build.gradle
index 0838dd6..5674eee 100644
--- a/packages/oraclejdk/oraclejdk7/build.gradle
+++ b/packages/oraclejdk/oraclejdk7/build.gradle
@@ -1,9 +1,10 @@
 version '7.80'
 
-apply from: '../oracle.gradle'
+ext.download = makeDownloadTask(
+    url: 'http://ftp.heanet.ie/mirrors/funtoo/distfiles/oracle-java/jdk-7u80-linux-x64.tar.gz',
+    sha256: 'bad9a731639655118740bee119139c1ed019737ec802a630dd7ad7aab4309623')
 
-download.source 'http://ftp.heanet.ie/mirrors/funtoo/distfiles/oracle-java/jdk-7u80-linux-x64.tar.gz'
-download.sha256sum 'bad9a731639655118740bee119139c1ed019737ec802a630dd7ad7aab4309623'
+apply from: '../oracle.gradle'
 
 ospackage {
   into '/usr/lib/jvm/java-7-oraclejdk'
diff --git a/packages/oraclejdk/oraclejdk8/build.gradle b/packages/oraclejdk/oraclejdk8/build.gradle
index 98c16a1..76c9c46 100644
--- a/packages/oraclejdk/oraclejdk8/build.gradle
+++ b/packages/oraclejdk/oraclejdk8/build.gradle
@@ -1,9 +1,11 @@
 version '8.66'
 
-apply from: '../oracle.gradle'
+ext.download = makeDownloadTask(
+    url: 'http://ftp.heanet.ie/mirrors/funtoo/distfiles/oracle-java/jdk-8u66-linux-x64.tar.gz',
+    sha256: '7e95ad5fa1c75bc65d54aaac9e9986063d0a442f39a53f77909b044cef63dc0a')
+
 
-download.source 'http://ftp.heanet.ie/mirrors/funtoo/distfiles/oracle-java/jdk-8u66-linux-x64.tar.gz'
-download.sha256sum '7e95ad5fa1c75bc65d54aaac9e9986063d0a442f39a53f77909b044cef63dc0a'
+apply from: '../oracle.gradle'
 
 ospackage {
   into '/usr/lib/jvm/java-8-oraclejdk'
diff --git a/packages/scheme2ddl/build.gradle b/packages/scheme2ddl/build.gradle
index a5d9bda..b863234 100644
--- a/packages/scheme2ddl/build.gradle
+++ b/packages/scheme2ddl/build.gradle
@@ -1,14 +1,11 @@
-import org.xapek.yvesf.gradle.DownloadTask
-
 version '2.3.12'
 
-task downloadFiles(type: DownloadTask) {
-    source "https://bintray.com/artifact/download/qwazer/maven/com/googlecode/" +
-            "scheme2ddl/${project.version}/scheme2ddl-${project.version}.jar"
-    sha256sum '31b0627cfabca76cc38a4f32f5e7e1cc31979ec9e9eaf45243514d1306e96ccd'
-}
+final download = makeDownloadTask(
+    url: "https://bintray.com/artifact/download/qwazer/maven/com/googlecode/" +
+            "scheme2ddl/${project.version}/scheme2ddl-${project.version}.jar",
+    sha256: '31b0627cfabca76cc38a4f32f5e7e1cc31979ec9e9eaf45243514d1306e96ccd')
 
 ospackage {
     into "/opt/${project.name}"
-    from downloadFiles.outputs.files
+    from download.outputs.files
 }