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

Require persistent artifact files in XML resolver API

This commit is contained in:
Mikolaj Izdebski 2015-07-14 17:33:40 +02:00
parent cbf3bc7c84
commit 179bf29916
5 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
0001-Fix-NPE-in-DefaultResolver.patch
View File

@ -1,7 +1,7 @@
From 47e01b8dc3b41ef1e56de14d15672aaab43364c9 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Mon, 11 May 2015 15:52:58 +0200
Subject: [PATCH 1/3] Fix NPE in DefaultResolver
Subject: [PATCH 1/4] Fix NPE in DefaultResolver
---
.../main/java/org/fedoraproject/xmvn/resolver/impl/DefaultResolver.java | 2 +-

2
0002-Prevent-slashes-from-sneaking-into-artifact-filename.patch
View File

@ -1,7 +1,7 @@
From 9d9057fb17aa05bcf7df5717b1594eb14cb201e0 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Mon, 11 May 2015 16:05:16 +0200
Subject: [PATCH 2/3] Prevent slashes from sneaking into artifact filename
Subject: [PATCH 2/4] Prevent slashes from sneaking into artifact filename
---
.../org/fedoraproject/xmvn/resolver/impl/EffectivePomGenerator.java | 4 +++-

2
0003-Port-to-Gradle-2.5-rc-1.patch
View File

@ -1,7 +1,7 @@
From 5c535ce7077d063115165e528d1b0a3eb7d12677 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Tue, 30 Jun 2015 20:10:18 +0200
Subject: [PATCH 3/3] Port to Gradle 2.5-rc-1
Subject: [PATCH 3/4] Port to Gradle 2.5-rc-1
---
.../xmvn/connector/gradle/GradleResolver.java | 20 +++++++++++---------

24
0004-Require-persistent-artifact-files-in-XML-resolver-AP.patch Normal file
View File

@ -0,0 +1,24 @@
From 0fe0c958cc53958f00097a3c8f2994e7e718ab83 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Tue, 14 Jul 2015 17:32:42 +0200
Subject: [PATCH 4/4] Require persistent artifact files in XML resolver API
---
.../org/fedoraproject/xmvn/tools/resolve/xml/ResolutionRequestBean.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/xmvn-tools/xmvn-resolve/src/main/java/org/fedoraproject/xmvn/tools/resolve/xml/ResolutionRequestBean.java b/xmvn-tools/xmvn-resolve/src/main/java/org/fedoraproject/xmvn/tools/resolve/xml/ResolutionRequestBean.java
index 56de47d..0393dcc 100644
--- a/xmvn-tools/xmvn-resolve/src/main/java/org/fedoraproject/xmvn/tools/resolve/xml/ResolutionRequestBean.java
+++ b/xmvn-tools/xmvn-resolve/src/main/java/org/fedoraproject/xmvn/tools/resolve/xml/ResolutionRequestBean.java
@@ -71,6 +71,7 @@ public class ResolutionRequestBean
request.setArtifact( bean.getArtifact() );
request.setProviderNeeded( bean.isProviderNeeded() );
+ request.setPersistentFileNeeded( true );
return request;
}
--
2.1.0

7
xmvn.spec
View File

@ -4,7 +4,7 @@
Name: xmvn
Version: 2.4.0
Release: 4%{?dist}
Release: 5%{?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-Fix-NPE-in-DefaultResolver.patch
Patch1: 0002-Prevent-slashes-from-sneaking-into-artifact-filename.patch
Patch2: 0003-Port-to-Gradle-2.5-rc-1.patch
Patch3: 0004-Require-persistent-artifact-files-in-XML-resolver-AP.patch
BuildRequires: maven >= 3.3
BuildRequires: maven-local
@ -157,6 +158,7 @@ This package provides %{summary}.
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%mvn_package ":xmvn{,-it}" __noinstall
@ -302,6 +304,9 @@ cp -P %{_datadir}/maven/bin/m2.conf %{buildroot}%{_datadir}/%{name}/bin/
%doc LICENSE NOTICE
%changelog
* Tue Jul 14 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.4.0-5
- Require persistent artifact files in XML resolver API
* Tue Jun 30 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.4.0-4
- Port to Gradle 2.5-rc-1