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

Use topmost repository namespace during installation

Browse Source 
- Resolves: rhbz#1166743
This commit is contained in:
Mikolaj Izdebski 2014-11-26 15:00:21 +01:00
parent 0f12178c34
commit 5d5a66554a
5 changed files with 36 additions and 4 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/3] Avoid installing the same attached artifact twice
Subject: [PATCH 1/4] 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/3] Fix installation of attached Eclipse artifacts
Subject: [PATCH 2/4] Fix installation of attached Eclipse artifacts
---
xmvn-mojo/src/main/java/org/fedoraproject/xmvn/mojo/InstallMojo.java | 2 +-

2
0003-Fix-conversion-of-Ivy-to-XMvn-artifacts.patch
View File

@ -1,7 +1,7 @@
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
Subject: [PATCH 3/4] Fix conversion of Ivy to XMvn artifacts
Classifiers could be lost is some cases when converting Ivy artifact
to XMvn artifact.

26
0004-Use-topmost-repository-namespace-during-installation.patch Normal file
View File

@ -0,0 +1,26 @@
From 85c42732a35cdc274c4b4ab0652f7f6c0da6f3ab Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Wed, 26 Nov 2014 14:10:51 +0100
Subject: [PATCH 4/4] Use topmost repository namespace during installation
Resolves: rhbz#1166743
---
.../fedoraproject/xmvn/tools/install/impl/DefaultArtifactInstaller.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/xmvn-tools/xmvn-install/src/main/java/org/fedoraproject/xmvn/tools/install/impl/DefaultArtifactInstaller.java b/xmvn-tools/xmvn-install/src/main/java/org/fedoraproject/xmvn/tools/install/impl/DefaultArtifactInstaller.java
index 8512c0e..270ddc4 100644
--- a/xmvn-tools/xmvn-install/src/main/java/org/fedoraproject/xmvn/tools/install/impl/DefaultArtifactInstaller.java
+++ b/xmvn-tools/xmvn-install/src/main/java/org/fedoraproject/xmvn/tools/install/impl/DefaultArtifactInstaller.java
@@ -151,7 +151,7 @@ public class DefaultArtifactInstaller
}
// Namespace
- am.setNamespace( repoPaths.iterator().next().getRepository().getNamespace() );
+ am.setNamespace( repo.getNamespace() );
// UUID
am.setUuid( UUID.randomUUID().toString() );
--
1.9.3

8
xmvn.spec
View File

@ -4,7 +4,7 @@
Name: xmvn
Version: 2.1.0
Release: 5%{?dist}
Release: 6%{?dist}
Summary: Local Extensions for Apache Maven
License: ASL 2.0
URL: http://mizdebsk.fedorapeople.org/xmvn
@ -15,6 +15,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
Patch3: 0004-Use-topmost-repository-namespace-during-installation.patch
BuildRequires: maven >= 3.2.1-10
BuildRequires: maven-local
@ -147,6 +148,7 @@ This package provides %{summary}.
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%mvn_package :xmvn __noinstall
@ -296,6 +298,10 @@ end
%doc LICENSE NOTICE
%changelog
* Wed Nov 26 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.1.0-6
- Use topmost repository namespace during installation
- Resolves: rhbz#1166743
* Tue Oct 28 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.1.0-5
- Fix conversion of Ivy to XMvn artifacts
- Resolves: rhbz#1127804