[bnd] 03/06: Fixed a build failure with Gradle 2.x

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Wed Dec 16 15:16:44 UTC 2015


This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository bnd.

commit 424f1120adcfde394bf1a774d418f93e74a50d7a
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Dec 16 15:54:11 2015 +0100

    Fixed a build failure with Gradle 2.x
---
 debian/changelog                          |  1 +
 debian/patches/gradle-compatibility.patch | 15 +++++++++++++++
 debian/patches/series                     |  1 +
 3 files changed, 17 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 0918c2e..7a4ba74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ bnd (2.3.0-1) UNRELEASED; urgency=medium
   * Team upload.
   * New upstream release
     - Refreshed the patches
+    - Fixed a build failure with Gradle 2.x
 
  -- Emmanuel Bourg <ebourg at apache.org>  Wed, 16 Dec 2015 12:54:06 +0100
 
diff --git a/debian/patches/gradle-compatibility.patch b/debian/patches/gradle-compatibility.patch
new file mode 100644
index 0000000..f48ca2d
--- /dev/null
+++ b/debian/patches/gradle-compatibility.patch
@@ -0,0 +1,15 @@
+--- a/cnf/gradle/template/clean.gradle
++++ b/cnf/gradle/template/clean.gradle
+@@ -44,10 +44,12 @@
+   }
+ 
+   /* regular gradle project dependencies */
++/*
+   dependsOnProjects.each {
+     cleanNeeded.dependsOn       += [":" + it.name + ":cleanNeeded"    ]
+     distcleanNeeded.dependsOn   += [":" + it.name + ":distcleanNeeded"]
+   }
++*/
+ 
+   /* bnd project dependencies */
+   if (hasProperty("bnd_project")) {
diff --git a/debian/patches/series b/debian/patches/series
index d9f84bf..7eb5fab 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ embedded-repo.patch
 implement-missing-methods.patch
 no-osgi.r5.patch
 #java8-compatibility.patch
+gradle-compatibility.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/bnd.git



More information about the pkg-java-commits mailing list