[groovy] Use new XMvn resolver factory method

[Mikolaj Izdebski]

commit 501e8b6d532174ec4278223ef3c9d7aec8869753
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Sun Nov 9 23:00:06 2014 +0100

    Use new XMvn resolver factory method

 0003-Gradle-local-mode.patch |   18 +++++++++---------
 0004-Bintray.patch           |    6 +++---
 groovy.spec                  |    7 +++++--
 3 files changed, 17 insertions(+), 14 deletions(-)
---
diff --git a/0003-Gradle-local-mode.patch b/0003-Gradle-local-mode.patch
index fe72ffc..719cacb 100644
--- a/0003-Gradle-local-mode.patch
+++ b/0003-Gradle-local-mode.patch
@@ -1,4 +1,4 @@
-From f5884cef61941de4feeed67a32072cda32dc984b Mon Sep 17 00:00:00 2001
+From 2177bf210315917fa5dcb22d5600657e26aa1a3b Mon Sep 17 00:00:00 2001
 From: Mikolaj Izdebski <mizdebsk at redhat.com>
 Date: Thu, 23 Oct 2014 14:44:25 +0200
 Subject: [PATCH 3/4] Gradle local mode
@@ -10,14 +10,14 @@ Subject: [PATCH 3/4] Gradle local mode
  3 files changed, 5 insertions(+), 12 deletions(-)
 
 diff --git a/build.gradle b/build.gradle
-index d6f346b..ddc6417 100644
+index d6f346b..f95e47f 100644
 --- a/build.gradle
 +++ b/build.gradle
 @@ -7,18 +7,13 @@ if (JavaVersion.current().java6Compatible) {
  
  buildscript {
      repositories {
-+        add(new XMvn())
++        xmvn()
          jcenter()
          maven {
              name 'Bintray Asciidoctor repo'
@@ -37,7 +37,7 @@ index d6f346b..ddc6417 100644
      group = 'org.codehaus.groovy'
      version = groovyVersion
      repositories {
-+        add(new XMvn())
++        xmvn()
          jcenter()
      }
  
@@ -51,7 +51,7 @@ index d6f346b..ddc6417 100644
  }
  
  repositories {
-+    add(new XMvn())
++    xmvn()
      // todo Some repos are needed only for some configs. Declare them just for the configuration once Gradle allows this.
  //    mavenCentral() // default, tools
      maven { url 'http://www.aQute.biz/repo' } // tools
@@ -68,26 +68,26 @@ index d6f346b..ddc6417 100644
      tools "com.thoughtworks.qdox:qdox:$qdoxVersion"
      tools "biz.aQute:bnd:$bndVersion"
 diff --git a/gradle/codehaus.gradle b/gradle/codehaus.gradle
-index 66a6208..3018b9c 100644
+index 66a6208..5684566 100644
 --- a/gradle/codehaus.gradle
 +++ b/gradle/codehaus.gradle
 @@ -4,6 +4,7 @@ import groovy.io.*
  
  buildscript {
      repositories {
-+        add(new XMvn())
++        xmvn()
          mavenCentral()
      }
      dependencies {
 diff --git a/gradle/utils.gradle b/gradle/utils.gradle
-index 4360092..485c462 100644
+index 4360092..cee1425 100644
 --- a/gradle/utils.gradle
 +++ b/gradle/utils.gradle
 @@ -24,6 +24,7 @@ import static org.objectweb.asm.Opcodes.*
  
  buildscript {
      repositories {
-+        add(new XMvn())
++        xmvn()
          mavenCentral()
      }
      dependencies {
diff --git a/0004-Bintray.patch b/0004-Bintray.patch
index c4a061c..fa00c1a 100644
--- a/0004-Bintray.patch
+++ b/0004-Bintray.patch
@@ -1,4 +1,4 @@
-From 616440111265992dc20cb4db0ee82df652101e7f Mon Sep 17 00:00:00 2001
+From a4c6914113f89ce47a5780381c21dc600f06682b Mon Sep 17 00:00:00 2001
 From: Mikolaj Izdebski <mizdebsk at redhat.com>
 Date: Fri, 24 Oct 2014 14:25:15 +0200
 Subject: [PATCH 4/4] Bintray
@@ -10,7 +10,7 @@ Subject: [PATCH 4/4] Bintray
  3 files changed, 4 insertions(+), 31 deletions(-)
 
 diff --git a/build.gradle b/build.gradle
-index ddc6417..31f49bb 100644
+index f95e47f..691719f 100644
 --- a/build.gradle
 +++ b/build.gradle
 @@ -1,10 +1,6 @@
@@ -23,7 +23,7 @@ index ddc6417..31f49bb 100644
 -
  buildscript {
      repositories {
-         add(new XMvn())
+         xmvn()
 @@ -114,7 +110,6 @@ ext {
      luceneVersion = '4.3.1'
      openejbVersion = '1.0'
diff --git a/groovy.spec b/groovy.spec
index 524577e..64da651 100644
--- a/groovy.spec
+++ b/groovy.spec
@@ -4,7 +4,7 @@
 
 Name:           groovy
 Version:        2.3.7
-Release:        0.3%{?dist}
+Release:        0.4%{?dist}
 Summary:        Dynamic language for the Java Platform
 
 # Some of the files are licensed under BSD and CPL terms, but the CPL has been superceded
@@ -29,7 +29,7 @@ Patch1:         0002-Upgrade-to-Gradle-2-final.patch
 Patch2:         0003-Gradle-local-mode.patch
 Patch3:         0004-Bintray.patch
 
-BuildRequires:  gradle >= 2.1-0.29
+BuildRequires:  gradle-local >= 2.1-0.9
 BuildRequires:  aqute-bnd
 BuildRequires:  gpars
 BuildRequires:  apache-parent
@@ -199,6 +199,9 @@ xmvn-subst %{buildroot}%{_datadir}/%{name}/
 %doc LICENSE.txt NOTICE.txt README.adoc
 
 %changelog
+* Sun Nov  9 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 2.3.7-0.4
+- Use new XMvn resolver factory method
+
 * Tue Nov  4 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 2.3.7-0.3
 - Install all artifacts and scripts