This is an automated email from the git hooks/post-receive script. seamlik-guest pushed a commit to branch master in repository gradle.
commit 22fd89376994ef1769175cd17be775324194058d Author: Kai-Chung Yan (殷啟聰) <[email protected]> Date: Sun Sep 4 20:11:22 2016 +0800 Drop 3._envjs.diff: simpleframeworks is already in Debian --- debian/control | 2 ++ debian/patches/30_envjs.diff | 24 ------------------------ debian/patches/series | 2 +- 3 files changed, 3 insertions(+), 25 deletions(-) diff --git a/debian/control b/debian/control index c45fe47..037d7a7 100644 --- a/debian/control +++ b/debian/control @@ -63,6 +63,7 @@ Build-Depends: ant, libpolyglot-maven-java, librhino-java, libservlet3.1-java, + libsimple-http-java, libslf4j-java, libspock-java (>= 0.7), libtomcat8-java, @@ -169,6 +170,7 @@ Depends: ant-optional, libpolyglot-maven-java, librhino-java, libservlet3.1-java, + libsimple-http-java, libtomcat8-java, libxerces2-java, testng, diff --git a/debian/patches/30_envjs.diff b/debian/patches/30_envjs.diff deleted file mode 100644 index a1ccf6f..0000000 --- a/debian/patches/30_envjs.diff +++ /dev/null @@ -1,24 +0,0 @@ -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 "rhino:js" - 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(':dependencyManagement') - } - -+sourceSets.main.groovy.excludes = ["org/gradle/plugins/javascript/envjs/**"] -+ - useTestFixtures() diff --git a/debian/patches/series b/debian/patches/series index 9e1705b..df44837 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1,6 @@ use_local_artifacts.diff 34_disable_code_quality.diff -30_envjs.diff +#30_envjs.diff 33_scala_zinc.diff disable_tests.diff docs.diff -- 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
