Changeset 16166 in josm

Timestamp:

2020-03-17T21:38:32+01:00 (6 years ago)

Author:

simon04

Message:

see #16860 - Resolve SpotBugs using Apache Ivy

Location:

trunk

Files:

• build.xml (modified) (1 diff)
• ivy.xml (modified) (2 diffs)
• tools/spotbugs/asm-7.0.jar (deleted)
• tools/spotbugs/asm-analysis-7.0.jar (deleted)
• tools/spotbugs/asm-commons-7.0.jar (deleted)
• tools/spotbugs/asm-tree-7.0.jar (deleted)
• tools/spotbugs/asm-util-7.0.jar (deleted)
• tools/spotbugs/bcel-6.3.jar (deleted)
• tools/spotbugs/commons-lang-2.6.jar (deleted)
• tools/spotbugs/dom4j-2.1.1.jar (deleted)
• tools/spotbugs/jaxen-1.1.6.jar (deleted)
• tools/spotbugs/jcip-annotations-1.0.jar (deleted)
• tools/spotbugs/jsr305-3.0.2.jar (deleted)
• tools/spotbugs/log4j-api-2.11.1.jar (deleted)
• tools/spotbugs/log4j-core-2.11.1.jar (deleted)
• tools/spotbugs/log4j-slf4j18-impl-2.11.1.jar (deleted)
• tools/spotbugs/slf4j-api-1.8.0-beta2.jar (deleted)
• tools/spotbugs/spotbugs-ant.jar (deleted)
• tools/spotbugs/spotbugs.jar (deleted)

trunk/build.xml

@@ -948 +948 @@
 
     <target name="spotbugs" depends="dist">
-        <taskdef name="spotbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask" classpath="${spotbugs.dir}/spotbugs-ant.jar"/>
-        <path id="spotbugs-classpath">
-            <fileset dir="${spotbugs.dir}">
-                <include name="*.jar"/>
-            </fileset>
-        </path>
-        <property name="spotbugs-classpath" refid="spotbugs-classpath"/>
+        <ivy:cachepath pathid="spotbugs.classpath" conf="spotbugs"/>
+        <taskdef name="spotbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask" classpath="${toString:spotbugs.classpath}"/>
         <spotbugs output="xml"
                 outputFile="spotbugs-josm.xml"
-                classpath="${spotbugs-classpath}"
+                classpath="${toString:spotbugs.classpath}"
                 pluginList=""
                 excludeFilter="${spotbugs.dir}/josm-filter.xml"

trunk/ivy.xml

@@ -11 +11 @@
         <conf name="provided" description="The libs we need during compilation but not on application start"/>
         <conf name="pmd" description="Everything needed for running PMD"/>
+        <conf name="spotbugs" description="Everything needed for running SpotBugs"/>
         <conf name="epsg" description="Everything epsg needs- which is currently all of JOSM."/>
         <!--  Meta configuration used in build scripts -->
@@ -34 +35 @@
             <artifact name="saxon" type="jar" maven:classifier="dom"/>
         </dependency>
+        <!-- spotbugs->default -->
+        <dependency org="com.github.spotbugs" name="spotbugs" rev="3.1.12" conf="spotbugs->default"/>
+        <dependency org="com.github.spotbugs" name="spotbugs-ant" rev="3.1.12" conf="spotbugs->default"/>
         <!-- sources->sources -->
         <dependency org="javax.json" name="javax.json-api" rev="1.1.4" conf="sources->sources"/>