Changeset 36208 in osm for applications/editors

Timestamp:

2024-02-12T23:01:03+01:00 (12 months ago)

Author:

taylor.smock

Message:

Fix #23465: Remove custom checkstyle plugin

TopLevelJavadocCheck.java is duplicating functionality from MissingJavadocType.
Our custom class is from #14794 (closed 2017-10-16). The check that makes it
redundant was added in checkstyle 8.20 (released 2019-04-28).

This adds the missing javadocs for the more comprehensive checkstyle version.

Location:

applications/editors/josm/plugins

Files:

• build-common.xml (modified) (3 diffs)
• checkstyle-config.xml (modified) (2 diffs)

applications/editors/josm/plugins/build-common.xml

@@ -18 +18 @@
     <property name="josm.test.build.dir"    location="../../core/test/build"/>
     <property name="jmockit.jar"            location="../00_core_test_lib/jmockit.jar"/>
-    <property name="checkstyle-build.dir"   location="../00_core_tools/checkstyle/build"/>
     <property name="annotations.jar"        location="../00_core_tools/spotbugs/spotbugs-annotations.jar"/>
     <property name="core.tools.ivy"         location="../00_core_tools/ivy.xml"/>
@@ -411 +410 @@
         <delete dir="${plugin.build.dir}"/>
         <delete dir="${plugin.doc.dir}"/>
-        <delete dir="${checkstyle-build.dir}"/>
         <delete file="${plugin.jar}"/>
         <delete file="${plugin.sources.jar}"/>
@@ -648 +646 @@
     </target>
 
-    <target name="checkstyle-compile" depends="resolve-tools">
-        <mkdir dir="${checkstyle-build.dir}"/>
-        <javac sourcepath="" srcdir="../00_core_tools/checkstyle/src" failonerror="true"
-            destdir="${checkstyle-build.dir}" release="${java.lang.version}" debug="on"
-            includeantruntime="false" createMissingPackageInfoClass="false"
-            encoding="UTF-8" classpathref="checkstyle.classpath">
-        </javac>
-    </target>
-    <target name="checkstyle" depends="checkstyle-compile">
+    <target name="checkstyle" depends="resolve-tools">
         <taskdef resource="com/puppycrawl/tools/checkstyle/ant/checkstyle-ant-task.properties">
             <classpath refid="checkstyle.classpath"/>
-            <classpath path="${checkstyle-build.dir}"/>
         </taskdef>
         <checkstyle config="${basedir}/../checkstyle-config.xml">

applications/editors/josm/plugins/checkstyle-config.xml

@@ -32 +32 @@
       <property name="checkHtml" value="false"/>
     </module>
+    <module name="MissingJavadocType"/>
     <module name="NonEmptyAtclauseDescription"/>
     <module name="AtclauseOrder"/>
@@ -96 +97 @@
     <module name="FinalClass"/>
     <module name="HideUtilityClassConstructor"/>
-    <module name="org.openstreetmap.josm.TopLevelJavadocCheck"/>
     <module name="SuppressionCommentFilter">
       <property name="offCommentFormat" value="CHECKSTYLE\.OFF\: ([\w\|]+)"/>