Changeset 16243 in josm

Timestamp:

2020-04-06T09:47:17+02:00 (5 years ago)

Author:

simon04

Message:

see #16860 - Apache Ivy: tune logging

File:

• trunk/build.xml (modified) (9 diffs)

trunk/build.xml

@@ -274 +274 @@
     </target>
     <target name="javacc" depends="init" unless="javacc.notRequired">
-        <ivy:cachepath file="${tools.ivy}" pathid="javacc.classpath" conf="javacc"/>
+        <ivy:cachepath log="download-only" file="${tools.ivy}" pathid="javacc.classpath" conf="javacc"/>
         <mkdir dir="${mapcss.dir}/parsergen"/>
         <java classname="javacc" fork="true" failonerror="true">
@@ -395 +395 @@
             <pathelement path="${resources.dir}"/>
         </path>
-        <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"/>
+        <ivy:retrieve log="download-only" pattern="${test.dir}/lib/[artifact].[ext]" conf="jmockit"/>
+        <ivy:retrieve log="download-only" pattern="${tools.dir}/[artifact].[ext]" conf="commonslang"/>
+        <ivy:retrieve log="download-only" 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>
@@ -568 +568 @@
     </target>
     <target name="dist-optimized" depends="dist" unless="isJava13">
-        <ivy:cachepath file="${tools.ivy}" pathid="proguard.classpath" conf="proguard"/>
+        <ivy:cachepath log="download-only" file="${tools.ivy}" pathid="proguard.classpath" conf="proguard"/>
         <taskdef resource="proguard/ant/task.properties" classpathref="proguard.classpath"/>
         <proguard>
@@ -879 +879 @@
 
     <target name="checkstyle-compile" depends="init-properties">
-        <ivy:cachepath file="${tools.ivy}" pathid="checkstyle.classpath" conf="checkstyle"/>
+        <ivy:cachepath log="download-only" file="${tools.ivy}" pathid="checkstyle.classpath" conf="checkstyle"/>
         <mkdir dir="${checkstyle-build.dir}"/>
         <javac sourcepath="" srcdir="${checkstyle.dir}/src" failonerror="true"
@@ -913 +913 @@
 
     <target name="spotbugs" depends="dist">
-        <ivy:cachepath file="${tools.ivy}" pathid="spotbugs.classpath" conf="spotbugs"/>
+        <ivy:cachepath log="download-only" file="${tools.ivy}" pathid="spotbugs.classpath" conf="spotbugs"/>
         <taskdef name="spotbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask" classpathref="spotbugs.classpath"/>
         <spotbugs output="xml"
@@ -929 +929 @@
 
     <target name="pmd" depends="init-properties">
-        <ivy:cachepath file="${tools.ivy}" pathid="pmd.classpath" conf="pmd"/>
+        <ivy:cachepath log="download-only" file="${tools.ivy}" pathid="pmd.classpath" conf="pmd"/>
         <taskdef name="pmd" classname="net.sourceforge.pmd.ant.PMDTask" classpathref="pmd.classpath"/>
         <pmd shortFilenames="true" cacheLocation="${pmd.dir}/cache" encoding="UTF-8">
@@ -1049 +1049 @@
     <target name="resolve" depends="init-ivy" unless="resolve.notRequired" description="Resolve Ivy dependencies">
         <ivy:settings file="${base.dir}/ivysettings.xml"/>
-        <ivy:resolve file="${base.dir}/ivy.xml" keep="true"/>
-        <ivy:report todir="${tools.dir}/ivy-report" graph="false"/>
-        <ivy:cachepath pathid="compile.path" conf="compile"/>
-        <ivy:cachepath pathid="runtime.path" conf="runtime"/>
-        <ivy:cachefileset setid="runtime.fileset" conf="runtime"/>
-        <ivy:cachepath pathid="test.path" conf="test"/>
+        <ivy:resolve log="download-only" file="${base.dir}/ivy.xml" keep="true"/>
+        <ivy:cachepath log="download-only" pathid="compile.path" conf="compile"/>
+        <ivy:cachepath log="download-only" pathid="runtime.path" conf="runtime"/>
+        <ivy:cachefileset log="download-only" setid="runtime.fileset" conf="runtime"/>
+        <ivy:cachepath log="download-only" pathid="test.path" conf="test"/>
     </target>
     <target name="extract-libraries" depends="resolve" description="extract libraries to build dir">
@@ -1130 +1129 @@
     </target>
     <target name="sources" description="Generates jar file of JOSM source files and its dependencies" depends="init,epsg,resolve">
-        <ivy:cachefileset setid="sources.fileset" conf="sources"/>
+        <ivy:cachefileset log="download-only" setid="sources.fileset" conf="sources"/>
         <jar destfile="${dist-sources.jar}" level="${clevel}">
             <zipgroupfileset refid="sources.fileset"/>
@@ -1147 +1146 @@
         <ivy:retrieve pattern="${lib.dir}/tools/[artifact]-[type].[ext]" conf="javacc,checkstyle,pmd,spotbugs" file="${tools.ivy}"/>
     </target>
+    <target name="ivy-report" description="Generates Ivy reports of dependency resolving" depends="resolve">
+        <ivy:report todir="${tools.dir}/ivy-report" graph="false"/>
+    </target>
     <target name="api-dependency-tree" description="Displays Ivy dependency tree for JOSM API" depends="resolve">
         <ivy:dependencytree conf="api"/>