ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From maart...@apache.org
Subject svn commit: r1399803 - /ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/IBiblioResolver.java
Date Thu, 18 Oct 2012 19:20:03 GMT
Author: maartenc
Date: Thu Oct 18 19:20:03 2012
New Revision: 1399803

URL: http://svn.apache.org/viewvc?rev=1399803&view=rev
Log:
Only try to find a unique snapshot version when we have a version ending with 'SNAPSHOT'.

Modified:
    ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/IBiblioResolver.java

Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/IBiblioResolver.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/IBiblioResolver.java?rev=1399803&r1=1399802&r2=1399803&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/IBiblioResolver.java (original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/IBiblioResolver.java Thu Oct
18 19:20:03 2012
@@ -397,9 +397,11 @@ public class IBiblioResolver extends URL
                 for (Iterator iter = revs.iterator(); iter.hasNext();) {
                     String rev = (String) iter.next();
                     ModuleRevisionId historicalMrid = ModuleRevisionId.newInstance(mrid,
rev);
-                    String snapshotVersion = findSnapshotVersion(historicalMrid);
-                    if (snapshotVersion != null) {
-                        pattern = pattern.replaceFirst("\\-\\[revision\\]", "-" + snapshotVersion);
+                    if (rev.endsWith("SNAPSHOT")) {
+                        String snapshotVersion = findSnapshotVersion(historicalMrid);
+                        if (snapshotVersion != null) {
+                            pattern = pattern.replaceFirst("\\-\\[revision\\]", "-" + snapshotVersion);
+                        }
                     }
                     String resolvedPattern = IvyPatternHelper.substitute(
                         pattern, historicalMrid, artifact);



Mime
View raw message