This is an automated email from the git hooks/post-receive script. seamlik-guest pushed a commit to branch master in repository gradle.
commit 02859d77e4770989f9374b73eeda03183320d554 Author: Kai-Chung Yan (殷啟聰) <[email protected]> Date: Wed Nov 2 17:40:04 2016 +0800 Drop disable_tests.diff --- .../resources/all-released-versions.json | 1387 ++++++++++++++++++++ .../dependency-management_depends_on_testkit.patch | 2 +- debian/patches/disable_Kotlin.patch | 2 +- debian/patches/disable_aws.diff | 44 +- debian/patches/disable_tests.diff | 639 --------- debian/patches/generate_pom.diff | 2 +- debian/patches/groovy-jar.patch | 2 +- debian/patches/jcommander.diff | 9 +- debian/patches/series | 1 - debian/patches/use_local_artifacts.diff | 10 + debian/rules | 10 +- 11 files changed, 1455 insertions(+), 653 deletions(-) diff --git a/debian/additionalSrc/resources/all-released-versions.json b/debian/additionalSrc/resources/all-released-versions.json new file mode 100644 index 0000000..414702c --- /dev/null +++ b/debian/additionalSrc/resources/all-released-versions.json @@ -0,0 +1,1387 @@ +[{ + "version":"3.3-20161102000015+0000", + "buildTime":"20161102000015+0000", + "current":false, + "snapshot":true, + "nightly":true, + "activeRc":false, + "rcFor":"", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions-snapshots\/gradle-3.3-20161102000015+0000-bin.zip" +},{ + "version":"3.2-rc-2", + "buildTime":"20161031160822+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":true, + "rcFor":"3.2", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-3.2-rc-2-bin.zip" +},{ + "version":"3.2-rc-1", + "buildTime":"20161024194725+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"3.2", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-3.2-rc-1-bin.zip" +},{ + "version":"3.1", + "buildTime":"20160919105353+0000", + "current":true, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-3.1-bin.zip" +},{ + "version":"3.1-rc-1", + "buildTime":"20160912123424+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"3.1", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-3.1-rc-1-bin.zip" +},{ + "version":"3.0", + "buildTime":"20160815131501+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-3.0-bin.zip" +},{ + "version":"3.0-rc-2", + "buildTime":"20160808133410+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"3.0", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-3.0-rc-2-bin.zip" +},{ + "version":"3.0-rc-1", + "buildTime":"20160802061335+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"3.0", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-3.0-rc-1-bin.zip" +},{ + "version":"2.14.1", + "buildTime":"20160718063837+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-2.14.1-bin.zip" +},{ + "version":"2.14.1-rc-2", + "buildTime":"20160711105827+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"2.14.1", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-2.14.1-rc-2-bin.zip" +},{ + "version":"2.14.1-rc-1", + "buildTime":"20160629051303+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"2.14.1", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-2.14.1-rc-1-bin.zip" +},{ + "version":"3.0-milestone-2", + "buildTime":"20160621224128+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"", + "milestoneFor":"3.0", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-3.0-milestone-2-bin.zip" +},{ + "version":"2.14", + "buildTime":"20160614071637+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-2.14-bin.zip" +},{ + "version":"2.14-rc-6", + "buildTime":"20160610181946+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"2.14", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-2.14-rc-6-bin.zip" +},{ + "version":"3.0-milestone-1", + "buildTime":"20160608013148+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"", + "milestoneFor":"3.0", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-3.0-milestone-1-bin.zip" +},{ + "version":"2.14-rc-5", + "buildTime":"20160607135817+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"2.14", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-2.14-rc-5-bin.zip" +},{ + "version":"2.14-rc-4", + "buildTime":"20160603110827+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"2.14", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-2.14-rc-4-bin.zip" +},{ + "version":"2.14-rc-3", + "buildTime":"20160530112111+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"2.14", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-2.14-rc-3-bin.zip" +},{ + "version":"2.14-rc-2", + "buildTime":"20160527175624+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"2.14", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-2.14-rc-2-bin.zip" +},{ + "version":"2.14-rc-1", + "buildTime":"20160518093824+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"2.14", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-2.14-rc-1-bin.zip" +},{ + "version":"2.13", + "buildTime":"20160425041010+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-2.13-bin.zip" +},{ + "version":"2.13-rc-2", + "buildTime":"20160419145240+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"2.13", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-2.13-rc-2-bin.zip" +},{ + "version":"2.13-rc-1", + "buildTime":"20160406110211+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"2.13", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-2.13-rc-1-bin.zip" +},{ + "version":"2.12", + "buildTime":"20160314083203+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-2.12-bin.zip" +},{ + "version":"2.12-rc-1", + "buildTime":"20160307174118+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"2.12", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-2.12-rc-1-bin.zip" +},{ + "version":"2.11", + "buildTime":"20160208075916+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-2.11-bin.zip" +},{ + "version":"2.11-rc-3", + "buildTime":"20160203190922+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"2.11", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-2.11-rc-3-bin.zip" +},{ + "version":"2.11-rc-2", + "buildTime":"20160202162431+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"2.11", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-2.11-rc-2-bin.zip" +},{ + "version":"2.11-rc-1", + "buildTime":"20160120084154+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"2.11", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-2.11-rc-1-bin.zip" +},{ + "version":"2.10", + "buildTime":"20151221211504+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-2.10-bin.zip" +},{ + "version":"2.10-rc-2", + "buildTime":"20151218164026+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"2.10", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-2.10-rc-2-bin.zip" +},{ + "version":"2.10-rc-1", + "buildTime":"20151208224811+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"2.10", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-2.10-rc-1-bin.zip" +},{ + "version":"2.9", + "buildTime":"20151117070217+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-2.9-bin.zip" +},{ + "version":"2.9-rc-1", + "buildTime":"20151103230218+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"2.9", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-2.9-rc-1-bin.zip" +},{ + "version":"2.8", + "buildTime":"20151020034636+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-2.8-bin.zip" +},{ + "version":"2.8-rc-2", + "buildTime":"20151015124208+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"2.8", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-2.8-rc-2-bin.zip" +},{ + "version":"2.8-rc-1", + "buildTime":"20150930171102+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"2.8", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-2.8-rc-1-bin.zip" +},{ + "version":"2.7", + "buildTime":"20150914072616+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-2.7-bin.zip" +},{ + "version":"2.7-rc-2", + "buildTime":"20150905140615+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"2.7", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-2.7-rc-2-bin.zip" +},{ + "version":"2.7-rc-1", + "buildTime":"20150828140928+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"2.7", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-2.7-rc-1-bin.zip" +},{ + "version":"2.6", + "buildTime":"20150810131506+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-2.6-bin.zip" +},{ + "version":"2.6-rc-2", + "buildTime":"20150804104806+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"2.6", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-2.6-rc-2-bin.zip" +},{ + "version":"2.6-rc-1", + "buildTime":"20150728171643+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"2.6", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-2.6-rc-1-bin.zip" +},{ + "version":"2.5", + "buildTime":"20150708073837+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-2.5-bin.zip" +},{ + "version":"2.5-rc-2", + "buildTime":"20150702151559+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"2.5", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-2.5-rc-2-bin.zip" +},{ + "version":"2.5-rc-1", + "buildTime":"20150623180452+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"2.5", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-2.5-rc-1-bin.zip" +},{ + "version":"2.4", + "buildTime":"20150505080924+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-2.4-bin.zip" +},{ + "version":"2.4-rc-2", + "buildTime":"20150429045020+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"2.4", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-2.4-rc-2-bin.zip" +},{ + "version":"2.4-rc-1", + "buildTime":"20150423031523+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"2.4", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-2.4-rc-1-bin.zip" +},{ + "version":"2.3", + "buildTime":"20150216050933+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-2.3-bin.zip" +},{ + "version":"2.3-rc-4", + "buildTime":"20150211163922+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"2.3", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-2.3-rc-4-bin.zip" +},{ + "version":"2.3-rc-3", + "buildTime":"20150208183759+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"2.3", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-2.3-rc-3-bin.zip" +},{ + "version":"2.3-rc-2", + "buildTime":"20150204105413+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"2.3", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-2.3-rc-2-bin.zip" +},{ + "version":"2.3-rc-1", + "buildTime":"20150127140232+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"2.3", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-2.3-rc-1-bin.zip" +},{ + "version":"2.2.1", + "buildTime":"20141124094535+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-2.2.1-bin.zip" +},{ + "version":"2.2.1-rc-1", + "buildTime":"20141117101237+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"2.2.1", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-2.2.1-rc-1-bin.zip" +},{ + "version":"2.2", + "buildTime":"20141110133144+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-2.2-bin.zip" +},{ + "version":"2.2-rc-2", + "buildTime":"20141103170404+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"2.2", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-2.2-rc-2-bin.zip" +},{ + "version":"2.2-rc-1", + "buildTime":"20141020163257+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"2.2", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-2.2-rc-1-bin.zip" +},{ + "version":"2.1", + "buildTime":"20140908104039+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-2.1-bin.zip" +},{ + "version":"2.1-rc-4", + "buildTime":"20140903092053+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"2.1", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-2.1-rc-4-bin.zip" +},{ + "version":"2.1-rc-3", + "buildTime":"20140901103549+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"2.1", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-2.1-rc-3-bin.zip" +},{ + "version":"2.1-rc-2", + "buildTime":"20140828023229+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"2.1", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-2.1-rc-2-bin.zip" +},{ + "version":"2.1-rc-1", + "buildTime":"20140819194409+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"2.1", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-2.1-rc-1-bin.zip" +},{ + "version":"2.0", + "buildTime":"20140701074534+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-2.0-bin.zip" +},{ + "version":"2.0-rc-2", + "buildTime":"20140623080236+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"2.0", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-2.0-rc-2-bin.zip" +},{ + "version":"2.0-rc-1", + "buildTime":"20140606070241+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"2.0", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-2.0-rc-1-bin.zip" +},{ + "version":"1.12", + "buildTime":"20140429092431+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-1.12-bin.zip" +},{ + "version":"1.12-rc-2", + "buildTime":"20140423112055+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"1.12", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-1.12-rc-2-bin.zip" +},{ + "version":"1.12-rc-1", + "buildTime":"20140416084626+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"1.12", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-1.12-rc-1-bin.zip" +},{ + "version":"1.11", + "buildTime":"20140211113439+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-1.11-bin.zip" +},{ + "version":"1.11-rc-1", + "buildTime":"20140131033453+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"1.11", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-1.11-rc-1-bin.zip" +},{ + "version":"1.10", + "buildTime":"20131217092815+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-1.10-bin.zip" +},{ + "version":"1.10-rc-2", + "buildTime":"20131211105454+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"1.10", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-1.10-rc-2-bin.zip" +},{ + "version":"1.10-rc-1", + "buildTime":"20131204154128+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"1.10", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-1.10-rc-1-bin.zip" +},{ + "version":"1.9", + "buildTime":"20131119082002+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-1.9-bin.zip" +},{ + "version":"1.9-rc-4", + "buildTime":"20131118093242+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"1.9", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-1.9-rc-4-bin.zip" +},{ + "version":"1.9-rc-3", + "buildTime":"20131107122642+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"1.9", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-1.9-rc-3-bin.zip" +},{ + "version":"1.9-rc-2", + "buildTime":"20131028093320+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"1.9", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-1.9-rc-2-bin.zip" +},{ + "version":"1.9-rc-1", + "buildTime":"20131023094618+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"1.9", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-1.9-rc-1-bin.zip" +},{ + "version":"1.8", + "buildTime":"20130924073233+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-1.8-bin.zip" +},{ + "version":"1.8-rc-2", + "buildTime":"20130919053314+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"1.8", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-1.8-rc-2-bin.zip" +},{ + "version":"1.8-rc-1", + "buildTime":"20130910130452+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"1.8", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-1.8-rc-1-bin.zip" +},{ + "version":"1.7", + "buildTime":"20130806111956+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-1.7-bin.zip" +},{ + "version":"1.7-rc-2", + "buildTime":"20130729120421+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"1.7", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-1.7-rc-2-bin.zip" +},{ + "version":"1.7-rc-1", + "buildTime":"20130702145630+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"1.7", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-1.7-rc-1-bin.zip" +},{ + "version":"1.6", + "buildTime":"20130507091214+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-1.6-bin.zip" +},{ + "version":"1.6-rc-1", + "buildTime":"20130430131900+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"1.6", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-1.6-rc-1-bin.zip" +},{ + "version":"1.5", + "buildTime":"20130327140935+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-1.5-bin.zip" +},{ + "version":"1.5-rc-3", + "buildTime":"20130321155709+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"1.5", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-1.5-rc-3-bin.zip" +},{ + "version":"1.5-rc-2", + "buildTime":"20130317011516+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"1.5", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-1.5-rc-2-bin.zip" +},{ + "version":"1.5-rc-1", + "buildTime":"20130311120320+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"1.5", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-1.5-rc-1-bin.zip" +},{ + "version":"1.4", + "buildTime":"20130128034246+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-1.4-bin.zip" +},{ + "version":"1.4-rc-3", + "buildTime":"20130125035146+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"1.4", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-1.4-rc-3-bin.zip" +},{ + "version":"1.4-rc-2", + "buildTime":"20130122030632+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"1.4", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-1.4-rc-2-bin.zip" +},{ + "version":"1.4-rc-1", + "buildTime":"20130117001257+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"1.4", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-1.4-rc-1-bin.zip" +},{ + "version":"1.3", + "buildTime":"20121120113738+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-1.3-bin.zip" +},{ + "version":"1.3-rc-2", + "buildTime":"20121115155343+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"1.3", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-1.3-rc-2-bin.zip" +},{ + "version":"1.3-rc-1", + "buildTime":"20121112135252+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"1.3", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-1.3-rc-1-bin.zip" +},{ + "version":"1.2", + "buildTime":"20120912104602+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-1.2-bin.zip" +},{ + "version":"1.2-rc-1", + "buildTime":"20120904174954+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"1.2", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-1.2-rc-1-bin.zip" +},{ + "version":"1.1", + "buildTime":"20120731132432+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-1.1-bin.zip" +},{ + "version":"1.1-rc-2", + "buildTime":"20120726075103+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"1.1", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-1.1-rc-2-bin.zip" +},{ + "version":"1.1-rc-1", + "buildTime":"20120724134404+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"1.1", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-1.1-rc-1-bin.zip" +},{ + "version":"1.0", + "buildTime":"20120612025621+0200", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-1.0-bin.zip" +},{ + "version":"1.0-rc-3", + "buildTime":"20120430015152+0200", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"1.0", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-1.0-rc-3-bin.zip" +},{ + "version":"1.0-rc-2", + "buildTime":"20120425015237+0200", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"1.0", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-1.0-rc-2-bin.zip" +},{ + "version":"1.0-rc-1", + "buildTime":"20120411121324+0100", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"1.0", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-1.0-rc-1-bin.zip" +},{ + "version":"1.0-milestone-9", + "buildTime":"20120313171009+0100", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-1.0-milestone-9-bin.zip" +},{ + "version":"1.0-milestone-8a", + "buildTime":"20120220185357+0100", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-1.0-milestone-8a-bin.zip" +},{ + "version":"1.0-milestone-8", + "buildTime":"20120214022451+0100", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-1.0-milestone-8-bin.zip" +},{ + "version":"1.0-milestone-7", + "buildTime":"20120105102443+0000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-1.0-milestone-7-bin.zip" +},{ + "version":"1.0-milestone-6", + "buildTime":"20111117065412+0100", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-1.0-milestone-6-bin.zip" +},{ + "version":"1.0-milestone-5", + "buildTime":"20111025055608+0200", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-1.0-milestone-5-bin.zip" +},{ + "version":"1.0-milestone-4", + "buildTime":"20110728103822+0200", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"", + "milestoneFor":"", + "broken":true, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-1.0-milestone-4-bin.zip" +},{ + "version":"1.0-milestone-3", + "buildTime":"20110425174011+1000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-1.0-milestone-3-bin.zip" +},{ + "version":"1.0-milestone-2", + "buildTime":"20110407163255+1000", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-1.0-milestone-2-bin.zip" +},{ + "version":"1.0-milestone-1", + "buildTime":"20110227141320+1100", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-1.0-milestone-1-bin.zip" +},{ + "version":"0.9.2", + "buildTime":"20110123133421+1100", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-0.9.2-bin.zip" +},{ + "version":"0.9.1", + "buildTime":"20110102114057+1100", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-0.9.1-bin.zip" +},{ + "version":"0.9", + "buildTime":"20101219125006+1100", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-0.9-bin.zip" +},{ + "version":"0.9-rc-3", + "buildTime":"20101120131750+1100", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"0.9", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-0.9-rc-3-bin.zip" +},{ + "version":"0.9-rc-2", + "buildTime":"20101027082405+1100", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"0.9", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-0.9-rc-2-bin.zip" +},{ + "version":"0.9-rc-1", + "buildTime":"20100804080433+1100", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"0.9", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-0.9-rc-1-bin.zip" +},{ + "version":"0.8", + "buildTime":"20090928140159+0200", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-0.8-bin.zip" +},{ + "version":"0.7", + "buildTime":"20090720085013+0200", + "current":false, + "snapshot":false, + "nightly":false, + "activeRc":false, + "rcFor":"", + "milestoneFor":"", + "broken":false, + "downloadUrl":"https:\/\/services.gradle.org\/distributions\/gradle-0.7-bin.zip" +}] \ No newline at end of file diff --git a/debian/patches/dependency-management_depends_on_testkit.patch b/debian/patches/dependency-management_depends_on_testkit.patch index e8f3370..b01083f 100644 --- a/debian/patches/dependency-management_depends_on_testkit.patch +++ b/debian/patches/dependency-management_depends_on_testkit.patch @@ -3,7 +3,7 @@ Author: Kai-Chung Yan (殷啟聰) Last-Update: 2016-10-28 --- a/subprojects/dependency-management/dependency-management.gradle +++ b/subprojects/dependency-management/dependency-management.gradle -@@ -53,4 +53,4 @@ +@@ -62,4 +62,4 @@ } jar.dependsOn(generateGradleApiPackageList, generateTestKitPackageList) diff --git a/debian/patches/disable_Kotlin.patch b/debian/patches/disable_Kotlin.patch index 4eac966..8f8590f 100644 --- a/debian/patches/disable_Kotlin.patch +++ b/debian/patches/disable_Kotlin.patch @@ -3,7 +3,7 @@ Author: Kai-Chung Yan (殷啟聰) Last-Update: 2016-10-28 --- a/subprojects/dependency-management/dependency-management.gradle +++ b/subprojects/dependency-management/dependency-management.gradle -@@ -37,7 +37,6 @@ +@@ -46,7 +46,6 @@ classpath = files([]) doFirst { classpath = files( diff --git a/debian/patches/disable_aws.diff b/debian/patches/disable_aws.diff index 3598905..4632747 100644 --- a/debian/patches/disable_aws.diff +++ b/debian/patches/disable_aws.diff @@ -1,9 +1,9 @@ Description: AWS SDK for Java is not in Debian yet. Author: Kai-Chung Yan (殷啟聰) -Last-Update: 2016-10-20 +Last-Update: 2016-11-02 --- a/build.gradle +++ b/build.gradle -@@ -174,7 +174,7 @@ +@@ -175,7 +175,7 @@ 'platformJvm', 'languageJvm', 'languageJava', 'languageGroovy', 'languageScala', 'platformNative', 'platformPlay', 'idePlay', 'languageNative', 'ideNative', 'testingBase', 'testingNative', 'testingJvm', 'pluginDevelopment', 'pluginUse', 'resourcesHttp', @@ -22,3 +22,43 @@ Last-Update: 2016-10-20 include 'resourcesSftp' include 'plugins' include 'scala' +--- a/subprojects/dependency-management/dependency-management.gradle ++++ b/subprojects/dependency-management/dependency-management.gradle +@@ -26,7 +26,6 @@ + integTestRuntime project(":ivy") + integTestRuntime project(":maven") + integTestRuntime project(":resourcesHttp") +- integTestRuntime project(":resourcesS3") + integTestRuntime project(":resourcesSftp") + //this dependency is necessary to run IvySFtpResolverIntegrationTest on ibm jdk + //integTestRuntime "org.bouncycastle:bcprov-jdk15:1.46@jar" +--- a/gradle/buildSplits.gradle ++++ b/gradle/buildSplits.gradle +@@ -22,7 +22,6 @@ + "2": [ + ":toolingApi", + ":compositeBuilds", +- ":resourcesS3", + ":jetty", + ":resources", + ":jvmServices", +--- a/subprojects/ivy/ivy.gradle ++++ b/subprojects/ivy/ivy.gradle +@@ -25,7 +25,6 @@ + + testCompile libraries.groovy + integTestCompile project(":ear") +- integTestRuntime project(":resourcesS3") + integTestRuntime project(":resourcesSftp") + testFixturesCompile project(":internalIntegTesting") + } +--- a/subprojects/maven/maven.gradle ++++ b/subprojects/maven/maven.gradle +@@ -32,7 +32,6 @@ + testCompile libraries.xmlunit + + integTestCompile project(":ear") +- integTestRuntime project(":resourcesS3") + integTestRuntime project(":resourcesSftp") + + testFixturesCompile project(":internalIntegTesting") diff --git a/debian/patches/disable_tests.diff b/debian/patches/disable_tests.diff deleted file mode 100644 index 8d58ad5..0000000 --- a/debian/patches/disable_tests.diff +++ /dev/null @@ -1,639 +0,0 @@ -Description: Disable tests -Author: Kai-Chung Yan (殷啟聰) -Last-Update: 2016-10-20 -Forwarded: not-needed ---- a/build.gradle -+++ b/build.gradle -@@ -137,7 +137,6 @@ - } - } - --apply from: "gradle/testGroupings.gradle" - apply from: 'gradle/buildSplits.gradle' - ext { - jvm = org.gradle.internal.jvm.Jvm.current() -@@ -204,7 +203,6 @@ - apply from: "gradle/classycle.gradle" - apply from: "gradle/strictCompile.gradle" - apply from: "gradle/noDependencyResolutionDuringConfiguration.gradle" --apply from: "gradle/testSetup.gradle" - apply from: "gradle/taskOrdering.gradle" - apply from: "gradle/fix-GRADLE-2492.gradle" - apply from: 'gradle/customM2Check.gradle' -@@ -330,11 +328,6 @@ - installDirPropertyName = 'gradle_installPath' - } - --clean { -- dependsOn ':killExistingDaemons' --} -- --apply from: "gradle/intTestImage.gradle" - apply from: 'gradle/pullRequestBuild.gradle' - - // Generate a report showing which tests in a subproject are leaving ---- a/gradle/groovyProject.gradle -+++ b/gradle/groovyProject.gradle -@@ -57,27 +57,6 @@ - def sourceSet = params.sourceSet ?: "test" - def compileConfiguration = sourceSet == "main" ? "compile" : "${sourceSet}Compile" - def runtimeConfiguration = sourceSet == "main" ? "runtime" : "${sourceSet}Runtime" -- -- dependencies { -- add(compileConfiguration, project(path: projectPath, configuration: "testFixturesUsageCompile")) -- add(compileConfiguration, project(':internalTesting')) -- add(runtimeConfiguration, project(path: projectPath, configuration: "testFixturesUsageRuntime")) -- } --} -- --if (file("src/testFixtures").exists()) { -- apply from: "$rootDir/gradle/testFixtures.gradle" --} -- --apply from: "$rootDir/gradle/integTest.gradle" -- -- --if (file("src/performanceTest").exists()) { -- apply from: "$rootDir/gradle/performanceTest.gradle" --} -- --if (file("src/jmh").exists()) { -- apply from: "$rootDir/gradle/jmh.gradle" - } - - class ClasspathManifest extends DefaultTask { ---- a/subprojects/distributions/distributions.gradle -+++ b/subprojects/distributions/distributions.gradle -@@ -37,8 +37,6 @@ - dists - } - --daemonIntegTest.enabled = false -- - evaluationDependsOn ":docs" - - ext { -@@ -126,12 +124,4 @@ - - artifacts { - dists allZip, binZip, srcZip --} -- --integTest { -- inputs.files allZip, binZip, srcZip --} -- --java9IntegTest { -- inputs.files allZip, binZip, srcZip --} -+} -\ No newline at end of file ---- a/subprojects/tooling-api/tooling-api.gradle -+++ b/subprojects/tooling-api/tooling-api.gradle -@@ -9,44 +9,6 @@ - compile project(':wrapper') - compile project(':baseServices') - publishCompile libraries.slf4j_api -- -- testFixturesCompile project(':baseServicesGroovy') -- testFixturesCompile project(':internalIntegTesting') -- testCompile libraries.groovy -- -- // Need these to be loaded into the integTestRuntime, so that the modules are available on the classpath and the services can be registered -- // I think this is only really required for the TAPI tests in embedded mode, where we use `GradleConnector.useClasspathDistribution()`. -- integTestRuntime project(':ide') -- integTestRuntime project(':buildInit') -- integTestRuntime project(':buildComparison') -- integTestRuntime project(":ivy") -- integTestRuntime project(":maven") -- integTestRuntime project(":compositeBuilds") -- -- integTestRuntime project(":toolingApiBuilders") --} -- --useTestFixtures() --useTestFixtures(project: ":logging") --useTestFixtures(project: ':dependencyManagement') --useTestFixtures(project: ':ide') -- --integTestTasks.all { -- dependsOn({ rootProject.getTasksByName('publishLocalArchives', true) }, ':distributions:binZip') --} -- --forkingIntegTest { -- if (isCiServer) { -- maxParallelForks = Math.min(2, rootProject.maxParallelForks) -- } --} -- --parallelIntegTest { -- enabled = false //tooling integ tests use parallel settings, don't run --} -- --daemonIntegTest { -- enabled = false //tooling integ tests use daemon anyway, don't rerun - } - - task shadedJar(type: ShadedJar) { ---- a/subprojects/wrapper/wrapper.gradle -+++ b/subprojects/wrapper/wrapper.gradle -@@ -22,8 +22,6 @@ - - testCompile libraries.groovy - testCompile libraries.ant -- -- integTestRuntime rootProject.configurations.testRuntime.allDependencies - } - - task buildReceiptResource(type: Copy, dependsOn: rootProject.createBuildReceipt) { -@@ -39,9 +37,5 @@ - from configurations.runtime.allDependencies.withType(ProjectDependency).collect { it.dependencyProject.sourceSets.main.output } - } - --integTestTasks.all { -- inputs.files { project(":distributions").binZip } --} -- - useTestFixtures() - useClassycle() ---- a/subprojects/scala/scala.gradle -+++ b/subprojects/scala/scala.gradle -@@ -26,12 +26,4 @@ - compile project(":plugins") - - testCompile libraries.slf4j_api -- -- integTestRuntime project(":ide") --} -- --useTestFixtures(project: ":plugins") // includes core test fixtures -- --integTest { -- jvmArgs "-XX:MaxPermSize=1500m" // AntInProcessScalaCompilerIntegrationTest needs lots of permgen - } ---- a/settings.gradle -+++ b/settings.gradle -@@ -45,16 +45,9 @@ - include 'toolingApi' - include 'toolingApiBuilders' - include 'docs' --include 'integTest' - include 'signing' - include 'ear' - include 'native' --include 'internalTesting' --include 'internalIntegTesting' --include 'internalPerformanceTesting' --include 'internalAndroidPerformanceTesting' --include 'performance' --include 'buildScanPerformance' - include 'javascript' - include 'buildComparison' - include 'reporting' -@@ -82,8 +75,6 @@ - include 'platformPlay' - include 'testKit' - include 'installationBeacon' --include 'soak' --include 'smokeTest' - include 'compositeBuilds' - - rootProject.name = 'gradle' ---- a/subprojects/announce/announce.gradle -+++ b/subprojects/announce/announce.gradle -@@ -18,7 +18,4 @@ - compile libraries.slf4j_api - compile project(':core') - testCompile libraries.groovy -- integTestRuntime project(':plugins') --} -- --useTestFixtures() -+} -\ No newline at end of file ---- a/subprojects/build-init/build-init.gradle -+++ b/subprojects/build-init/build-init.gradle -@@ -18,8 +18,6 @@ - compile project(':core') - compile project(':plugins') - compile project(':wrapper') -- integTestRuntime project(':maven') -- integTestRuntime project(':scala') - } - - dependencies { ---- a/subprojects/core/core.gradle -+++ b/subprojects/core/core.gradle -@@ -58,16 +58,6 @@ - - testRuntime libraries.xerces - testRuntime project(":diagnostics") -- -- testFixturesCompile project(":internalTesting") -- testFixturesCompile libraries.ivy -- -- testFixturesRuntime project(':dependencyManagement') -- testFixturesRuntime project(':pluginUse') -- -- integTestCompile project(":internalIntegTesting") -- -- integTestRuntime project(":plugins") - } - - useTestFixtures() ---- a/subprojects/ivy/ivy.gradle -+++ b/subprojects/ivy/ivy.gradle -@@ -24,10 +24,6 @@ - compile project(':dependencyManagement') - - testCompile libraries.groovy -- integTestCompile project(":ear") -- integTestRuntime project(":resourcesS3") -- integTestRuntime project(":resourcesSftp") -- testFixturesCompile project(":internalIntegTesting") - } - - useTestFixtures() ---- a/subprojects/maven/maven.gradle -+++ b/subprojects/maven/maven.gradle -@@ -30,12 +30,6 @@ - compile "org.codehaus.plexus:plexus-component-annotations-1.5:1.6@jar" - - testCompile libraries.xmlunit -- -- integTestCompile project(":ear") -- integTestRuntime project(":resourcesS3") -- integTestRuntime project(":resourcesSftp") -- -- testFixturesCompile project(":internalIntegTesting") - } - - useTestFixtures() ---- a/subprojects/open-api/open-api.gradle -+++ b/subprojects/open-api/open-api.gradle -@@ -1,9 +1,3 @@ - sourceCompatibility = javaVersion.java9Compatible ? 1.6 : 1.5 - --dependencies { -- integTestCompile libraries.groovy -- integTestCompile libraries.slf4j_api -- integTestCompile libraries.commons_lang --} -- - useTestFixtures() ---- a/subprojects/publish/publish.gradle -+++ b/subprojects/publish/publish.gradle -@@ -19,9 +19,6 @@ - compile project(':dependencyManagement') - - testCompile libraries.groovy -- -- integTestRuntime project(":ivy") -- integTestRuntime project(":maven") - } - - useTestFixtures() ---- a/subprojects/reporting/reporting.gradle -+++ b/subprojects/reporting/reporting.gradle -@@ -16,8 +16,6 @@ - compile 'com.googlecode.jatl:jatl:0.2.2' - - testCompile libraries.jsoup -- integTestRuntime project(':codeQuality') -- integTestRuntime project(':jacoco') - - reports "jquery:jquery.min:1.11.0@js" - } ---- a/subprojects/dependency-management/dependency-management.gradle -+++ b/subprojects/dependency-management/dependency-management.gradle -@@ -22,16 +22,6 @@ - compile libraries.maven3 - - testCompile libraries.groovy -- -- integTestRuntime project(":ivy") -- integTestRuntime project(":maven") -- integTestRuntime project(":resourcesHttp") -- integTestRuntime project(":resourcesS3") -- integTestRuntime project(":resourcesSftp") -- //this dependency is necessary to run IvySFtpResolverIntegrationTest on ibm jdk -- //integTestRuntime "org.bouncycastle:bcprov-jdk15:1.46@jar" -- -- testFixturesCompile project(":internalIntegTesting") - } - - useTestFixtures() ---- a/subprojects/diagnostics/diagnostics.gradle -+++ b/subprojects/diagnostics/diagnostics.gradle -@@ -21,10 +21,6 @@ - compile project(':reporting') - compile project(':platformBase') - compile project(':dependencyManagement') -- -- integTestRuntime project(':plugins') -- integTestRuntime project(':platformNative') -- integTestRuntime project(':languageNative') - } - - useTestFixtures() ---- a/subprojects/model-core/model-core.gradle -+++ b/subprojects/model-core/model-core.gradle -@@ -32,12 +32,6 @@ - compile libraries.asm - - testCompile libraries.groovy -- -- integTestCompile project(':core') -- integTestRuntime project(':plugins') -- -- testFixturesCompile project(':internalTesting') -- testFixturesCompile project(':core') - } - - useTestFixtures() ---- a/subprojects/platform-native/platform-native.gradle -+++ b/subprojects/platform-native/platform-native.gradle -@@ -20,12 +20,6 @@ - compile project(':core') - compile project(':platformBase') - compile project(':diagnostics') -- -- integTestRuntime project(':maven') -- // Required to test visual studio project file generation for generated sources -- integTestRuntime project(':ideNative') -- -- testFixturesCompile project(':internalIntegTesting') - } - - useTestFixtures() ---- a/subprojects/platform-jvm/platform-jvm.gradle -+++ b/subprojects/platform-jvm/platform-jvm.gradle -@@ -6,10 +6,6 @@ - compile project(":diagnostics") - - testCompile libraries.groovy -- -- // To pick up JavaToolChainInternal implementation -- // TODO - get rid of cycle -- integTestRuntime project(':languageJava') - } - - useTestFixtures() ---- a/subprojects/plugin-use/plugin-use.gradle -+++ b/subprojects/plugin-use/plugin-use.gradle -@@ -19,10 +19,6 @@ - compile project(":dependencyManagement") - compile project(":resourcesHttp") - compile libraries.gson -- -- integTestRuntime project(':plugins') -- -- testFixturesCompile project(":internalIntegTesting") - } - - useTestFixtures() ---- a/subprojects/plugins/plugins.gradle -+++ b/subprojects/plugins/plugins.gradle -@@ -44,8 +44,6 @@ - runtime libraries.commons_cli - - testCompile libraries.jsoup -- -- integTestRuntime project(":maven") - } - - evaluationDependsOn(":wrapper") ---- a/subprojects/testing-native/testing-native.gradle -+++ b/subprojects/testing-native/testing-native.gradle -@@ -21,8 +21,6 @@ - compile project(':testingBase') - - testCompile libraries.groovy -- -- integTestRuntime project(':ideNative') - } - - useTestFixtures() ---- a/subprojects/language-groovy/language-groovy.gradle -+++ b/subprojects/language-groovy/language-groovy.gradle -@@ -8,9 +8,6 @@ - compile project(":languageJava") - - testCompile libraries.groovy -- -- // TODO - get rid of this cycle -- integTestRuntime project(':plugins') - } - - useClassycle(exclude: ["org/gradle/api/internal/tasks/compile/**", "org/gradle/api/tasks/javadoc/**"]) ---- a/subprojects/language-java/language-java.gradle -+++ b/subprojects/language-java/language-java.gradle -@@ -6,9 +6,6 @@ - compile project(":core") - compile project(":platformJvm") - compile project(":languageJvm") -- -- // TODO - get rid of this cycle -- integTestRuntime project(':plugins') - } - - // These public packages have classes that are tangled with the corresponding internal package. ---- a/subprojects/language-jvm/language-jvm.gradle -+++ b/subprojects/language-jvm/language-jvm.gradle -@@ -8,8 +8,6 @@ - testCompile libraries.groovy - - testRuntime project(":languageJava") -- -- testFixturesCompile project(":internalIntegTesting") - } - - useClassycle() ---- a/subprojects/language-native/language-native.gradle -+++ b/subprojects/language-native/language-native.gradle -@@ -19,8 +19,6 @@ - compile project(':platformNative') - - testCompile libraries.groovy -- -- integTestRuntime project(":ideNative") - } - - useTestFixtures() ---- a/subprojects/platform-base/platform-base.gradle -+++ b/subprojects/platform-base/platform-base.gradle -@@ -4,7 +4,6 @@ - compile libraries.groovy - compile project(':core') - compile project(':dependencyManagement') -- testFixturesCompile project(path: ':modelCore', configuration: 'testFixturesUsageRuntime') - } - - //useClassycle(exclude: ['org.gradle.language.base.internal/**']) ---- a/subprojects/platform-play/platform-play.gradle -+++ b/subprojects/platform-play/platform-play.gradle -@@ -10,20 +10,7 @@ - compile project(":languageScala") - compile project(":javascript") - compile project(":diagnostics") -- -- integTestRuntime project(":compositeBuilds") -- integTestRuntime project(":idePlay") -- testFixturesCompile project(":internalIntegTesting") - } - --useTestFixtures() --useTestFixtures(project: ":languageScala", sourceSet: 'integTest') --useTestFixtures(project: ":languageJava", sourceSet: 'integTest') --useTestFixtures(project: ':languageJvm', sourceSet: 'testFixtures') --useTestFixtures(project: ":launcher", sourceSet: 'testFixtures') --useTestFixtures(project: ":dependencyManagement") --useTestFixtures(project: ":diagnostics") --useTestFixtures(project: ':platformBase') -- - useClassycle() - strictCompile() ---- a/gradle/buildSplits.gradle -+++ b/gradle/buildSplits.gradle -@@ -117,7 +117,7 @@ - def uncoveredProjects = subprojects.collect { ":${it.name}" } - coveredProjects - assert uncoveredProjects == [] : "The following projects should be added to a bucket: ${uncoveredProjects}" - --ext.runtimeProjectPaths = runtimeProjects.collect { it.path } -+ext.runtimeProjectPaths = subprojects.collect { it.path } - - //Make sure there are no duplicates between buckets - for (int bucket : buckets.keySet().collect{it as int}) { -@@ -159,13 +159,5 @@ - } - - def String resolveTask(String projectPath, String task) { -- if (testGroupings.containsKey(task)) { -- if (projectPath in runtimeProjectPaths) { -- return testGroupings[task] -- } else { -- return null -- } -- } else { -- return task -- } -+ return task - } ---- a/subprojects/launcher/launcher.gradle -+++ b/subprojects/launcher/launcher.gradle -@@ -18,30 +18,9 @@ - - compile libraries.slf4j_api - -- testCompile libraries.groovy -- -- integTestCompile project(':internalIntegTesting') -- integTestRuntime project(':plugins') -- -- testFixturesCompile project(':internalIntegTesting') -- -- // Needed for testing debug command line option -- testFixturesCompile files(Jvm.current().toolsJar?:[]) -- - startScriptGenerator project(':plugins') - } - --useTestFixtures() --useTestFixtures(project: ':languageJava') --useTestFixtures(project: ':messaging') --useTestFixtures(project: ":logging") -- --integTestTasks.all { -- if (isCiServer) { -- maxParallelForks = Math.min(3, rootProject.maxParallelForks) -- } --} -- - jar { - manifest.mainAttributes('Main-Class': "org.gradle.launcher.GradleMain") - doFirst { -@@ -90,13 +69,6 @@ - } - } - --daemonIntegTest { -- //those tests are always using the daemon, they use exclusive daemons and they are a part of a regular check-in build anyway. -- //since they are using exclusive daemons they don't contribute to the daemonIntegTest stress/load test. -- //excluding to avoid unnecessary re-running and stealing resources. -- exclude "org/gradle/launcher/daemon/**/*" --} -- - useClassycle() - - verifyTestFilesCleanup.errorWhenNotEmpty = false ---- a/subprojects/logging/logging.gradle -+++ b/subprojects/logging/logging.gradle -@@ -14,12 +14,8 @@ - compile project(":messaging") - compile project(":cli") - -- testCompile project(":internalTesting") -- - runtime libraries.log4j_to_slf4j - runtime libraries.jcl_to_slf4j - } - --useTestFixtures() -- - useClassycle(exclude: ["org/gradle/internal/featurelifecycle/**"]) ---- a/subprojects/ide-play/ide-play.gradle -+++ b/subprojects/ide-play/ide-play.gradle -@@ -19,13 +19,8 @@ - compile project(':core') - compile project(":ide") - compile project(':platformPlay') -- -- integTestRuntime project(':compositeBuilds') - } - --useTestFixtures() --useTestFixtures(project: ":platformPlay") --useTestFixtures(project: ":ide") - useClassycle() - strictCompile() - ---- a/subprojects/task-cache-http/task-cache-http.gradle -+++ b/subprojects/task-cache-http/task-cache-http.gradle -@@ -21,10 +21,7 @@ - compile libraries.commons_httpclient - - testCompile libraries.groovy -- -- integTestCompile libraries.jetty - } - --useTestFixtures() - useClassycle() - strictCompile() ---- a/subprojects/composite-builds/composite-builds.gradle -+++ b/subprojects/composite-builds/composite-builds.gradle -@@ -2,13 +2,6 @@ - compile project(':core') - compile project(':dependencyManagement') - compile project(':launcher') -- -- integTestRuntime project(":toolingApiBuilders") -- integTestRuntime project(":pluginDevelopment") -- integTestRuntime project(":testKit") - } - --useTestFixtures(project: ':dependencyManagement') --useTestFixtures(project: ':ide') -- - verifyTestFilesCleanup.errorWhenNotEmpty = false ---- a/subprojects/test-kit/test-kit.gradle -+++ b/subprojects/test-kit/test-kit.gradle -@@ -12,8 +12,6 @@ - systemProperties['org.gradle.integtest.executer'] = 'forking' - } - --crossVersionIntegTest.dependsOn testKitVersionCompatibilityIntegTest -- - strictCompile() - useTestFixtures() - diff --git a/debian/patches/generate_pom.diff b/debian/patches/generate_pom.diff index 0701ef7..1341ea7 100644 --- a/debian/patches/generate_pom.diff +++ b/debian/patches/generate_pom.diff @@ -7,7 +7,7 @@ Last-Updtae: 2016-09-08 Forwarded: not-needed --- a/build.gradle +++ b/build.gradle -@@ -225,6 +225,7 @@ +@@ -227,6 +227,7 @@ apply from: "$rootDir/gradle/java9.gradle" check.dependsOn ":docs:checkstyleApi" check.dependsOn "codeQuality" diff --git a/debian/patches/groovy-jar.patch b/debian/patches/groovy-jar.patch index b4b5f14..e14a27b 100644 --- a/debian/patches/groovy-jar.patch +++ b/debian/patches/groovy-jar.patch @@ -22,7 +22,7 @@ Description: Tweaks the Groovy classpath detection logic to recognize the groovy public boolean isGroovyAll() { --- a/gradle/groovyProject.gradle +++ b/gradle/groovyProject.gradle -@@ -84,6 +84,7 @@ +@@ -97,6 +97,7 @@ properties.runtime = input.fileCollection { (it instanceof ExternalDependency) || (it instanceof FileCollectionDependency) }.collect { it.name }.join(',') diff --git a/debian/patches/jcommander.diff b/debian/patches/jcommander.diff index 7515c5a..224b7cf 100644 --- a/debian/patches/jcommander.diff +++ b/debian/patches/jcommander.diff @@ -4,15 +4,14 @@ Last-Update: 2016-09-08 Forwarded: not-needed --- a/subprojects/maven/maven.gradle +++ b/subprojects/maven/maven.gradle -@@ -30,6 +30,8 @@ +@@ -28,6 +28,7 @@ + compile "org.sonatype.pmaven:pmaven-common:0.8-20100325@jar" + compile "org.sonatype.pmaven:pmaven-groovy:0.8-20100325@jar" compile "org.codehaus.plexus:plexus-component-annotations-1.5:1.6@jar" ++ compile 'com.beust:jcommander:1.x' testCompile libraries.xmlunit -+ -+ compile 'com.beust:jcommander:1.x' - } - useTestFixtures() --- a/subprojects/antlr/antlr.gradle +++ b/subprojects/antlr/antlr.gradle @@ -22,6 +22,7 @@ diff --git a/debian/patches/series b/debian/patches/series index 31af463..098909b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,7 +1,6 @@ use_local_artifacts.diff 34_disable_code_quality.diff 33_scala_zinc.diff -disable_tests.diff docs.diff search_system_jar.diff disable_aws.diff diff --git a/debian/patches/use_local_artifacts.diff b/debian/patches/use_local_artifacts.diff index 4b71431..6ff7123 100644 --- a/debian/patches/use_local_artifacts.diff +++ b/debian/patches/use_local_artifacts.diff @@ -278,3 +278,13 @@ Last-Update: 2016-10-20 testCompile libraries.xmlunit +--- a/gradle/testSetup.gradle ++++ b/gradle/testSetup.gradle +@@ -2,6 +2,6 @@ + // Calculate the set of released versions - do this at configuration time because we need this to create various tasks + // At some point, make this a configuration rule + ext.releasedVersions = new org.gradle.build.ReleasedVersions() +-releasedVersions.destFile = new File(buildDir, "all-released-versions.json") ++releasedVersions.destFile = file("${rootDir}/debian/additionalSrc/resources/all-released-versions.json") + releasedVersions.offline = gradle.startParameter.offline + releasedVersions.prepare() diff --git a/debian/rules b/debian/rules index 9cee253..c06caaa 100755 --- a/debian/rules +++ b/debian/rules @@ -1,6 +1,11 @@ #!/usr/bin/make -f -GRADLE_TASKS = assemble startScripts docs -x :distributions:assemble +GRADLE_TASKS = assemble startScripts docs +GRADLE_EXCLUDED_PROJECTS = distributions \ + internalAndroidPerformanceTesting \ + internalTesting \ + internalIntegTesting \ + internalPerformanceTesting export GRADLE_VERSION = $(shell cat version.txt) # Only for debug purpose @@ -9,7 +14,8 @@ export GRADLE_VERSION = $(shell cat version.txt) # Under fakeroot Gradle will show error while creating /root/.gradle, hence # specifies the Gradle home location GRADLE_FLAGS = --project-prop finalRelease=true --offline --stacktrace \ - --gradle-user-home debian/.gradlehome + --gradle-user-home debian/.gradlehome \ + $(patsubst %,-x :%:assemble,$(GRADLE_EXCLUDED_PROJECTS)) # Support for DEB_BUILD_OPTIONS parallel=n ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gradle.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
