[xmvn] Fix installation of attached Eclipse artifacts
Mikolaj Izdebski
mizdebsk at fedoraproject.org
Wed Sep 24 05:42:23 UTC 2014
commit 0ed1b60590d293f78bf8f92887806dd6e16a645f
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Wed Sep 24 07:41:30 2014 +0200
Fix installation of attached Eclipse artifacts
...stalling-the-same-attached-artifact-twice.patch | 4 +-
...nstallation-of-attached-Eclipse-artifacts.patch | 25 ++++++++++++++++++++
xmvn.spec | 7 ++++-
3 files changed, 33 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 774e08f..c37c844 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 ab7cff28c5c1d19b831a70b7eb521ca20a92d087 Mon Sep 17 00:00:00 2001
+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] Avoid installing the same attached artifact twice
+Subject: [PATCH 1/2] 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
new file mode 100644
index 0000000..26b9298
--- /dev/null
+++ b/0002-Fix-installation-of-attached-Eclipse-artifacts.patch
@@ -0,0 +1,25 @@
+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
+
+---
+ xmvn-mojo/src/main/java/org/fedoraproject/xmvn/mojo/InstallMojo.java | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/xmvn-mojo/src/main/java/org/fedoraproject/xmvn/mojo/InstallMojo.java b/xmvn-mojo/src/main/java/org/fedoraproject/xmvn/mojo/InstallMojo.java
+index 4018777..9b04d27 100644
+--- a/xmvn-mojo/src/main/java/org/fedoraproject/xmvn/mojo/InstallMojo.java
++++ b/xmvn-mojo/src/main/java/org/fedoraproject/xmvn/mojo/InstallMojo.java
+@@ -230,7 +230,7 @@ public class InstallMojo
+ continue;
+ }
+
+- deployArtifact( attachedArtifact, null, project.getModel() );
++ deployArtifact( attachedArtifact, type, project.getModel() );
+ }
+ }
+ }
+--
+1.9.3
+
diff --git a/xmvn.spec b/xmvn.spec
index da84c05..b987d38 100644
--- a/xmvn.spec
+++ b/xmvn.spec
@@ -4,7 +4,7 @@
Name: xmvn
Version: 2.1.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Local Extensions for Apache Maven
License: ASL 2.0
URL: http://mizdebsk.fedorapeople.org/xmvn
@@ -13,6 +13,7 @@ BuildArch: noarch
Source0: https://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.xz
Patch0: 0001-Avoid-installing-the-same-attached-artifact-twice.patch
+Patch1: 0002-Fix-installation-of-attached-Eclipse-artifacts.patch
BuildRequires: maven >= 3.2.1-10
BuildRequires: maven-local
@@ -143,6 +144,7 @@ This package provides %{summary}.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%mvn_package :xmvn __noinstall
@@ -290,6 +292,9 @@ end
%doc LICENSE NOTICE
%changelog
+* Wed Sep 24 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 2.1.0-3
+- Fix installation of attached Eclipse artifacts
+
* Wed Sep 10 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 2.1.0-2
- Avoid installing the same attached artifact twice
More information about the scm-commits
mailing list