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

Bug 824789 - Use the version if it is possible.

Browse Source
This commit is contained in:
Krzysztof Daniel 2012-05-24 14:41:57 +02:00 committed by Stanislav Ochotnicky
parent c45bdfa272
commit 544b33ba4e
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
0002-Use-custom-resolver.patch
View File

@ -62,7 +62,7 @@ index 8efc45c..df7d4e9 100644
} }
- return groupId + ":" + artifactId + ":" + version; - return groupId + ":" + artifactId + ":" + version;
+ if( System.getProperty("maven.local.mode") == null ) { + if( System.getProperty("maven.local.mode") == null || version != null) {
+ return groupId + ":" + artifactId + ":" + version; + return groupId + ":" + artifactId + ":" + version;
+ } else { + } else {
+ return versionlessKey(groupId, artifactId); + return versionlessKey(groupId, artifactId);

5
maven.spec
View File

@ -2,7 +2,7 @@
Name: maven Name: maven
Version: 3.0.4 Version: 3.0.4
Release: 5%{?dist} Release: 6%{?dist}
Summary: Java project management and project comprehension tool Summary: Java project management and project comprehension tool
Group: Development/Tools Group: Development/Tools
@ -359,6 +359,9 @@ ln -sf `rpm --eval '%%{_jnidir}'` %{_datadir}/%{name}/repository-jni/JPP
%changelog %changelog
* Thu May 24 2012 Krzysztof Daniel <kdaniel@redhat.com> 3.0.4-6
- Bug 824789 -Use the version if it is possible.
* Mon May 14 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.0.4-5 * Mon May 14 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.0.4-5
- Use Obsoletes instead of Conflicts - Use Obsoletes instead of Conflicts