Changeset 16183 in josm for trunk

Timestamp:

2020-03-21T12:49:56+01:00 (4 years ago)

Author:

simon04

Message:

see #16860 - <get> Apache Ivy, remove ivy.jar from repository

Location:

trunk

Files:

• build.xml (modified) (2 diffs)
• ivy.xml (modified) (1 diff)
• tools/ivy/ivy.jar (deleted)
• tools/ivy/ivy.xml (deleted)
• tools/ivy/ivy.xsd (deleted)

trunk/build.xml

@@ -17 +17 @@
 >
     <target name="init-ivy">
+        <property name="ivy.version" value="2.5.0"/>
         <dirname property="base.dir" file="${ant.file.josm}"/>
         <property name="lib.dir"   location="${base.dir}/lib"/>
         <property name="tools.dir" location="${base.dir}/tools"/>
         <property name="tools.ivy" location="${tools.dir}/ivy.xml"/>
-        <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant" classpath="${tools.dir}/ivy/ivy.jar"/>
+        <property name="ivy.jar.dir" location="${tools.dir}/ivy"/>
+        <property name="ivy.jar.file" location="${ivy.jar.dir}/ivy-${ivy.version}.jar"/>
+        <mkdir dir="${ivy.jar.dir}"/>
+        <get src="https://josm.openstreetmap.de/nexus/content/repositories/public/org/apache/ivy/ivy/${ivy.version}/ivy-${ivy.version}.jar"
+             dest="${ivy.jar.file}"
+             skipexisting="true"
+        />
+        <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant" classpath="${ivy.jar.file}"/>
     </target>
     <target name="init-properties" depends="resolve">
@@ -1096 +1104 @@
         <ivy:cachefileset setid="runtime.fileset" conf="runtime"/>
         <ivy:cachepath pathid="test.path" conf="test"/>
-        <ivy:retrieve pattern="${tools.dir}/ivy/[artifact]-[type].[ext]" conf="ivy"/>
     </target>
     <target name="extract-libraries" depends="resolve" description="extract libraries to build dir">

trunk/ivy.xml

@@ -4 +4 @@
     <info organisation="org.openstreetmap" module="josm"/>
     <configurations>
-        <conf name="ivy" description="Apache Ivy configuration for self-update"/>
         <!--  configuration that should be used when specifying dependencies -->
         <conf name="implementation" description="All libs JOSM uses that plugins should not use"/>