summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbodewig <[email protected]>2008-09-26 12:36:25 +0000
committerbodewig <[email protected]>2008-09-26 12:36:25 +0000
commita3a11b85594b529d5315be2cca2457ac82fee89a (patch)
tree98150475b10777e650be27f118c93718eaae25ab
parentb39688da8ba0b409527c2f388791fbef178b6c24 (diff)
Upgrade to Apache Ivy 2.0.0 RC 1
git-svn-id: file:///home/sven/projects/JOGL/temp/ant-contrib/svn/ant-contrib-code/ant-contrib/trunk@174 32d7a393-a5a9-423c-abd3-5d954feb1f2f
-rw-r--r--ivy.xml2
-rw-r--r--lib/ivy/jars/ivy-2.0.0-beta2.jarbin898423 -> 0 bytes
-rw-r--r--lib/ivy/jars/ivy-2.0.0-rc1.jarbin0 -> 886380 bytes
-rw-r--r--src/main/java/net/sf/antcontrib/net/Ivy20Adapter.java2
4 files changed, 2 insertions, 2 deletions
diff --git a/ivy.xml b/ivy.xml
index 2d528a3..881dc62 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -34,7 +34,7 @@
conf="default->default" />
<dependency org="apache"
name="ivy"
- rev="2.0.0-beta2"
+ rev="2.0.0-rc1"
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
deleted file mode 100644
index f53f842..0000000
--- a/lib/ivy/jars/ivy-2.0.0-beta2.jar
+++ /dev/null
Binary files differ
diff --git a/lib/ivy/jars/ivy-2.0.0-rc1.jar b/lib/ivy/jars/ivy-2.0.0-rc1.jar
new file mode 100644
index 0000000..8a0290c
--- /dev/null
+++ b/lib/ivy/jars/ivy-2.0.0-rc1.jar
Binary files differ
diff --git a/src/main/java/net/sf/antcontrib/net/Ivy20Adapter.java b/src/main/java/net/sf/antcontrib/net/Ivy20Adapter.java
index 1dd5890..0fda714 100644
--- a/src/main/java/net/sf/antcontrib/net/Ivy20Adapter.java
+++ b/src/main/java/net/sf/antcontrib/net/Ivy20Adapter.java
@@ -20,7 +20,7 @@ public class Ivy20Adapter
configure.setOwningTarget(task.getOwningTarget());
configure.setTaskName(task.getTaskName());
configure.setOverride("true");
- configure.setId("urlimporttask");
+ configure.setSettingsId("urlimporttask");
configure.init();
URL ivyConfUrl = task.getIvyConfUrl();