rpms
/
xmvn
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix conversion of Ivy to XMvn artifacts 

- Resolves: rhbz#1127804
This commit is contained in:
Mikolaj Izdebski 2014-10-28 16:59:18 +01:00
parent f2f80540a9
commit 0f12178c34
4 changed files with 41 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
0001-Avoid-installing-the-same-attached-artifact-twice.patch
View File

@ -1,7 +1,7 @@
From 2464fdd561a5c91adb23ef41b736baca5d2e8c61 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@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 ++++-

2
0002-Fix-installation-of-attached-Eclipse-artifacts.patch
View File

@ -1,7 +1,7 @@
From 9ff89ed35810a8dce70258c409510c647e2d2334 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@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 +-

32
0003-Fix-conversion-of-Ivy-to-XMvn-artifacts.patch Normal file
View File

@ -0,0 +1,32 @@
From f1c21784c270c4fd952bbc4773500982bb12d195 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@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

8
xmvn.spec
View File

@ -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@redhat.com> - 2.1.0-5
- Fix conversion of Ivy to XMvn artifacts
- Resolves: rhbz#1127804
* Mon Oct 13 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.1.0-4
- Fix FTBFS caused by new wersion of plexus-archiver