[xmvn/f17] Look for POM files also in /usr/share/maven2/default_poms/
Mikolaj Izdebski
mizdebsk at fedoraproject.org
Wed Feb 6 15:00:16 UTC 2013
commit 4590971c906c4b3cee46670b4d5e87953f7a256a
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Wed Feb 6 15:59:39 2013 +0100
Look for POM files also in /usr/share/maven2/default_poms/
0001-Don-t-require-maven-plugin-annotations.patch | 2 +-
...ersionless-depmap-from-maven2-common-poms.patch | 17 +++++++++++++----
xmvn.spec | 5 ++++-
3 files changed, 18 insertions(+), 6 deletions(-)
---
diff --git a/0001-Don-t-require-maven-plugin-annotations.patch b/0001-Don-t-require-maven-plugin-annotations.patch
index 88d019e..768d3a9 100644
--- a/0001-Don-t-require-maven-plugin-annotations.patch
+++ b/0001-Don-t-require-maven-plugin-annotations.patch
@@ -1,4 +1,4 @@
-From b47d4502821fd54df9778e01a7bde0320d8f725d Mon Sep 17 00:00:00 2001
+From 7c0d68e08d528e64af70882de52804974990a651 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Wed, 6 Feb 2013 12:40:00 +0100
Subject: [PATCH 1/2] Don't require maven-plugin-annotations
diff --git a/0002-Use-versionless-depmap-from-maven2-common-poms.patch b/0002-Use-versionless-depmap-from-maven2-common-poms.patch
index 485f86b..df95936 100644
--- a/0002-Use-versionless-depmap-from-maven2-common-poms.patch
+++ b/0002-Use-versionless-depmap-from-maven2-common-poms.patch
@@ -1,14 +1,14 @@
-From 5c830d45057df615271ee617196a46d8e0eecbd9 Mon Sep 17 00:00:00 2001
+From 2ae9000a2f767886ece92439fdd40e60d17c8968 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Wed, 6 Feb 2013 14:45:56 +0100
Subject: [PATCH 2/2] Use versionless depmap from maven2-common-poms
---
- xmvn-core/src/main/java/org/fedoraproject/maven/Configuration.java | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
+ xmvn-core/src/main/java/org/fedoraproject/maven/Configuration.java | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/xmvn-core/src/main/java/org/fedoraproject/maven/Configuration.java b/xmvn-core/src/main/java/org/fedoraproject/maven/Configuration.java
-index 5c68a64..9ee4cd9 100644
+index 5c68a64..59e61f8 100644
--- a/xmvn-core/src/main/java/org/fedoraproject/maven/Configuration.java
+++ b/xmvn-core/src/main/java/org/fedoraproject/maven/Configuration.java
@@ -107,7 +107,8 @@ public class Configuration
@@ -21,6 +21,15 @@ index 5c68a64..9ee4cd9 100644
public static Collection<String> getDepmaps()
{
+@@ -123,7 +124,7 @@ public class Configuration
+ }
+
+ private static List<String> resolvPomRepos = newList( "/usr/share/maven2/poms/", "/usr/share/maven/poms/",
+- "/usr/share/maven-poms/" );
++ "/usr/share/maven-poms/", "/usr/share/maven2/default_poms/" );
+
+ public static Collection<String> getPomRepos()
+ {
--
1.8.1
diff --git a/xmvn.spec b/xmvn.spec
index 43fbbbc..a7063a0 100644
--- a/xmvn.spec
+++ b/xmvn.spec
@@ -1,6 +1,6 @@
Name: xmvn
Version: 0.2.3
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Local Extensions for Apache Maven
Group: Development/Libraries
License: ASL 2.0
@@ -81,6 +81,9 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
%{_javadocdir}/%{name}
%changelog
+* Wed Feb 6 2013 Mikolaj Izdebski <mizdebsk at redhat.com> - 0.2.3-4
+- Look for POM files also in /usr/share/maven2/default_poms/
+
* Wed Feb 6 2013 Mikolaj Izdebski <mizdebsk at redhat.com> - 0.2.3-3
- Use versionless depmap from maven2-common-poms
More information about the scm-commits
mailing list