summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormattinger <[email protected]>2009-01-30 19:13:35 +0000
committermattinger <[email protected]>2009-01-30 19:13:35 +0000
commit3c7020d6c8bfb2accc88d8907d8795d67f1759df (patch)
treeae90cd2fcc9ff87461ae5edb8fbd2d29789aa628
parenta3a11b85594b529d5315be2cca2457ac82fee89a (diff)
Updating for ivy 2.0.0 release
git-svn-id: file:///home/sven/projects/JOGL/temp/ant-contrib/svn/ant-contrib-code/ant-contrib/trunk@176 32d7a393-a5a9-423c-abd3-5d954feb1f2f
-rw-r--r--build.xml2
-rw-r--r--ivy.xml2
-rw-r--r--lib/ivy/jars/ivy-2.0.0.jar (renamed from lib/ivy/jars/ivy-2.0.0-rc1.jar)bin886380 -> 893618 bytes
-rw-r--r--src/main/java/net/sf/antcontrib/net/Ivy20Adapter.java1
4 files changed, 3 insertions, 2 deletions
diff --git a/build.xml b/build.xml
index 8392475..c233f03 100644
--- a/build.xml
+++ b/build.xml
@@ -43,7 +43,7 @@
<property name="bcel.jar" value="${m2_repo}/bcel/bcel/${bcel.version}/bcel-${bcel.version}.jar"/>
<property name="httpclient.version" value="3.0.1"/>
<property name="httpclient.jar" value="${m2_repo}/commons-httpclient/commons-httpclient/${httpclient.version}/commons-httpclient-${httpclient.version}.jar"/>
- <property name="ivy.version" value="1.4.1"/>
+ <property name="ivy.version" value="2.0.0"/>
<property name="ivy.jar" value="lib/ivy/jars/ivy-${ivy.version}.jar"/>
<property name="junit.version" value="3.8.1"/>
<property name="junit.jar" value="${m2_repo}/junit/junit/${junit.version}/junit-${junit.version}.jar"/>
diff --git a/ivy.xml b/ivy.xml
index 881dc62..d0d34dc 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"
conf="default->default" />
<dependency org="jayasoft"
name="ivy"
diff --git a/lib/ivy/jars/ivy-2.0.0-rc1.jar b/lib/ivy/jars/ivy-2.0.0.jar
index 8a0290c..1979808 100644
--- a/lib/ivy/jars/ivy-2.0.0-rc1.jar
+++ b/lib/ivy/jars/ivy-2.0.0.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 0fda714..ac0093a 100644
--- a/src/main/java/net/sf/antcontrib/net/Ivy20Adapter.java
+++ b/src/main/java/net/sf/antcontrib/net/Ivy20Adapter.java
@@ -104,6 +104,7 @@ public class Ivy20Adapter
}
}
+ //task.getProject().addReference("urlimporttask", configure);
configure.execute();
}