Changeset 18072 in josm

Timestamp:

2021-07-19T13:25:26+02:00 (3 years ago)

Author:

Don-vip

Message:

fix #16868 - build cleanup

Location:

trunk

Files:

• build.xml (modified) (3 diffs)
• src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java (modified) (1 diff)
• src/org/openstreetmap/josm/tools/Utils.java (modified) (1 diff)
• tools/ivy.xml (modified) (1 diff)

trunk/build.xml

@@ -198 +198 @@
         </java>
     </target>
-    <target name="compile-cots" depends="init" description="Compile third-party dependencies not retrieved with Ivy">
-        <!-- COTS -->
-        <javac srcdir="${src.dir}" includes="com/kitfox/**" excludes="**/package-info.java" nowarn="on" encoding="iso-8859-1"
-            destdir="${build.dir}" release="${java.lang.version}" debug="on" includeAntRuntime="false">
-            <!-- get rid of "internal proprietary API" warning -->
-            <compilerarg value="-XDignore.symbol.file"/>
-            <classpath>
-                <path refid="runtime.path"/>
-            </classpath>
-        </javac>
-    </target>
-    <target name="compile" depends="init,javacc,compile-cots" unless="compile.notRequired" description="Compile JOSM">
+    <target name="compile" depends="init,javacc" unless="compile.notRequired" description="Compile JOSM">
         <ivy:cachepath log="download-only" file="${tools.ivy}" pathid="errorprone.classpath" conf="errorprone"/>
         <ivy:cachepath log="download-only" file="${tools.ivy}" pathid="errorprone_javac.classpath" conf="errorprone_javac"/>
@@ -966 +955 @@
             <fileset refid="runtime.fileset" />
         </copy>
-        <jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/svgSalamander.jar" includes="com/kitfox/**/*.class"/>
-        <jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/oauth-signpost.jar" includes="oauth/**/*.class"/>
-        <jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/commons-jcs.jar" includes="org/apache/commons/jcs3/**/*.class"/>
-        <jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/jmapviewer.jar" includes="org/openstreetmap/gui/**/*.class"/>
         <exec executable="jdeps" dir="${modules.dir}">
             <arg line="-f 'java.*|org.xml.*|org.w3c.*|sun.*|com.sun.*|com.google.*|org.tukaani.*'"/>
@@ -1042 +1027 @@
                 <exclude name="com/drew/metadata/webp/**"/>
                 <exclude name="com/drew/tools/**"/>
+                <exclude name="com/kitfox/svg/app/ant/**"/>
+                <exclude name="com/kitfox/svg/app/*Dialog*"/>
+                <exclude name="com/kitfox/svg/app/*Frame*"/>
+                <exclude name="com/kitfox/svg/app/*Player*"/>
+                <exclude name="com/kitfox/svg/app/*Viewer*"/>
                 <exclude name="org/apache/commons/compress/PasswordRequiredException*"/>
                 <exclude name="org/apache/commons/compress/archivers/**"/>

trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java

@@ -307 +307 @@
      */
     public final void actOnDecisions(BiConsumer<String, MultiValueResolutionDecision> action) {
-        decisions.forEach(action::accept);
+        decisions.forEach(action);
     }
 }

trunk/src/org/openstreetmap/josm/tools/Utils.java

@@ -670 +670 @@
      *     How to Prevent Your Java Collections From Wasting Memory</a>
      */
+    @SuppressWarnings("unchecked")
     public static <K, V> Map<K, V> toUnmodifiableMap(Map<K, V> map) {
         if (map == null || map.isEmpty()) {

trunk/tools/ivy.xml

@@ -19 +19 @@
         <dependency org="com.puppycrawl.tools" name="checkstyle" rev="8.43" conf="checkstyle->default"/>
         <!-- proguard->default -->
-        <dependency org="com.guardsquare" name="proguard-ant" rev="7.1.0-beta3" conf="proguard->default"/>
+        <dependency org="com.guardsquare" name="proguard-ant" rev="7.1.0" conf="proguard->default"/>
         <!-- pmd->default -->
         <dependency org="net.sourceforge.pmd" name="pmd-core" rev="6.20.0" conf="pmd->default"/>