You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by ma...@apache.org on 2009/02/10 23:02:16 UTC
svn commit: r743126 - in /ant/ivy/core/trunk: CHANGES.txt
src/java/org/apache/ivy/plugins/resolver/IBiblioResolver.java
Author: maartenc
Date: Tue Feb 10 22:02:15 2009
New Revision: 743126
URL: http://svn.apache.org/viewvc?rev=743126&view=rev
Log:
FIX: Snapshot issues when using ibiblio resolver when m2compatible is false (IVY-1028)
Modified:
ant/ivy/core/trunk/CHANGES.txt
ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/IBiblioResolver.java
Modified: ant/ivy/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/CHANGES.txt?rev=743126&r1=743125&r2=743126&view=diff
==============================================================================
--- ant/ivy/core/trunk/CHANGES.txt (original)
+++ ant/ivy/core/trunk/CHANGES.txt Tue Feb 10 22:02:15 2009
@@ -95,6 +95,7 @@
- IMPROVEMENT: Error message is not clear when specifying an invalid value for checksums (IVY-977)
- IMPROVEMENT: catch AccessControlException on System.getProperties() (IVY-1015)
+- FIX: Snapshot issues when using ibiblio resolver with m2compatible is false (IVY-1028)
- FIX: Ivy Standalone hangs after publishing to SSH resolver (IVY-1009)
- FIX: overwrite='false' completely prevents publishing into url repositories (IVY-1007)
- FIX: Fixed broken logo link in ivy-report.xsl (IVY-1024) (thanks to Carlton Brown)
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=743126&r1=743125&r2=743126&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 Tue Feb 10 22:02:15 2009
@@ -115,7 +115,7 @@
mrid = convertM2IdForResourceSearch(mrid);
}
ResolvedResource rres = null;
- if (artifact.getId().getRevision().endsWith("SNAPSHOT")) {
+ if (artifact.getId().getRevision().endsWith("SNAPSHOT") && isM2compatible()) {
rres = findSnapshotArtifact(artifact, date, mrid);
if (rres != null) {
return rres;
@@ -158,6 +158,10 @@
}
private String findSnapshotVersion(ModuleRevisionId mrid) {
+ if (!isM2compatible()) {
+ return null;
+ }
+
String pattern = (String) getIvyPatterns().get(0);
if (shouldUseMavenMetadata(pattern)) {
InputStream metadataStream = null;