Changeset 12873 in josm for trunk


Ignore:
Timestamp:
2017-09-17T18:52:49+02:00 (7 years ago)
Author:
Don-vip
Message:
  • mark kendzi3d_Improved_by_Andrei plugin as unmaintained
  • fix javadoc issues in deprecated comments
  • update animal-sniffer-ant-tasks to 1.16 + patch to make it not fail the build (see ​https://github.com/mojohaus/animal-sniffer/pull/34)
  • update the check-plugins task, make it not fail the build
Location:
trunk
Files:
1 added
1 deleted
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/README

    r12801 r12873  
    117117    - unit/                 unit tests (source code)
    118118- tools/                    libraries and tools that help in the development process
    119     - animal-sniffer-ant-tasks-1.15.jar
     119    - animal-sniffer-ant-tasks.jar
    120120                            used to build and check code signatures to ensure plugins binary compatibility
    121121    - appbundler-1.0ea.jar  used to build Mac OS X package

  • trunk/build.xml

    r12801 r12873  
    568568        }
    569569
    570         # Keep unused public methods (can be useful for plugins)
    571         -keepclassmembers class * {
     570        # Keep unused public classes and methods (needed for plugins)
     571        -keep public class * {
    572572            public protected *;
    573573        }
    574574
    575         # Keep serialization methods
     575        # Keep serialization code
    576576        -keepclassmembers class * implements java.io.Serializable {
     577            static final long serialVersionUID;
     578            private static final java.io.ObjectStreamField[] serialPersistentFields;
    577579            private void writeObject(java.io.ObjectOutputStream);
    578580            private void readObject(java.io.ObjectInputStream);
     581            java.lang.Object writeReplace();
     582            java.lang.Object readResolve();
    579583        }
    580584
    … …  
    598602        </exec>
    599603    </target>
    600     <target name="check-plugins" depends="dist-optimized">
    601         <echo message="Check of plugins binary compatibility (needs ant 1.8)"/>
     604    <target name="check-plugins" depends="dist-optimized" description="Check of plugins binary compatibility">
    602605        <local name="dir"/>
    603606        <local name="plugins"/>
    604607        <property name="dir" value="plugin-check"/>
    605608        <typedef uri="antlib:org.codehaus.mojo.animal_sniffer">
    606             <classpath path="tools/animal-sniffer-ant-tasks-1.15.jar"/>
     609            <classpath path="tools/animal-sniffer-ant-tasks.jar"/>
    607610        </typedef>
    608611        <mkdir dir="${dir}"/>
    … …  
    670673                <fileset file="${java.home}/lib/rt.jar"/>
    671674                <fileset file="${java.home}/lib/jce.jar"/>
     675                <fileset file="${java.home}/lib/ext/jfxrt.jar"/>
    672676            </path>
    673677        </as:build-signatures>
    674         <as:check-signature signature="${dir}/api.sig">
    675             <ignore classname="au.edu.*"/>
    676             <ignore classname="au.com.*"/>
     678        <as:check-signature signature="${dir}/api.sig" failonerror="false">
     679            <ignore classname="au.*"/>
    677680            <ignore classname="com.*"/>
    678             <ignore classname="de.miethxml.*"/>
    679             <ignore classname="javafx.*"/>
     681            <ignore classname="de.*"/>
     682            <ignore classname="edu.*"/>
     683            <ignore classname="groovy.*"/>
     684            <ignore classname="it.*"/>
    680685            <ignore classname="javax.*"/>
    681686            <ignore classname="jogamp.*"/>
    682687            <ignore classname="junit.*"/>
    683             <ignore classname="net.sf.*"/>
    684             <ignore classname="nu.xom.*"/>
     688            <ignore classname="kdu_jni.*"/>
     689            <ignore classname="net.*"/>
     690            <ignore classname="netscape.*"/>
     691            <ignore classname="nu.*"/>
     692            <ignore classname="oracle.*"/>
    685693            <ignore classname="org.apache.*"/>
     694            <ignore classname="org.bouncycastle.*"/>
    686695            <ignore classname="org.codehaus.*"/>
    687696            <ignore classname="org.dom4j.*"/>
     697            <ignore classname="org.eclipse.*"/>
     698            <ignore classname="org.ejml.*"/>
     699            <ignore classname="org.gdal.*"/>
     700            <ignore classname="org.hibernate.*"/>
    688701            <ignore classname="org.hsqldb.*"/>
    689702            <ignore classname="org.ibex.*"/>
    … …  
    691704            <ignore classname="org.jaitools.*"/>
    692705            <ignore classname="org.jaxen.*"/>
     706            <ignore classname="org.jboss.*"/>
    693707            <ignore classname="org.jdom2.*"/>
     708            <ignore classname="org.jfree.*"/>
    694709            <ignore classname="org.jgraph.*"/>
    695             <ignore classname="org.joda.time.*"/>
    696             <ignore classname="org.jvnet.staxex.*"/>
     710            <ignore classname="org.joda.*"/>
     711            <ignore classname="org.junit.*"/>
     712            <ignore classname="org.jvnet.*"/>
    697713            <ignore classname="org.kxml2.*"/>
    698714            <ignore classname="org.objectweb.*"/>
     715            <ignore classname="org.osgi.*"/>
     716            <ignore classname="org.postgresql.*"/>
    699717            <ignore classname="org.python.*"/>
     718                <ignore classname="org.seasar.*"/>
    700719            <ignore classname="org.slf4j.*"/>
     720            <ignore classname="org.springframework.*"/>
     721            <ignore classname="org.testng.*"/>
     722            <ignore classname="org.zeromq.*"/>
    701723            <!-- plugins used by another ones -->
    702724            <ignore classname="org.openstreetmap.josm.plugins.geotools.*"/>

  • trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java

    r12828 r12873  
    533533     * @param selection The list of currently selected primitives
    534534     * @return the result from the split operation
    535      * @deprecated to be removed end of 2017. Use {@link #split(Way, List, Collection) instead}
     535     * @deprecated to be removed end of 2017. Use {@link #split(Way, List, Collection)} instead
    536536     */
    537537    @Deprecated

  • trunk/src/org/openstreetmap/josm/actions/mapmode/MapMode.java

    r12846 r12873  
    7272     * @param mapFrame unused but kept for plugin compatibility. Can be {@code null}
    7373     * @param cursor cursor displayed when map mode is active
    74      * @deprecated use {@link #MapMode(String, String, String, Shortcut, Cursor) instead}
     74     * @deprecated use {@link #MapMode(String, String, String, Shortcut, Cursor)} instead
    7575     */
    7676    @Deprecated
    … …  
    8686     * @param mapFrame unused but kept for plugin compatibility. Can be {@code null}
    8787     * @param cursor cursor displayed when map mode is active
    88      * @deprecated use {@link #MapMode(String, String, String, Cursor) instead}
     88     * @deprecated use {@link #MapMode(String, String, String, Cursor)} instead
    8989     */
    9090    @Deprecated

  • trunk/src/org/openstreetmap/josm/data/coor/LatLon.java

    r12792 r12873  
    412412     * @param separator values separator
    413413     * @return String in the format {@code "1.23456[separator]2.34567"}
    414      * @deprecated method removed without replacment
     414     * @deprecated method removed without replacement
    415415     */
    416416    @Deprecated

  • trunk/src/org/openstreetmap/josm/data/osm/DataSet.java

    r12758 r12873  
    834834     * @param selection the selection
    835835     * @param fireSelectionChangeEvent true, if the selection change listeners are to be notified; false, otherwise
    836      * @deprecated Use {@link #setSelected(Collection)} instead. To bee removed end of 2017. Does not seem to be used by plugins.
     836     * @deprecated Use {@link #setSelected(Collection)} instead. To be removed end of 2017. Does not seem to be used by plugins.
    837837     */
    838838    @Deprecated

  • trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java

    r12870 r12873  
    141141            new DeprecatedPlugin("imageryadjust", inCore),
    142142            new DeprecatedPlugin("walkingpapers", tr("replaced by new {0} plugin", "fieldpapers")),
    143             new DeprecatedPlugin("czechaddress", tr("no longer required"))
     143            new DeprecatedPlugin("czechaddress", tr("no longer required")),
     144            new DeprecatedPlugin("kendzi3d_Improved_by_Andrei", tr("no longer required"))
    144145        );
    145146    }
Note: See TracChangeset for help on using the changeset viewer.