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 564d79a54ed4a0745b3f8dbd8c05b6c06f9bc568 Author: Kai-Chung Yan <[email protected]> Date: Thu Jun 4 15:33:23 2015 +0800 Resolve more dependencies --- debian/changelog | 11 ++++++++--- debian/control | 5 ++--- debian/patches/build_comparison_css.diff | 16 ++++++++++++++++ debian/patches/do_not_use_bcpg_jdk5.diff | 13 +++++++++++++ debian/patches/rhino_rename.diff | 16 ++++++++++++++++ debian/patches/series | 4 ++++ debian/patches/servlet_api.diff | 12 ++++++++++++ 7 files changed, 71 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index eb87ee9..a086f16 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,9 +9,14 @@ 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/patches/fix_bintray_name.diff: Correct the name of bintray library + * Multiple new patches under debian/patches/ + - disable_buildSrc_tests.diff: Disable buildSrc tests + - do_not_use_bcpg_jdk5.diff: bouncycastle libraries in Debian do not ship + with jdk5 versions + - fix_asm5_version.diff: Fix ASM version mismatch + - fix_bintray_name.diff: Correct the name of bintray library + - rhino_rename.diff: Correct the name of rhino library + - servlet_api.diff: Use libservlet2.5-java -- Kai-Chung Yan <[email protected]> Thu, 21 May 2015 16:02:50 +0800 diff --git a/debian/control b/debian/control index 84d8e69..df2f6f8 100644 --- a/debian/control +++ b/debian/control @@ -58,7 +58,7 @@ Build-Depends: ant (>= 1.8), liblogback-java (>= 1:0.9.28), libmaven-ant-tasks-java, libmina2-java, - libnative-platform-java, + libnative-platform-java (>= 0.10), libnekohtml-java, libplexus-cipher-java, libplexus-containers1.5-java, @@ -78,8 +78,7 @@ Build-Depends: ant (>= 1.8), libxslthl-java, maven (>= 3.0.4-4), quilt, - testng, - unzip + testng Build-Conflicts: groovy (>= 2.0.0~) Standards-Version: 3.9.6 Vcs-Git: git://anonscm.debian.org/pkg-java/gradle.git diff --git a/debian/patches/build_comparison_css.diff b/debian/patches/build_comparison_css.diff new file mode 100644 index 0000000..81ea949 --- /dev/null +++ b/debian/patches/build_comparison_css.diff @@ -0,0 +1,16 @@ +--- a/subprojects/build-comparison/build-comparison.gradle ++++ b/subprojects/build-comparison/build-comparison.gradle +@@ -29,11 +29,13 @@ + testCompile libraries.jsoup + } + ++/* + processResources { + into "org/gradle/api/plugins/buildcomparison/render/internal/html", { + from { project(":docs").css } + include "base.css" + } + } ++*/ + + useTestFixtures() diff --git a/debian/patches/do_not_use_bcpg_jdk5.diff b/debian/patches/do_not_use_bcpg_jdk5.diff new file mode 100644 index 0000000..5c792ef --- /dev/null +++ b/debian/patches/do_not_use_bcpg_jdk5.diff @@ -0,0 +1,13 @@ +--- a/subprojects/signing/signing.gradle ++++ b/subprojects/signing/signing.gradle +@@ -21,8 +21,8 @@ + compile project(":plugins") + compile project(":maven") + +- compile module("org.bouncycastle:bcpg-jdk15:1.46") { +- dependency "org.bouncycastle:bcprov-jdk15:1.46@jar" ++ compile module("org.bouncycastle:bcpg:1.46") { ++ dependency "org.bouncycastle:bcprov:1.46@jar" + } + } + diff --git a/debian/patches/rhino_rename.diff b/debian/patches/rhino_rename.diff new file mode 100644 index 0000000..2bd8a9b --- /dev/null +++ b/debian/patches/rhino_rename.diff @@ -0,0 +1,16 @@ +Description: Rename rhino.jar to js.jar because in Debian the Group ID and + Artifact ID are different to the upstream, which is strange. +Author: Kai-Chung <[email protected]> +Last-Update: 2015-06-03 +--- a/subprojects/javascript/javascript.gradle ++++ b/subprojects/javascript/javascript.gradle +@@ -17,7 +17,8 @@ + 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") diff --git a/debian/patches/series b/debian/patches/series index 26a7635..99747b5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -15,3 +15,7 @@ disable_distributions.diff disable_tests.diff remove_test_dependencies.diff fix_bintray_name.diff +build_comparison_css.diff +rhino_rename.diff +servlet_api.diff +do_not_use_bcpg_jdk5.diff diff --git a/debian/patches/servlet_api.diff b/debian/patches/servlet_api.diff new file mode 100644 index 0000000..1fb6211 --- /dev/null +++ b/debian/patches/servlet_api.diff @@ -0,0 +1,12 @@ +--- a/gradle/dependencies.gradle ++++ b/gradle/dependencies.gradle +@@ -55,7 +55,8 @@ + } + + // Jetty +-libraries.servlet_api = "org.mortbay.jetty:servlet-api:2.5-20081211@jar" ++//libraries.servlet_api = "org.mortbay.jetty:servlet-api:2.5-20081211@jar" ++libraries.servlet_api = "javax.servlet:servlet-api:[2.5, 3.0)" + libraries.jetty_util = dependencies.module("org.mortbay.jetty:jetty-util:6.1.25") { + dependency libraries.slf4j_api + dependency libraries.servlet_api -- 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
