[groovy2] 01/03: Add mavenRepo.patch

[Markus Koschany]

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

apo-guest pushed a commit to branch master
in repository groovy2.

commit df40bf318d8a87d98f04da1823c4d1913e0c01f6
Author: Markus Koschany <apo at gambaru.de>
Date:   Mon Aug 17 12:47:41 2015 +0200

    Add mavenRepo.patch
---
 debian/patches/mavenRepo.patch | 80 ++++++++++++++++++++++++++++++++++++++++++
 debian/patches/series          |  4 +--
 2 files changed, 81 insertions(+), 3 deletions(-)

diff --git a/debian/patches/mavenRepo.patch b/debian/patches/mavenRepo.patch
new file mode 100644
index 0000000..73f8275
--- /dev/null
+++ b/debian/patches/mavenRepo.patch
@@ -0,0 +1,80 @@
+From: Markus Koschany <apo at gambaru.de>
+Date: Mon, 17 Aug 2015 12:39:07 +0200
+Subject: mavenRepo
+
+Fix FTBFS with gradle 2.5 because the old mavenRepo function was removed.
+
+Forwarded: no
+---
+ build.gradle           | 13 +++++++++----
+ gradle/codehaus.gradle |  4 +++-
+ gradle/utils.gradle    |  4 +++-
+ 3 files changed, 15 insertions(+), 6 deletions(-)
+
+diff --git a/build.gradle b/build.gradle
+index 2c9ab8e..95df239 100644
+--- a/build.gradle
++++ b/build.gradle
+@@ -1,7 +1,8 @@
+ buildscript {
+     repositories {
+-      
+-       mavenRepo url: "file:///usr/share/maven-repo"
++       maven {
++            url "file:///usr/share/maven-repo"
++       }
+     }
+ 
+     dependencies {
+@@ -35,7 +36,9 @@ allprojects {
+     group = 'org.codehaus.groovy'
+     version = groovyVersion
+     repositories {
+-         mavenRepo url: "file:///usr/share/maven-repo"
++        maven {
++            url "file:///usr/share/maven-repo"
++        }
+     }
+ 
+     apply plugin: 'groovy'
+@@ -78,7 +81,9 @@ subprojects {
+ 
+ repositories {
+     // todo Some repos are needed only for some configs. Declare them just for the configuration once Gradle allows this.
+-       mavenRepo url: "file:///usr/share/maven-repo"
++       maven {
++            url "file:///usr/share/maven-repo"
++       }
+ }
+ 
+ // todo do we need compile and runtime scope for examples?
+diff --git a/gradle/codehaus.gradle b/gradle/codehaus.gradle
+index afdd329..7377135 100644
+--- a/gradle/codehaus.gradle
++++ b/gradle/codehaus.gradle
+@@ -5,7 +5,9 @@ import groovy.io.*
+ buildscript {
+     repositories {
+        // mavenCentral()
+-       mavenRepo url: "file:///usr/share/maven-repo"
++       maven {
++            url "file:///usr/share/maven-repo"
++       }
+     }
+     dependencies {
+         classpath 'com.github.lookfirst:sardine:5.0.1'
+diff --git a/gradle/utils.gradle b/gradle/utils.gradle
+index 60367bb..c7ae7b5 100644
+--- a/gradle/utils.gradle
++++ b/gradle/utils.gradle
+@@ -25,7 +25,9 @@ import static org.objectweb.asm.Opcodes.*
+ buildscript {
+     repositories {
+        // mavenCentral()
+-       mavenRepo url: "file:///usr/share/maven-repo"
++       maven {
++            url "file:///usr/share/maven-repo"
++       }
+     }
+     dependencies {
+         classpath "org.ow2.asm:asm:$asmVersion"
diff --git a/debian/patches/series b/debian/patches/series
index bd142b5..8a4570a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,12 +1,10 @@
 01_fix_doc_gradle.diff
 02_fix_gradle_build.diff
 02_fix_start_script.diff
-
-
-
 fix_for_gradle-1.12.diff
 change_bsf_dependencies_version.diff
 change_servlet_dependency_version.diff
 change_junit_version.diff
 change_testng_dependency_version.diff
 CVE-2015-3253.patch
+mavenRepo.patch

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