Use Ivy beta2, use IvyConfigure instead of IvyAntSettings (which no longer extends Task in trunk)

git-svn-id: file:///home/sven/projects/JOGL/temp/ant-contrib/svn/ant-contrib-code/ant-contrib/trunk@173 32d7a393-a5a9-423c-abd3-5d954feb1f2f

4 files changed, 3 insertions, 3 deletions

diff --git a/ivy.xml b/ivy.xml
index 881dc62..2d528a3 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -34,7 +34,7 @@
                     conf="default->default" />

         <dependency org="apache"

                     name="ivy"

-                    rev="2.0.0-rc1"

+                    rev="2.0.0-beta2"

                     conf="default->default" />

         <dependency org="jayasoft"

                     name="ivy"

diff --git a/lib/ivy/jars/ivy-2.0.0-beta2.jar b/lib/ivy/jars/ivy-2.0.0-beta2.jar
new file mode 100644
index 0000000..f53f842
--- /dev/null
+++ b/lib/ivy/jars/ivy-2.0.0-beta2.jar
diff --git a/lib/ivy/jars/ivy-2.0.0-rc1.jar b/lib/ivy/jars/ivy-2.0.0-rc1.jar
deleted file mode 100644
index badaa52..0000000
--- a/lib/ivy/jars/ivy-2.0.0-rc1.jar
+++ /dev/null
diff --git a/src/main/java/net/sf/antcontrib/net/Ivy20Adapter.java b/src/main/java/net/sf/antcontrib/net/Ivy20Adapter.java
index 116b1f7..1dd5890 100644
--- a/src/main/java/net/sf/antcontrib/net/Ivy20Adapter.java
+++ b/src/main/java/net/sf/antcontrib/net/Ivy20Adapter.java
@@ -6,7 +6,7 @@ import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
 
-import org.apache.ivy.ant.IvyAntSettings;
+import org.apache.ivy.ant.IvyConfigure;
 import org.apache.ivy.ant.IvyCacheFileset;
 import org.apache.tools.ant.BuildException;
 
@@ -14,7 +14,7 @@ public class Ivy20Adapter
 	implements IvyAdapter {
 
 	public void configure(URLImportTask task) {
-		IvyAntSettings configure = new IvyAntSettings();
+		IvyConfigure configure = new IvyConfigure();
 		configure.setProject(task.getProject());
 		configure.setLocation(task.getLocation());
 		configure.setOwningTarget(task.getOwningTarget());