[gradle] 03/05: Merged maven_builder_support.diff into maven-3.3.9-compatibility.patch

[Emmanuel Bourg]

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

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

commit 75ad7e10ac4fc8e2f385510f6ba3d47b8b64887d
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Mar 2 14:57:12 2016 +0100

    Merged maven_builder_support.diff into maven-3.3.9-compatibility.patch
---
 debian/changelog                                            |  1 +
 ....9-compatibility.patch => maven-3.3-compatibility.patch} | 12 ++++++++++--
 debian/patches/maven_builder_support.diff                   | 13 -------------
 debian/patches/series                                       |  3 +--
 4 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 27907b0..8fc0679 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ gradle (2.10-2) UNRELEASED; urgency=medium
   * Replaced disable_release_notes.diff with a task exclusion parameter
   * Moved aether dependencies changes to eclipse-aether.diff
   * Merged maven-aether-provider.diff into eclipse-aether.diff
+  * Merged maven_builder_support.diff into maven-3.3.9-compatibility.patch
   * Standards-Version updated to 3.9.7 (no changes)
   * Use a secure Vcs-Git URL
 
diff --git a/debian/patches/maven-3.3.9-compatibility.patch b/debian/patches/maven-3.3-compatibility.patch
similarity index 50%
rename from debian/patches/maven-3.3.9-compatibility.patch
rename to debian/patches/maven-3.3-compatibility.patch
index 44b2fda..e510e3d 100644
--- a/debian/patches/maven-3.3.9-compatibility.patch
+++ b/debian/patches/maven-3.3-compatibility.patch
@@ -1,9 +1,17 @@
-Description: Fix the compatibility with Maven 3.3.9 by adding commons-lang3 to the classpath
+Description: Fix the compatibility with Maven 3.3
 Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: no
 --- a/gradle/dependencies.gradle
 +++ b/gradle/dependencies.gradle
-@@ -136,6 +136,8 @@
+@@ -117,6 +117,7 @@
+     dependency "org.apache.maven:maven3-compat"
+     dependency "org.apache.maven:maven3-model-builder"
+     dependency "org.apache.maven:maven3-model"
++    dependency "org.apache.maven:maven3-builder-support"
+ 
+     //somewhat core:
+     dependency "org.apache.maven:maven3-artifact"
+@@ -135,6 +136,8 @@
      dependency "org.eclipse.aether:eclipse-aether-spi"
      dependency "org.eclipse.aether:eclipse-aether-util"
      dependency 'org.eclipse.aether:eclipse-aether-connector-basic'
diff --git a/debian/patches/maven_builder_support.diff b/debian/patches/maven_builder_support.diff
deleted file mode 100644
index cf41845..0000000
--- a/debian/patches/maven_builder_support.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Description: maven-builder-support is also needed to run Gradle.
-Author: Kai-Chung Yan <seamlikok at gmail.com>
-Last-Update: 2015-07-22
---- a/gradle/dependencies.gradle
-+++ b/gradle/dependencies.gradle
-@@ -117,6 +117,7 @@
-     dependency "org.apache.maven:maven3-compat"
-     dependency "org.apache.maven:maven3-model-builder"
-     dependency "org.apache.maven:maven3-model"
-+    dependency "org.apache.maven:maven3-builder-support"
- 
-     //somewhat core:
-     dependency "org.apache.maven:maven3-artifact"
diff --git a/debian/patches/series b/debian/patches/series
index a19d9da..b0ccea3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,8 +12,7 @@ jcommander.diff
 nekohtml.diff
 relax_warnings.diff
 eclipse-aether.diff
-maven_builder_support.diff
 generate_classpath.diff
 generate_pom.diff
 ivy-2.4.0.patch
-maven-3.3.9-compatibility.patch
+maven-3.3-compatibility.patch

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