[java-sig-commits] [maven] Process fragments in alphabetical order

[Stanislav Ochotnicky]

commit 1d63307f52aaefad8d6236f5d1905687695db55c
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date:   Wed Jun 22 17:06:41 2011 +0200

    Process fragments in alphabetical order

 MavenJPackageDepmap.java |    8 ++++++--
 maven.spec               |    7 ++++---
 2 files changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/MavenJPackageDepmap.java b/MavenJPackageDepmap.java
index 2567c0c..089bbbb 100644
--- a/MavenJPackageDepmap.java
+++ b/MavenJPackageDepmap.java
@@ -154,17 +154,21 @@ public class MavenJPackageDepmap {
         // process fragments in etc
         File fragmentDir = new File("/etc/maven/fragments");
         String flist[] = fragmentDir.list();
-        if (flist != null)
+        if (flist != null) {
+            java.util.Arrays.sort(flist);
             for (String fragFilename : flist)
                 processDepmapFile("/etc/maven/fragments/" + fragFilename);
+        }
 
         // process fragments is usr. Once packages are rebuilt, we can skip
         // fragments in /etc
         fragmentDir = new File("/usr/share/maven-fragments");
         flist = fragmentDir.list();
-        if (flist != null)
+        if (flist != null) {
+            java.util.Arrays.sort(flist);
             for (String fragFilename : flist)
                 processDepmapFile("/usr/share/maven-fragments/" + fragFilename);
+        }
 
         String customFileName = System.getProperty("maven.local.depmap.file",
                 null);
diff --git a/maven.spec b/maven.spec
index d76d204..4c77b05 100644
--- a/maven.spec
+++ b/maven.spec
@@ -1,7 +1,7 @@
 
 Name:           maven
 Version:        3.0.3
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Java project management and project comprehension tool
 
 Group:          Development/Tools
@@ -292,7 +292,6 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 
 %files
-%defattr(-,root,root,-)
 %doc LICENSE.txt NOTICE.txt README.txt
 %attr(0755,root,root) %{_bindir}/mvn3
 %attr(0755,root,root) %{_bindir}/mvn-local
@@ -314,12 +313,14 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 %{_datadir}/%{name}/repo-metadata.tar.xz
 
 %files javadoc
-%defattr(-,root,root,-)
 %doc LICENSE.txt
 %{_javadocdir}/%{name}
 
 
 %changelog
+* Wed Jun 22 2011 Stanislav Ochotnicky <sochotnicky at redhat.com> - 3.0.3-7
+- Process fragments in alphabetical order
+
 * Tue Jun 21 2011 Stanislav Ochotnicky <sochotnicky at redhat.com> - 3.0.3-6
 - Fix handling of fallback default_poms
 - Add empty-dep into maven package to not require maven2 version