Changeset 36375 in osm for applications/editors/josm


Ignore:
Timestamp:
2025-01-28T17:01:13+01:00 (10 days ago)
Author:
taylor.smock
Message:

Fix build issues for Java 17+

It still fails to build with Java 11 -- errorprone needs to be an older version
for Java 11, and I suspect the ant maven library is not calculating the right
profiles.

Location:
applications/editors/josm/plugins
Files:
2 edited

Legend:

Unmodified
Added
Removed

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

    r36325 r36375  
    137137            <compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED" unless:set="noErrorProne"/>
    138138            <compilerarg line="-XDcompilePolicy=simple"/>
     139            <compilerarg value="--should-stop=ifError=FLOW" />
    139140            <compilerarg value="-processorpath"/>
    140141            <compilerarg pathref="errorprone.classpath"/>

  • applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/replacegeometry/ReplaceGeometryUtils.java

    r35976 r36375  
    106106        if (firstNode.isNew() && !secondNode.isNew())
    107107            return buildReplaceNodeCommand(secondNode, firstNode);
    108         else if (!firstNode.isNew() && secondNode.isNew())
    109             return buildReplaceNodeCommand(firstNode, secondNode);
    110         else
     108        else // if (!firstNode.isNew() && secondNode.isNew()) -- merge same code branches
    111109            // both nodes are new OR uploaded, act like MergeNodes, moving first
    112110            // node to second
Note: See TracChangeset for help on using the changeset viewer.