This is an automated email from the git hooks/post-receive script. seamlik-guest pushed a commit to branch master in repository gradle.
commit 70f4836b65ba776d5192531fe9f66d5c6943ac02 Author: Kai-Chung Yan <[email protected]> Date: Wed Jul 8 16:37:09 2015 +0800 Make ant and groovy2 versionless --- debian/changelog | 1 + debian/control | 1 - debian/libgradle-core-java.links | 2 -- debian/patches/use_local_artifacts.diff | 14 ++++++++++---- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index fd1eac9..4ca4c43 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ gradle (2.4-1) UNRELEASED; urgency=low * d/control: Remove maven from Depends * d/control: Remove bintray-client-java from (Build-)Depends * d/control: Change Groovy dependencies to groovy2 + * d/control: Remove groovy from Build-Conflicts * d/watch: Watch services.gradle.org * d/copyright: Add Files-Excluded for uscan * d/rules: Simplify get-orig-source target diff --git a/debian/control b/debian/control index c7278d1..26a0e96 100644 --- a/debian/control +++ b/debian/control @@ -75,7 +75,6 @@ Build-Depends: ant, maven (>= 3), pandoc, testng -Build-Conflicts: groovy (>= 2.0.0~) Standards-Version: 3.9.6 Vcs-Git: git://anonscm.debian.org/pkg-java/gradle.git Vcs-Browser: http://anonscm.debian.org/cgit/pkg-java/gradle.git diff --git a/debian/libgradle-core-java.links b/debian/libgradle-core-java.links deleted file mode 100644 index b4ebeb2..0000000 --- a/debian/libgradle-core-java.links +++ /dev/null @@ -1,2 +0,0 @@ -# Gradle fails to build if removing Groovy version -usr/share/java/groovy-all-2.x.jar usr/share/gradle/lib/groovy-all-2.3.10.jar \ No newline at end of file diff --git a/debian/patches/use_local_artifacts.diff b/debian/patches/use_local_artifacts.diff index e9006f7..610f707 100644 --- a/debian/patches/use_local_artifacts.diff +++ b/debian/patches/use_local_artifacts.diff @@ -6,7 +6,7 @@ Description: Use local jar files to build Gradle. The core point is using it dynamically loads libraries using its own mechanism and maintains classpaths. Author: Kai-Chung Yan <[email protected]> -Last-Update: 2015-07-02 +Last-Update: 2015-07-08 --- a/build.gradle +++ b/build.gradle @@ -129,7 +129,7 @@ @@ -48,8 +48,14 @@ Last-Update: 2015-07-02 apply from: '../gradle/taskOrdering.gradle' --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle -@@ -29,17 +29,17 @@ - dependency 'org.apache.ant:ant-launcher:1.9.4@jar' +@@ -25,21 +25,21 @@ + + versions.bouncycastle = "1.51" + +-libraries.ant = dependencies.module('org.apache.ant:ant:1.9.4') { +- dependency 'org.apache.ant:ant-launcher:1.9.4@jar' ++libraries.ant = dependencies.module('org.apache.ant:ant') { ++ dependency 'org.apache.ant:ant-launcher' } -libraries.asm = 'org.ow2.asm:asm-all:5.0.3' @@ -106,7 +112,7 @@ Last-Update: 2015-07-02 + guava: 'com.google.guava:guava', jsr305: 'com.google.code.findbugs:jsr305:1.3.9@jar', - groovy: "org.codehaus.groovy:groovy-all:${versions.groovy}", -+ groovy: "org.codehaus.groovy:groovy-all-2.x:${versions.groovy}", ++ groovy: "org.codehaus.groovy:groovy-all-2.x:debian", jaxen: 'jaxen:jaxen:1.1@jar', - jcip: "net.jcip:jcip-annotations:1.0@jar", + jcip: "net.jcip:jcip-annotations", -- 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
