From 179bf29916ad646fa5b9bdb7929063447f7c0b16 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Jul 14 2015 15:33:40 +0000 Subject: Require persistent artifact files in XML resolver API --- diff --git a/0001-Fix-NPE-in-DefaultResolver.patch b/0001-Fix-NPE-in-DefaultResolver.patch index 4ff5abe..7f960cb 100644 --- a/0001-Fix-NPE-in-DefaultResolver.patch +++ b/0001-Fix-NPE-in-DefaultResolver.patch @@ -1,7 +1,7 @@ From 47e01b8dc3b41ef1e56de14d15672aaab43364c9 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski 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 +- diff --git a/0002-Prevent-slashes-from-sneaking-into-artifact-filename.patch b/0002-Prevent-slashes-from-sneaking-into-artifact-filename.patch index f9f36bb..f56841d 100644 --- a/0002-Prevent-slashes-from-sneaking-into-artifact-filename.patch +++ b/0002-Prevent-slashes-from-sneaking-into-artifact-filename.patch @@ -1,7 +1,7 @@ From 9d9057fb17aa05bcf7df5717b1594eb14cb201e0 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski 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 +++- diff --git a/0003-Port-to-Gradle-2.5-rc-1.patch b/0003-Port-to-Gradle-2.5-rc-1.patch index 1ec8fd0..d9dd48f 100644 --- a/0003-Port-to-Gradle-2.5-rc-1.patch +++ b/0003-Port-to-Gradle-2.5-rc-1.patch @@ -1,7 +1,7 @@ From 5c535ce7077d063115165e528d1b0a3eb7d12677 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski 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 +++++++++++--------- diff --git a/0004-Require-persistent-artifact-files-in-XML-resolver-AP.patch b/0004-Require-persistent-artifact-files-in-XML-resolver-AP.patch new file mode 100644 index 0000000..e037871 --- /dev/null +++ b/0004-Require-persistent-artifact-files-in-XML-resolver-AP.patch @@ -0,0 +1,24 @@ +From 0fe0c958cc53958f00097a3c8f2994e7e718ab83 Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +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 + diff --git a/xmvn.spec b/xmvn.spec index 6dbf41b..102b5a6 100644 --- a/xmvn.spec +++ b/xmvn.spec @@ -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 - 2.4.0-5 +- Require persistent artifact files in XML resolver API + * Tue Jun 30 2015 Mikolaj Izdebski - 2.4.0-4 - Port to Gradle 2.5-rc-1