3 files changed, 23 insertions, 32 deletions
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'