This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository gradle.
commit a420c8ad88a2df87581564bad38562a3490c8624 Author: Emmanuel Bourg <[email protected]> Date: Wed Dec 30 13:05:44 2015 +0100 Build depend on libspock-java >= 0.7 and drop disable_buildSrc_tests.diff --- debian/changelog | 1 + debian/control | 2 +- debian/patches/disable_buildSrc_tests.diff | 34 ------------------------------ debian/patches/series | 1 - debian/patches/use_local_artifacts.diff | 3 ++- 5 files changed, 4 insertions(+), 37 deletions(-) diff --git a/debian/changelog b/debian/changelog index b2be2f8..f647fd0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ gradle (2.8-1) UNRELEASED; urgency=medium - Refreshed the patches - Updated the Lintian overrides libgradle-core-java * Re-use the faster clean logic from gradle-debian-helper + * Build depend on libspock-java >= 0.7 and drop disable_buildSrc_tests.diff -- Emmanuel Bourg <[email protected]> Tue, 29 Dec 2015 23:26:47 +0100 diff --git a/debian/control b/debian/control index 293d618..7674fe2 100644 --- a/debian/control +++ b/debian/control @@ -65,7 +65,7 @@ Build-Depends: ant, librhino-java, libservlet3.1-java, libslf4j-java, - libspock-java, + libspock-java (>= 0.7), libtomcat8-java, libxalan2-java, libxbean-java, diff --git a/debian/patches/disable_buildSrc_tests.diff b/debian/patches/disable_buildSrc_tests.diff deleted file mode 100644 index 9ab63c9..0000000 --- a/debian/patches/disable_buildSrc_tests.diff +++ /dev/null @@ -1,34 +0,0 @@ -Description: - Runing a build scripts always run the tests of buildSrc, which produces - error because current version of Spock Framework (0.6-groovy-1.8) is not - compatible with Groovy 2. -Author: Kai-Chung Yan <[email protected]> -Last-Update: 2015-06-03 ---- a/buildSrc/build.gradle -+++ b/buildSrc/build.gradle -@@ -28,8 +28,6 @@ - compile 'com.google.guava:guava:[14.0.1, )@jar' - compile 'commons-lang:commons-lang:2.6@jar' - compile localGroovy() -- testCompile 'junit:junit:4.12@jar' -- testCompile 'org.spockframework:spock-core:0.7-groovy-2.0@jar', 'cglib:cglib-nodep:2.2', 'org.objenesis:objenesis:1.2' - - compile "org.pegdown:pegdown:[1.1.0, )" - compile "org.jsoup:jsoup:1.6.3" -@@ -42,3 +40,15 @@ - apply from: '../gradle/compile.gradle' - apply from: '../gradle/taskOrdering.gradle' - apply from: '../gradle/classycle.gradle' -+ -+// Disable buildSrc tests -+sourceSets { -+ test { -+ groovy { -+ exclude "**" -+ } -+ resources { -+ exclude "**" -+ } -+ } -+} -\ No newline at end of file diff --git a/debian/patches/series b/debian/patches/series index 2efeba8..ac5be31 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1,5 @@ use_local_artifacts.diff 34_disable_code_quality.diff -disable_buildSrc_tests.diff 30_envjs.diff 33_scala_zinc.diff disable_distributions.diff diff --git a/debian/patches/use_local_artifacts.diff b/debian/patches/use_local_artifacts.diff index fb17fc0..df6a8ca 100644 --- a/debian/patches/use_local_artifacts.diff +++ b/debian/patches/use_local_artifacts.diff @@ -37,7 +37,8 @@ Last-Update: 2015-07-08 compile 'commons-lang:commons-lang:2.6@jar' compile localGroovy() testCompile 'junit:junit:4.12@jar' - testCompile 'org.spockframework:spock-core:0.7-groovy-2.0@jar', 'cglib:cglib-nodep:2.2', 'org.objenesis:objenesis:1.2' +- testCompile 'org.spockframework:spock-core:0.7-groovy-2.0@jar', 'cglib:cglib-nodep:2.2', 'org.objenesis:objenesis:1.2' ++ testCompile 'org.spockframework:spock-core:0.7-groovy-2.0@jar', 'cglib:cglib3-nodep', 'org.objenesis:objenesis:1.2' - compile "org.pegdown:pegdown:1.1.0" + compile "org.pegdown:pegdown:[1.1.0, )" -- 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
