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

Process fragments in alphabetical order

Browse Source
This commit is contained in:
Stanislav Ochotnicky 2011-06-22 17:06:41 +02:00
parent 3b2966e851
commit 1d63307f52
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
MavenJPackageDepmap.java
View File

@ -154,17 +154,21 @@ public class MavenJPackageDepmap {
// process fragments in etc // process fragments in etc
File fragmentDir = new File("/etc/maven/fragments"); File fragmentDir = new File("/etc/maven/fragments");
String flist[] = fragmentDir.list(); String flist[] = fragmentDir.list();
if (flist != null) if (flist != null) {
java.util.Arrays.sort(flist);
for (String fragFilename : flist) for (String fragFilename : flist)
processDepmapFile("/etc/maven/fragments/" + fragFilename); processDepmapFile("/etc/maven/fragments/" + fragFilename);
}
// process fragments is usr. Once packages are rebuilt, we can skip // process fragments is usr. Once packages are rebuilt, we can skip
// fragments in /etc // fragments in /etc
fragmentDir = new File("/usr/share/maven-fragments"); fragmentDir = new File("/usr/share/maven-fragments");
flist = fragmentDir.list(); flist = fragmentDir.list();
if (flist != null) if (flist != null) {
java.util.Arrays.sort(flist);
for (String fragFilename : flist) for (String fragFilename : flist)
processDepmapFile("/usr/share/maven-fragments/" + fragFilename); processDepmapFile("/usr/share/maven-fragments/" + fragFilename);
}
String customFileName = System.getProperty("maven.local.depmap.file", String customFileName = System.getProperty("maven.local.depmap.file",
null); null);

7
maven.spec
View File

@ -1,7 +1,7 @@
Name: maven Name: maven
Version: 3.0.3 Version: 3.0.3
Release: 6%{?dist} Release: 7%{?dist}
Summary: Java project management and project comprehension tool Summary: Java project management and project comprehension tool
Group: Development/Tools Group: Development/Tools
@ -292,7 +292,6 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%files %files
%defattr(-,root,root,-)
%doc LICENSE.txt NOTICE.txt README.txt %doc LICENSE.txt NOTICE.txt README.txt
%attr(0755,root,root) %{_bindir}/mvn3 %attr(0755,root,root) %{_bindir}/mvn3
%attr(0755,root,root) %{_bindir}/mvn-local %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 %{_datadir}/%{name}/repo-metadata.tar.xz
%files javadoc %files javadoc
%defattr(-,root,root,-)
%doc LICENSE.txt %doc LICENSE.txt
%{_javadocdir}/%{name} %{_javadocdir}/%{name}
%changelog %changelog
* Wed Jun 22 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.0.3-7
- Process fragments in alphabetical order
* Tue Jun 21 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.0.3-6 * Tue Jun 21 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.0.3-6
- Fix handling of fallback default_poms - Fix handling of fallback default_poms
- Add empty-dep into maven package to not require maven2 version - Add empty-dep into maven package to not require maven2 version