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/07/04 00:41:40 UTC
svn commit: r791033 - in /ant/ivy/core/branches/2.1.0-rc2:
src/java/org/apache/ivy/Main.java
src/java/org/apache/ivy/plugins/resolver/RepositoryResolver.java
test/java/org/apache/ivy/core/resolve/ResolveTest.java
Author: maartenc
Date: Fri Jul 3 22:41:39 2009
New Revision: 791033
URL: http://svn.apache.org/viewvc?rev=791033&view=rev
Log:
Fixed some merge errors...
Modified:
ant/ivy/core/branches/2.1.0-rc2/src/java/org/apache/ivy/Main.java
ant/ivy/core/branches/2.1.0-rc2/src/java/org/apache/ivy/plugins/resolver/RepositoryResolver.java
ant/ivy/core/branches/2.1.0-rc2/test/java/org/apache/ivy/core/resolve/ResolveTest.java
Modified: ant/ivy/core/branches/2.1.0-rc2/src/java/org/apache/ivy/Main.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/branches/2.1.0-rc2/src/java/org/apache/ivy/Main.java?rev=791033&r1=791032&r2=791033&view=diff
==============================================================================
--- ant/ivy/core/branches/2.1.0-rc2/src/java/org/apache/ivy/Main.java (original)
+++ ant/ivy/core/branches/2.1.0-rc2/src/java/org/apache/ivy/Main.java Fri Jul 3 22:41:39 2009
@@ -267,9 +267,6 @@
if (line.hasOption("refresh")) {
resolveOptions.setRefresh(true);
}
- if (line.hasOption("refresh")) {
- resolveOptions.setRefresh(true);
- }
ResolveReport report = ivy.resolve(ivyfile.toURI().toURL(), resolveOptions);
if (report.hasError()) {
System.exit(1);
Modified: ant/ivy/core/branches/2.1.0-rc2/src/java/org/apache/ivy/plugins/resolver/RepositoryResolver.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/branches/2.1.0-rc2/src/java/org/apache/ivy/plugins/resolver/RepositoryResolver.java?rev=791033&r1=791032&r2=791033&view=diff
==============================================================================
--- ant/ivy/core/branches/2.1.0-rc2/src/java/org/apache/ivy/plugins/resolver/RepositoryResolver.java (original)
+++ ant/ivy/core/branches/2.1.0-rc2/src/java/org/apache/ivy/plugins/resolver/RepositoryResolver.java Fri Jul 3 22:41:39 2009
@@ -226,12 +226,6 @@
repository.put(artifact, src, dest, overwrite);
for (int i = 0; i < checksums.length; i++) {
- if (!ChecksumHelper.isKnownAlgorithm(checksums[i])) {
- throw new IllegalArgumentException("Unknown checksum algorithm: " + checksums[i]); }
- }
-
- repository.put(artifact, src, dest, overwrite);
- for (int i = 0; i < checksums.length; i++) {
putChecksum(artifact, src, dest, overwrite, checksums[i]);
}
}
Modified: ant/ivy/core/branches/2.1.0-rc2/test/java/org/apache/ivy/core/resolve/ResolveTest.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/branches/2.1.0-rc2/test/java/org/apache/ivy/core/resolve/ResolveTest.java?rev=791033&r1=791032&r2=791033&view=diff
==============================================================================
--- ant/ivy/core/branches/2.1.0-rc2/test/java/org/apache/ivy/core/resolve/ResolveTest.java (original)
+++ ant/ivy/core/branches/2.1.0-rc2/test/java/org/apache/ivy/core/resolve/ResolveTest.java Fri Jul 3 22:41:39 2009
@@ -18,7 +18,6 @@
package org.apache.ivy.core.resolve;
import java.io.File;
-import java.io.FileInputStream;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -26,7 +25,6 @@
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;