Changeset 16231 in josm

Timestamp:

2020-04-04T17:31:37+02:00 (4 years ago)

Author:

Don-vip

Message:

see #16860 - fix compilation of scripts

Location:

trunk

Files:

• build.xml (modified) (2 diffs)
• ivy.xml (modified) (4 diffs)

trunk/build.xml

@@ -68 +68 @@
         <property name="javacutil.jar" location="${tools.dir}/javacutil.jar"/>
         <property name="failureaccess.jar" location="${tools.dir}/failureaccess.jar"/>
+        <property name="commons-lang3.jar" location="${tools.dir}/commons-lang3.jar"/>
         <property name="jformatstring.jar" location="${spotbugs.dir}/jFormatString-3.0.0.jar"/>
         <property name="dist.jar" location="${dist.dir}/josm-custom.jar"/>
@@ -394 +395 @@
             <pathelement path="${resources.dir}"/>
         </path>
-        <ivy:retrieve pattern="${test.dir}/lib/[artifact].[ext]" conf="jmockit"/>
-        <ivy:retrieve pattern="${tools.dir}/[conf].[ext]" conf="jacocoant"/>
+        <ivy:retrieve pattern="${test.dir}/lib/[artifact].[ext]" conf="jmockit"/>
+        <ivy:retrieve pattern="${tools.dir}/[artifact].[ext]" conf="commonslang"/>
+        <ivy:retrieve pattern="${tools.dir}/[conf].[ext]" conf="jacocoant"/>
         <taskdef uri="antlib:org.jacoco.ant" resource="org/jacoco/ant/antlib.xml" classpath="${tools.dir}/jacocoant.jar" />
     </target>

trunk/ivy.xml

@@ -11 +11 @@
         <conf name="epsg" description="Everything epsg needs- which is currently all of JOSM."/>
         <!-- Special configurations used to retrieve jar files of test lib/tools referred by file path -->
+        <conf name="commonslang" description="Apache Commons Lang test library"/>
         <conf name="jmockit" description="JMockit test library"/>
         <conf name="jacocoant" description="Jacoco Ant test library"/>
@@ -16 +17 @@
         <conf name="runtime" description="Libraries only needed at runtime" extends="implementation,api,runtimeOnly"/>
         <conf name="compile" description="Libraries needed only for compilation" extends="implementation,api,provided"/>
-        <conf name="test" description="Libraries only needed for testing" extends="compile,runtime,jmockit"/>
+        <conf name="test" description="Libraries only needed for testing" extends="compile,runtime,commonslang,jmockit"/>
         <conf name="sources" description="Source code of used libraries"/>
     </configurations>
@@ -40 +41 @@
         <dependency conf="sources->sources" org="com.drewnoakes" name="metadata-extractor" rev="2.13.0"/>
         <dependency conf="sources->sources" org="ch.poole" name="OpeningHoursParser" rev="0.21.1"/>
+        <!-- commonslang->default -->
+        <dependency conf="commonslang->default" org="org.apache.commons" name="commons-lang3" rev="3.10"/>
         <!-- jacocoant->default -->
         <dependency conf="jacocoant->default" org="org.jacoco" name="org.jacoco.ant" rev="0.8.6-SNAPSHOT">
-                <artifact name="org.jacoco.ant" type="jar" maven:classifier="nodeps"/>
+            <artifact name="org.jacoco.ant" type="jar" maven:classifier="nodeps"/>
         </dependency>
         <!-- jmockit->default - Don't upgrade JMockit until https://josm.openstreetmap.de/ticket/18200 is resolved -->
@@ -49 +52 @@
         <dependency conf="test->default" org="com.github.spotbugs" name="spotbugs-annotations" rev="4.0.1"/>
         <dependency conf="test->default" org="com.github.stefanbirkner" name="system-rules" rev="1.19.0">
-                <exclude module="junit-dep" />
+            <exclude module="junit-dep" />
         </dependency>
         <dependency conf="test->default" org="com.github.tomakehurst" name="wiremock" rev="2.26.3"/>