Port to Gradle 2.4-rc-1

0001-Port-to-Gradle-2.3.patch

@@ -1,47 +0,0 @@
-From cc15d824e5138d1985f8a02ba7104fba339a7aef Mon Sep 17 00:00:00 2001
-From: Mikolaj Izdebski <mizdebsk@redhat.com>
-Date: Wed, 25 Mar 2015 10:23:13 +0100
-Subject: [PATCH 1/2] Port to Gradle 2.3
-
----
- .../java/org/fedoraproject/xmvn/connector/gradle/GradleResolver.java   | 3 ++-
- xmvn-parent/pom.xml                                                    | 2 +-
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/xmvn-connector-gradle/src/main/java/org/fedoraproject/xmvn/connector/gradle/GradleResolver.java b/xmvn-connector-gradle/src/main/java/org/fedoraproject/xmvn/connector/gradle/GradleResolver.java
-index af4d068..94a6119 100644
---- a/xmvn-connector-gradle/src/main/java/org/fedoraproject/xmvn/connector/gradle/GradleResolver.java
-+++ b/xmvn-connector-gradle/src/main/java/org/fedoraproject/xmvn/connector/gradle/GradleResolver.java
-@@ -36,6 +36,7 @@ import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ModuleComponentRe
- import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.parser.DescriptorParseContext;
- import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.parser.GradlePomModuleDescriptorParser;
- import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.parser.MetaDataParser;
-+import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.strategy.DefaultVersionSelectorScheme;
- import org.gradle.api.internal.artifacts.repositories.ResolutionAwareRepository;
- import org.gradle.api.internal.component.ArtifactType;
- import org.gradle.internal.component.external.model.DefaultMavenModuleResolveMetaData;
-@@ -207,7 +208,7 @@ public class GradleResolver
-             Path fakePom = fakePom( pomPath, id );
-             logger.debug( "Created fake POM: {}", fakePom );
- 
--            MetaDataParser parser = new GradlePomModuleDescriptorParser();
-+            MetaDataParser parser = new GradlePomModuleDescriptorParser( new DefaultVersionSelectorScheme() );
-             MutableModuleComponentResolveMetaData metaData = parser.parseMetaData( this, fakePom.toFile() );
- 
-             result.resolved( metaData );
-diff --git a/xmvn-parent/pom.xml b/xmvn-parent/pom.xml
-index 041215a..c15dd86 100644
---- a/xmvn-parent/pom.xml
-+++ b/xmvn-parent/pom.xml
-@@ -79,7 +79,7 @@
-     <atinjectVersion>1</atinjectVersion>
-     <ivyVersion>2.4.0</ivyVersion>
-     <jcommanderVersion>1.47</jcommanderVersion>
--    <gradleVersion>2.2.1</gradleVersion>
-+    <gradleVersion>2.3</gradleVersion>
-     <guiceVersion>3.2.5</guiceVersion>
-     <guavaVersion>18.0</guavaVersion>
-     <mavenInvokerVersion>2.1.1</mavenInvokerVersion>
--- 
-2.1.0
-

0001-Port-to-Gradle-2.4-rc-1.patch

