[xmvn] Fix conversion of Ivy to XMvn artifacts

[Mikolaj Izdebski]

commit 0f12178c3443b4defcd4c04cbcdc93d87bc74f63
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Tue Oct 28 16:59:18 2014 +0100

    Fix conversion of Ivy to XMvn artifacts
    
    - Resolves: rhbz#1127804

 ...stalling-the-same-attached-artifact-twice.patch |    2 +-
 ...nstallation-of-attached-Eclipse-artifacts.patch |    2 +-
 0003-Fix-conversion-of-Ivy-to-XMvn-artifacts.patch |   32 ++++++++++++++++++++
 xmvn.spec                                          |    8 ++++-
 4 files changed, 41 insertions(+), 3 deletions(-)
---
diff --git a/0001-Avoid-installing-the-same-attached-artifact-twice.patch b/0001-Avoid-installing-the-same-attached-artifact-twice.patch
index c37c844..7d2bfaf 100644
--- a/0001-Avoid-installing-the-same-attached-artifact-twice.patch
+++ b/0001-Avoid-installing-the-same-attached-artifact-twice.patch
@@ -1,7 +1,7 @@
 From 2464fdd561a5c91adb23ef41b736baca5d2e8c61 Mon Sep 17 00:00:00 2001
 From: Mikolaj Izdebski <mizdebsk at redhat.com>
 Date: Tue, 9 Sep 2014 15:26:16 +0200
-Subject: [PATCH 1/2] Avoid installing the same attached artifact twice
+Subject: [PATCH 1/3] Avoid installing the same attached artifact twice
 
 ---
  xmvn-mojo/src/main/java/org/fedoraproject/xmvn/mojo/InstallMojo.java | 5 ++++-
diff --git a/0002-Fix-installation-of-attached-Eclipse-artifacts.patch b/0002-Fix-installation-of-attached-Eclipse-artifacts.patch
index 26b9298..3794cea 100644
--- a/0002-Fix-installation-of-attached-Eclipse-artifacts.patch
+++ b/0002-Fix-installation-of-attached-Eclipse-artifacts.patch
@@ -1,7 +1,7 @@
 From 9ff89ed35810a8dce70258c409510c647e2d2334 Mon Sep 17 00:00:00 2001
 From: Mikolaj Izdebski <mizdebsk at redhat.com>
 Date: Mon, 15 Sep 2014 12:50:21 +0200
-Subject: [PATCH 2/2] Fix installation of attached Eclipse artifacts
+Subject: [PATCH 2/3] Fix installation of attached Eclipse artifacts
 
 ---
  xmvn-mojo/src/main/java/org/fedoraproject/xmvn/mojo/InstallMojo.java | 2 +-
diff --git a/0003-Fix-conversion-of-Ivy-to-XMvn-artifacts.patch b/0003-Fix-conversion-of-Ivy-to-XMvn-artifacts.patch
new file mode 100644
index 0000000..6e580d4
--- /dev/null
+++ b/0003-Fix-conversion-of-Ivy-to-XMvn-artifacts.patch
@@ -0,0 +1,32 @@
+From f1c21784c270c4fd952bbc4773500982bb12d195 Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk at redhat.com>
+Date: Tue, 28 Oct 2014 16:55:25 +0100
+Subject: [PATCH 3/3] Fix conversion of Ivy to XMvn artifacts
+
+Classifiers could be lost is some cases when converting Ivy artifact
+to XMvn artifact.
+
+Resolves: rhbz#1127804
+---
+ .../main/java/org/fedoraproject/xmvn/connector/ivy/IvyResolver.java   | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/xmvn-connector-ivy/src/main/java/org/fedoraproject/xmvn/connector/ivy/IvyResolver.java b/xmvn-connector-ivy/src/main/java/org/fedoraproject/xmvn/connector/ivy/IvyResolver.java
+index d14e5f6..8c6a277 100644
+--- a/xmvn-connector-ivy/src/main/java/org/fedoraproject/xmvn/connector/ivy/IvyResolver.java
++++ b/xmvn-connector-ivy/src/main/java/org/fedoraproject/xmvn/connector/ivy/IvyResolver.java
+@@ -133,9 +133,9 @@ public class IvyResolver
+         ModuleRevisionId revision = artifact.getModuleRevisionId();
+ 
+         String groupId = revision.getOrganisation();
+-        String artifactId = revision.getName();
++        String artifactId = artifact.getName();
+         String extension = artifact.getExt();
+-        String classifier = revision.getExtraAttribute( "classifier" );
++        String classifier = artifact.getExtraAttribute( "classifier" );
+         String version = revision.getRevision();
+         String type = artifact.getType();
+ 
+-- 
+1.9.3
+
diff --git a/xmvn.spec b/xmvn.spec
index 1fe10f6..bc2668a 100644
--- a/xmvn.spec
+++ b/xmvn.spec
@@ -4,7 +4,7 @@
 
 Name:           xmvn
 Version:        2.1.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Local Extensions for Apache Maven
 License:        ASL 2.0
 URL:            http://mizdebsk.fedorapeople.org/xmvn
@@ -14,6 +14,7 @@ Source0:        https://fedorahosted.org/released/%{name}/%{name}-%{version}.tar
 
 Patch0:         0001-Avoid-installing-the-same-attached-artifact-twice.patch
 Patch1:         0002-Fix-installation-of-attached-Eclipse-artifacts.patch
+Patch2:         0003-Fix-conversion-of-Ivy-to-XMvn-artifacts.patch
 
 BuildRequires:  maven >= 3.2.1-10
 BuildRequires:  maven-local
@@ -145,6 +146,7 @@ This package provides %{summary}.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %mvn_package :xmvn __noinstall
 
@@ -294,6 +296,10 @@ end
 %doc LICENSE NOTICE
 
 %changelog
+* Tue Oct 28 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 2.1.0-5
+- Fix conversion of Ivy to XMvn artifacts
+- Resolves: rhbz#1127804
+
 * Mon Oct 13 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 2.1.0-4
 - Fix FTBFS caused by new wersion of plexus-archiver