[libspring-java] 05/07: Fixed a compatibility issue with Gradle 2

[Emmanuel Bourg]

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

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

commit 67b76986ff16d03ba2118b05582d6de2acd58515
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Oct 22 00:26:50 2015 +0200

    Fixed a compatibility issue with Gradle 2
---
 debian/changelog                                |  1 +
 debian/patches/0031-gradle2-compatibility.patch | 13 +++++++++++++
 debian/patches/series                           |  1 +
 3 files changed, 15 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 076d651..90f515b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libspring-java (3.2.13-4) UNRELEASED; urgency=medium
 
   * Team upload.
   * Fixed the build failure with Quartz 1.8.6
+  * Fixed a compatibility issue with Gradle 2
   * Removed the compatibility patches for Gradle < 1.7
   * Removed the dependency on the Servlet API from the binary packages
 
diff --git a/debian/patches/0031-gradle2-compatibility.patch b/debian/patches/0031-gradle2-compatibility.patch
new file mode 100644
index 0000000..9cb8bb0
--- /dev/null
+++ b/debian/patches/0031-gradle2-compatibility.patch
@@ -0,0 +1,13 @@
+Description: Fixes the compatibility with Gradle 2
+Origin: backport, https://github.com/spring-projects/spring-framework/commit/7497391
+--- a/buildSrc/src/main/groovy/org/springframework/build/gradle/MergePlugin.groovy
++++ b/buildSrc/src/main/groovy/org/springframework/build/gradle/MergePlugin.groovy
+@@ -69,7 +69,7 @@
+ 
+ 		// Ensure the IDE can reference merged projects
+ 		project.eclipse.classpath.plusConfigurations += [runtimeMerge]
+-		project.idea.module.scopes.PROVIDED.plus += runtimeMerge
++		project.idea.module.scopes.PROVIDED.plus += [runtimeMerge]
+ 
+ 		// Hook to perform the actual merge logic
+ 		project.afterEvaluate{
diff --git a/debian/patches/series b/debian/patches/series
index e15ddb1..d20760f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@
 0028-disable-jdiff-report.patch
 0029-use-jruby-core.patch
 0030-tomcat7-compatibility.patch
+0031-gradle2-compatibility.patch

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