diff --git a/0002-Use-custom-resolver.patch b/0002-Use-custom-resolver.patch index 0be399c..f147b04 100644 --- a/0002-Use-custom-resolver.patch +++ b/0002-Use-custom-resolver.patch @@ -62,7 +62,7 @@ index 8efc45c..df7d4e9 100644 } - return groupId + ":" + artifactId + ":" + version; -+ if( System.getProperty("maven.local.mode") == null ) { ++ if( System.getProperty("maven.local.mode") == null || version != null) { + return groupId + ":" + artifactId + ":" + version; + } else { + return versionlessKey(groupId, artifactId); diff --git a/maven.spec b/maven.spec index 2132fc4..92f2cc5 100644 --- a/maven.spec +++ b/maven.spec @@ -2,7 +2,7 @@ Name: maven Version: 3.0.4 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Java project management and project comprehension tool Group: Development/Tools @@ -359,6 +359,9 @@ ln -sf `rpm --eval '%%{_jnidir}'` %{_datadir}/%{name}/repository-jni/JPP %changelog +* Thu May 24 2012 Krzysztof Daniel 3.0.4-6 +- Bug 824789 -Use the version if it is possible. + * Mon May 14 2012 Stanislav Ochotnicky - 3.0.4-5 - Use Obsoletes instead of Conflicts