From 54fab21497320b708304b75d73851af663fc08c7 Mon Sep 17 00:00:00 2001
From: "U-BASIS\\dsmyda" <dsmyda@win-dsmyd-2925.basistech.net>
Date: Mon, 17 Aug 2020 14:28:38 -0400
Subject: [PATCH] Upgraded Ivy to 2.5.0 for datamodel
---
bindings/java/build.xml | 37 +++++++++++++++++--------------------
1 file changed, 17 insertions(+), 20 deletions(-)
diff --git a/bindings/java/build.xml b/bindings/java/build.xml
index 5dad71b5f..99ac0c26d 100644
--- a/bindings/java/build.xml
+++ b/bindings/java/build.xml
@@ -90,30 +90,27 @@
</path>
</target>
- <property name="ivy.install.version" value="2.3.0-rc2"/>
- <condition property="ivy.home" value="${env.IVY_HOME}">
+ <property name="ivy.install.version" value="2.5.0" />
+ <condition property="ivy.home" value="${env.IVY_HOME}">
<isset property="env.IVY_HOME"/>
- </condition>
+ </condition>
<property name="ivy.home" value="${user.home}/.ant"/>
<property name="ivy.jar.dir" value="${ivy.home}/lib"/>
<property name="ivy.jar.file" value="${ivy.jar.dir}/ivy.jar"/>
-
- <target name="download-ivy" unless="offline">
- <available file="${ivy.jar.file}" property="ivy.available"/>
- <antcall target="-download-ivy"/>
- </target>
-
- <target name="-download-ivy" unless="ivy.available">
- <mkdir dir="${ivy.jar.dir}"/>
- <get src="https://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar" dest="${ivy.jar.file}" usetimestamp="true"/>
- </target>
-
- <target name="init-ivy" depends="download-ivy" unless="ivy.lib.path">
- <path id="ivy.lib.path">
- <fileset dir="${ivy.jar.dir}" includes="*.jar"/>
- </path>
- <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant" classpathref="ivy.lib.path"/>
- </target>
+
+ <target name="download-ivy" unless="offline">
+ <mkdir dir="${ivy.jar.dir}"/>
+ <get src="https://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar"
+ dest="${ivy.jar.file}" usetimestamp="true"/>
+ </target>
+
+ <target name="init-ivy" depends="download-ivy">
+ <path id="ivy.lib.path">
+ <fileset dir="${ivy.jar.dir}" includes="*.jar"/>
+ </path>
+ <taskdef resource="org/apache/ivy/ant/antlib.xml"
+ uri="antlib:org.apache.ivy.ant" classpathref="ivy.lib.path"/>
+ </target>
<target name="retrieve-deps" description="retrieve dependencies using ivy" depends="init-ivy" unless="offline">
<ivy:settings file="ivysettings.xml"/>
--
GitLab