This is an automated email from the git hooks/post-receive script. seamlik-guest pushed a commit to branch master in repository gradle-1.12.
commit 9d3ab4da5e066439951111d7b32be0b5be5a24f2 Author: Kai-Chung Yan <[email protected]> Date: Wed Jun 3 17:39:22 2015 +0800 disable_buildSrc_tests.diff: Disabling buildSrc tests now happens in build scripts --- debian/changelog | 1 + debian/patches/disable_buildSrc_tests.diff | 23 +++++++++++++++++++++++ debian/patches/do_not_use_jdk5_guava.diff | 2 +- debian/patches/series | 3 ++- debian/rules | 12 ++++-------- 5 files changed, 31 insertions(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index b441117..241c6b6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ gradle (1.12-1) UNRELEASED; urgency=low - gradle-wrapper.jar from libgradle-core-java to libgradle-plugins-java * Remove all symlinks * Abandon 90_respect_user_java_home.diff + * d/patches/disable_buildSrc_tests.diff: Disable buildSrc tests * d/patches/fix_asm5_version.diff: Fix ASM version mismatch * d/docs: Add LICENSE and NOTICE to every package diff --git a/debian/patches/disable_buildSrc_tests.diff b/debian/patches/disable_buildSrc_tests.diff new file mode 100644 index 0000000..5cfc2c6 --- /dev/null +++ b/debian/patches/disable_buildSrc_tests.diff @@ -0,0 +1,23 @@ +Description: Runing a build scripts always run the tests of buildSrc, hence + disable it. +Author: Kai-Chung Yan <[email protected]> +Last-Update: 2015-06-03 +--- a/buildSrc/build.gradle ++++ b/buildSrc/build.gradle +@@ -44,3 +44,15 @@ + apply from: '../gradle/compile.gradle' + //apply from: '../gradle/codeQuality.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/do_not_use_jdk5_guava.diff b/debian/patches/do_not_use_jdk5_guava.diff index f9339a7..9d23dbc 100644 --- a/debian/patches/do_not_use_jdk5_guava.diff +++ b/debian/patches/do_not_use_jdk5_guava.diff @@ -1,6 +1,6 @@ --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle -@@ -27,7 +27,7 @@ +@@ -28,7 +28,7 @@ dependencies { compile gradleApi() diff --git a/debian/patches/series b/debian/patches/series index 48c3a57..f209e82 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,10 +1,11 @@ use_local_artifacts.diff +34_disable_code_quality.diff +disable_buildSrc_tests.diff do_not_use_jdk5_guava.diff fix_asm5_version.diff fix_DocGenerationException.diff 03_plexus.diff 13_fix_javadocs_links.diff -34_disable_code_quality.diff 36_java8_compatibility.diff fix_buildInit.diff fix_launcher.diff diff --git a/debian/rules b/debian/rules index 84abd96..0b1c23a 100755 --- a/debian/rules +++ b/debian/rules @@ -28,27 +28,23 @@ override_dh_auto_build: # make the codes available inside buildSrc. cp -r subprojects/base-services/src/main/java/ buildSrc/src/main/ - # Disable compiling the buildSrc tests - mv -T buildSrc/src/test/ buildSrc/src/no-test/ - gradle $(GRADLE_TASKS) $(GRADLE_FLAGS) pod2man -c '' -r '' debian/gradle.pod > debian/gradle.1 - rm -rf .gradle/ .gradlehome/ buildSrc/.gradle/ buildSrc/build/ buildSrc/src/main/java/ - mv -T buildSrc/src/no-test/ buildSrc/src/test/ + rm -rf .gradle/ .gradlehome/ buildSrc/.gradle/ buildSrc/build/ + rm -rf buildSrc/src/main/java/ override_dh_auto_clean: dh_auto_clean # buildSrc must be prepared well before all Gradle operations cp -r subprojects/base-services/src/main/java/ buildSrc/src/main/ - mv -T buildSrc/src/test/ buildSrc/src/no-test/ gradle clean $(GRADLE_FLAGS) rm -rf debian/gradle.1 - rm -rf .gradle/ .gradlehome/ buildSrc/.gradle/ buildSrc/build/ buildSrc/src/main/java/ - mv -T buildSrc/src/no-test/ buildSrc/src/test/ + rm -rf .gradle/ .gradlehome/ buildSrc/.gradle/ buildSrc/build/ + rm -rf buildSrc/src/main/java/ get-orig-source: cd $(dir $(firstword $(MAKEFILE_LIST)))../ && \ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gradle-1.12.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
