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 ab871b044c4f617c431053e58568aa3b49212e06 Author: Kai-Chung Yan <[email protected]> Date: Sat Jun 13 00:32:02 2015 +0800 Reintroduce 30_envjs.diff for simpleframework is still not in Debian --- debian/patches/30_envjs.diff | 24 ++++++++++++++++++++++++ debian/patches/rhino_rename.diff | 5 ++--- debian/patches/series | 1 + 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/debian/patches/30_envjs.diff b/debian/patches/30_envjs.diff new file mode 100644 index 0000000..b7e2bd4 --- /dev/null +++ b/debian/patches/30_envjs.diff @@ -0,0 +1,24 @@ +Description: Disable envjs build. + org.simpleframework is not available in Debian yet, so + disable envjs build in javascript plugin. +Author: Damien Raude-Morvan <[email protected]> +Forwarded: not-needed +Last-Update: 2012-08-18 + +--- a/subprojects/javascript/javascript.gradle ++++ b/subprojects/javascript/javascript.gradle +@@ -19,7 +19,6 @@ + + compile "org.mozilla:rhino:1.7R3" + compile libraries.gson // used by JsHint +- compile "org.simpleframework:simple:4.1.21" // used by http package in envjs + compile project(':core'), project(":plugins") + compile libraries.inject + +@@ -27,4 +26,6 @@ + compile project(':coreImpl') + } + ++sourceSets.main.groovy.excludes = ["org/gradle/plugins/javascript/envjs/**"] ++ + useTestFixtures() diff --git a/debian/patches/rhino_rename.diff b/debian/patches/rhino_rename.diff index 2bd8a9b..3c86c38 100644 --- a/debian/patches/rhino_rename.diff +++ b/debian/patches/rhino_rename.diff @@ -4,13 +4,12 @@ Author: Kai-Chung <[email protected]> Last-Update: 2015-06-03 --- a/subprojects/javascript/javascript.gradle +++ b/subprojects/javascript/javascript.gradle -@@ -17,7 +17,8 @@ +@@ -17,7 +17,7 @@ dependencies { compile libraries.groovy - compile "org.mozilla:rhino:1.7R3" -+ //compile "org.mozilla:rhino:1.7R3" + compile "rhino:js:[1.7R3, )" compile libraries.gson // used by JsHint - compile "org.simpleframework:simple:4.1.21" // used by http package in envjs compile project(':core'), project(":plugins") + compile libraries.inject diff --git a/debian/patches/series b/debian/patches/series index fb4935a..60f212a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,6 +6,7 @@ asm5_version.diff fix_DocGenerationException.diff 03_plexus.diff 11_fix_jni_path.diff +30_envjs.diff 35_ivy_23.diff 36_java8_compatibility.diff 37_replace_internal_testng_api.diff -- 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