@@ -0,0 +1,74 @@
+From c9884f33ea7f09fd7e2dbd8c0d35835ae0bfb463 Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk@redhat.com>
+Date: Wed, 25 Mar 2015 10:23:13 +0100
+Subject: [PATCH 1/2] Port to Gradle 2.4-rc-1
+
+---
+ .../xmvn/connector/gradle/GradleResolver.java             | 15 +++++++++------
+ xmvn-parent/pom.xml                                       |  2 +-
+ 2 files changed, 10 insertions(+), 7 deletions(-)
+
+diff --git a/xmvn-connector-gradle/src/main/java/org/fedoraproject/xmvn/connector/gradle/GradleResolver.java b/xmvn-connector-gradle/src/main/java/org/fedoraproject/xmvn/connector/gradle/GradleResolver.java
+index af4d068..a5d655f 100644
+--- a/xmvn-connector-gradle/src/main/java/org/fedoraproject/xmvn/connector/gradle/GradleResolver.java
++++ b/xmvn-connector-gradle/src/main/java/org/fedoraproject/xmvn/connector/gradle/GradleResolver.java
+@@ -36,6 +36,8 @@ import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ModuleComponentRe
+ import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.parser.DescriptorParseContext;
+ import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.parser.GradlePomModuleDescriptorParser;
+ import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.parser.MetaDataParser;
++import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.strategy.DefaultVersionComparator;
++import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.strategy.DefaultVersionSelectorScheme;
+ import org.gradle.api.internal.artifacts.repositories.ResolutionAwareRepository;
+ import org.gradle.api.internal.component.ArtifactType;
+ import org.gradle.internal.component.external.model.DefaultMavenModuleResolveMetaData;
+@@ -54,10 +56,10 @@ import org.gradle.internal.resolve.ModuleVersionResolveException;
+ import org.gradle.internal.resolve.result.BuildableArtifactResolveResult;
+ import org.gradle.internal.resolve.result.BuildableArtifactSetResolveResult;
+ import org.gradle.internal.resolve.result.BuildableModuleComponentMetaDataResolveResult;
+-import org.gradle.internal.resolve.result.BuildableModuleComponentVersionSelectionResolveResult;
+-import org.gradle.internal.resource.DefaultLocallyAvailableExternalResource;
+-import org.gradle.internal.resource.LocallyAvailableExternalResource;
++import org.gradle.internal.resolve.result.BuildableModuleVersionListingResolveResult;
++import org.gradle.internal.resource.local.DefaultLocallyAvailableExternalResource;
+ import org.gradle.internal.resource.local.DefaultLocallyAvailableResource;
++import org.gradle.internal.resource.local.LocallyAvailableExternalResource;
+ import org.slf4j.Logger;
+ import org.slf4j.LoggerFactory;
+ import org.w3c.dom.Document;
+@@ -159,7 +161,7 @@ public class GradleResolver
+     }
+ 
+     @Override
+-    public void listModuleVersions( DependencyMetaData arg0, BuildableModuleComponentVersionSelectionResolveResult arg1 )
++    public void listModuleVersions( DependencyMetaData arg0, BuildableModuleVersionListingResolveResult arg1 )
+     {
+         logger.debug( "listModuleVersions() called, but it is NOT IMPLEMENTED" );
+     }
+@@ -207,8 +209,9 @@ public class GradleResolver
+             Path fakePom = fakePom( pomPath, id );
+             logger.debug( "Created fake POM: {}", fakePom );
+ 
+-            MetaDataParser parser = new GradlePomModuleDescriptorParser();
+-            MutableModuleComponentResolveMetaData metaData = parser.parseMetaData( this, fakePom.toFile() );
++            MetaDataParser<DefaultMavenModuleResolveMetaData> parser =
++                new GradlePomModuleDescriptorParser( new DefaultVersionSelectorScheme( new DefaultVersionComparator() ) );
++            MutableModuleComponentResolveMetaData metaData = parser.parseMetaData( this, pomPath.toFile() );
+ 
+             result.resolved( metaData );
+             return;
+diff --git a/xmvn-parent/pom.xml b/xmvn-parent/pom.xml
+index 041215a..a9f055e 100644
+--- a/xmvn-parent/pom.xml
++++ b/xmvn-parent/pom.xml
+@@ -79,7 +79,7 @@
+     <atinjectVersion>1</atinjectVersion>
+     <ivyVersion>2.4.0</ivyVersion>
+     <jcommanderVersion>1.47</jcommanderVersion>
+-    <gradleVersion>2.2.1</gradleVersion>
++    <gradleVersion>2.4-rc-1</gradleVersion>
+     <guiceVersion>3.2.5</guiceVersion>
+     <guavaVersion>18.0</guavaVersion>
+     <mavenInvokerVersion>2.1.1</mavenInvokerVersion>
+-- 
+2.1.0
+

0002-Disable-doclint-in-javadoc-aggregate-MOJO-executions.patch

@@ -1,4 +1,4 @@
-From 0f2c0581f4a22a1ec60b1926e07d6baddb22d4bc Mon Sep 17 00:00:00 2001
+From 7b3a4ec319073d106ccaf7f29cf7aff4b0d62802 Mon Sep 17 00:00:00 2001
 From: Mikolaj Izdebski <mizdebsk@redhat.com>
 Date: Thu, 16 Apr 2015 10:18:25 +0200
 Subject: [PATCH 2/2] Disable doclint in javadoc:aggregate MOJO executions

xmvn.spec

@@ -4,7 +4,7 @@
 
 Name:           xmvn
 Version:        2.3.2
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Local Extensions for Apache Maven
 License:        ASL 2.0
 URL:            http://mizdebsk.fedorapeople.org/xmvn
@@ -12,7 +12,7 @@ BuildArch:      noarch
 
 Source0:        https://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.xz
 
-Patch0:         0001-Port-to-Gradle-2.3.patch
+Patch0:         0001-Port-to-Gradle-2.4-rc-1.patch
 Patch1:         0002-Disable-doclint-in-javadoc-aggregate-MOJO-executions.patch
 
 BuildRequires:  maven >= 3.3
@@ -30,7 +30,7 @@ BuildRequires:  xmlunit
 BuildRequires:  apache-ivy
 BuildRequires:  sisu-mojos
 BuildRequires:  junit
-BuildRequires:  gradle >= 2.3
+BuildRequires:  gradle >= 2.4
 
 Requires:       maven >= 3.2.5-2
 Requires:       xmvn-api = %{version}-%{release}
@@ -300,6 +300,9 @@ cp -P %{_datadir}/maven/bin/m2.conf %{buildroot}%{_datadir}/%{name}/bin/
 %doc LICENSE NOTICE
 
 %changelog
+* Fri Apr 24 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.3.2-8
+- Port to Gradle 2.4-rc-1
+
 * Thu Apr 16 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.3.2-7
 - Disable doclint in javadoc:aggregate MOJO executions