Changeset 12873 in josm

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:

• README (modified) (1 diff)
• build.xml (modified) (4 diffs)
• src/org/openstreetmap/josm/actions/SplitWayAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/actions/mapmode/MapMode.java (modified) (2 diffs)
• src/org/openstreetmap/josm/data/coor/LatLon.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/osm/DataSet.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/PluginHandler.java (modified) (1 diff)
• tools/animal-sniffer-ant-tasks-1.15.jar (deleted)
• tools/animal-sniffer-ant-tasks.jar (added)

trunk/README

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

trunk/build.xml

@@ -568 +568 @@
         }
 
-        # Keep unused public methods (can be useful for plugins)
-        -keepclassmembers class * {
+        # Keep unused public classes and methods (needed for plugins)
+        -keep public class * {
             public protected *;
         }
 
-        # Keep serialization methods
+        # Keep serialization code
         -keepclassmembers class * implements java.io.Serializable {
+            static final long serialVersionUID; 
+            private static final java.io.ObjectStreamField[] serialPersistentFields;
             private void writeObject(java.io.ObjectOutputStream);
             private void readObject(java.io.ObjectInputStream);
+            java.lang.Object writeReplace(); 
+            java.lang.Object readResolve();
         }
 
@@ -598 +602 @@
         </exec>
     </target>
-    <target name="check-plugins" depends="dist-optimized">
-        <echo message="Check of plugins binary compatibility (needs ant 1.8)"/>
+    <target name="check-plugins" depends="dist-optimized" description="Check of plugins binary compatibility">
         <local name="dir"/>
         <local name="plugins"/>
         <property name="dir" value="plugin-check"/>
         <typedef uri="antlib:org.codehaus.mojo.animal_sniffer">
-            <classpath path="tools/animal-sniffer-ant-tasks-1.15.jar"/>
+            <classpath path="tools/animal-sniffer-ant-tasks.jar"/>
         </typedef>
         <mkdir dir="${dir}"/>
@@ -670 +673 @@
                 <fileset file="${java.home}/lib/rt.jar"/>
                 <fileset file="${java.home}/lib/jce.jar"/>
+                <fileset file="${java.home}/lib/ext/jfxrt.jar"/>
             </path>
         </as:build-signatures>
-        <as:check-signature signature="${dir}/api.sig">
-            <ignore classname="au.edu.*"/>
-            <ignore classname="au.com.*"/>
+        <as:check-signature signature="${dir}/api.sig" failonerror="false">
+            <ignore classname="au.*"/>
             <ignore classname="com.*"/>
-            <ignore classname="de.miethxml.*"/>
-            <ignore classname="javafx.*"/>
+            <ignore classname="de.*"/>
+            <ignore classname="edu.*"/>
+            <ignore classname="groovy.*"/>
+            <ignore classname="it.*"/>
             <ignore classname="javax.*"/>
             <ignore classname="jogamp.*"/>
             <ignore classname="junit.*"/>
-            <ignore classname="net.sf.*"/>
-            <ignore classname="nu.xom.*"/>
+            <ignore classname="kdu_jni.*"/>
+            <ignore classname="net.*"/>
+            <ignore classname="netscape.*"/>
+            <ignore classname="nu.*"/>
+            <ignore classname="oracle.*"/>
             <ignore classname="org.apache.*"/>
+            <ignore classname="org.bouncycastle.*"/>
             <ignore classname="org.codehaus.*"/>
             <ignore classname="org.dom4j.*"/>
+            <ignore classname="org.eclipse.*"/>
+            <ignore classname="org.ejml.*"/>
+            <ignore classname="org.gdal.*"/>
+            <ignore classname="org.hibernate.*"/>
             <ignore classname="org.hsqldb.*"/>
             <ignore classname="org.ibex.*"/>
@@ -691 +704 @@
             <ignore classname="org.jaitools.*"/>
             <ignore classname="org.jaxen.*"/>
+            <ignore classname="org.jboss.*"/>
             <ignore classname="org.jdom2.*"/>
+            <ignore classname="org.jfree.*"/>
             <ignore classname="org.jgraph.*"/>
-            <ignore classname="org.joda.time.*"/>
-            <ignore classname="org.jvnet.staxex.*"/>
+            <ignore classname="org.joda.*"/>
+            <ignore classname="org.junit.*"/>
+            <ignore classname="org.jvnet.*"/>
             <ignore classname="org.kxml2.*"/>
             <ignore classname="org.objectweb.*"/>
+            <ignore classname="org.osgi.*"/>
+            <ignore classname="org.postgresql.*"/>
             <ignore classname="org.python.*"/>
+                <ignore classname="org.seasar.*"/>
             <ignore classname="org.slf4j.*"/>
+            <ignore classname="org.springframework.*"/>
+            <ignore classname="org.testng.*"/>
+            <ignore classname="org.zeromq.*"/>
             <!-- plugins used by another ones -->
             <ignore classname="org.openstreetmap.josm.plugins.geotools.*"/>

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

@@ -533 +533 @@
      * @param selection The list of currently selected primitives
      * @return the result from the split operation
-     * @deprecated to be removed end of 2017. Use {@link #split(Way, List, Collection) instead}
+     * @deprecated to be removed end of 2017. Use {@link #split(Way, List, Collection)} instead
      */
     @Deprecated

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

@@ -72 +72 @@
      * @param mapFrame unused but kept for plugin compatibility. Can be {@code null}
      * @param cursor cursor displayed when map mode is active
-     * @deprecated use {@link #MapMode(String, String, String, Shortcut, Cursor) instead}
+     * @deprecated use {@link #MapMode(String, String, String, Shortcut, Cursor)} instead
      */
     @Deprecated
@@ -86 +86 @@
      * @param mapFrame unused but kept for plugin compatibility. Can be {@code null}
      * @param cursor cursor displayed when map mode is active
-     * @deprecated use {@link #MapMode(String, String, String, Cursor) instead}
+     * @deprecated use {@link #MapMode(String, String, String, Cursor)} instead
      */
     @Deprecated

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

@@ -412 +412 @@
      * @param separator values separator
      * @return String in the format {@code "1.23456[separator]2.34567"}
-     * @deprecated method removed without replacment
+     * @deprecated method removed without replacement
      */
     @Deprecated

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

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

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

@@ -141 +141 @@
             new DeprecatedPlugin("imageryadjust", inCore),
             new DeprecatedPlugin("walkingpapers", tr("replaced by new {0} plugin", "fieldpapers")),
-            new DeprecatedPlugin("czechaddress", tr("no longer required"))
+            new DeprecatedPlugin("czechaddress", tr("no longer required")),
+            new DeprecatedPlugin("kendzi3d_Improved_by_Andrei", tr("no longer required"))
         );
     }