Skip to content

Commit

Permalink
* mark kendzi3d_Improved_by_Andrei plugin as unmaintained
Browse files Browse the repository at this point in the history
* fix javadoc issues in deprecated comments
* update `animal-sniffer-ant-tasks` to 1.16 + patch to make it not fail the build (see mojohaus/animal-sniffer#34)
* update the `check-plugins` task, make it not fail the build

git-svn-id: http://josm.openstreetmap.de/svn/trunk@12873 0c6e7542-c601-0410-84e7-c038aed88b3b
  • Loading branch information
don-vip committed Sep 17, 2017
1 parent c3f044f commit d41ada6
Show file tree
Hide file tree
Showing 9 changed files with 45 additions and 22 deletions.
2 changes: 1 addition & 1 deletion README
Expand Up @@ -116,7 +116,7 @@ This is an overview of the files and directories in the JOSM code repository:
- performance/ performance tests (source code)
- 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
- checkstyle/ libs and config files for checkstyle (automatically detects code style
Expand Down
52 changes: 37 additions & 15 deletions build.xml
Expand Up @@ -567,15 +567,19 @@ Build-Date: ${build.tstamp}
public static ** valueOf(java.lang.String);
}

# 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();
}

# Disable annoying [proguard] Note: the configuration keeps the entry point '...', but not the descriptor class '...'.
Expand All @@ -597,13 +601,12 @@ Build-Date: ${build.tstamp}
<arg value="${dist-optimized.jar}"/>
</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}"/>
<!-- List of deprecated plugins -->
Expand Down Expand Up @@ -669,35 +672,54 @@ Build-Date: ${build.tstamp}
<fileset file="${dist-optimized.jar}"/>
<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.*"/>
<ignore classname="org.iso_relax.*"/>
<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.*"/>
<ignore classname="org.openstreetmap.josm.plugins.jna.*"/>
Expand Down
2 changes: 1 addition & 1 deletion src/org/openstreetmap/josm/actions/SplitWayAction.java
Expand Up @@ -532,7 +532,7 @@ static void doSplitWay(Way way, Way wayToKeep, List<Way> newWays, List<OsmPrimit
* @param atNodes the list of nodes where the way is split. Must not be null.
* @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
public static SplitWayResult split(OsmDataLayer layer, Way way, List<Node> atNodes, Collection<? extends OsmPrimitive> selection) {
Expand Down
4 changes: 2 additions & 2 deletions src/org/openstreetmap/josm/actions/mapmode/MapMode.java
Expand Up @@ -71,7 +71,7 @@ public MapMode(String name, String iconName, String tooltip, Cursor cursor) {
* @param shortcut a ready-created shortcut object or null if you don't want a shortcut.
* @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
public MapMode(String name, String iconName, String tooltip, Shortcut shortcut, MapFrame mapFrame, Cursor cursor) {
Expand All @@ -85,7 +85,7 @@ public MapMode(String name, String iconName, String tooltip, Shortcut shortcut,
* @param tooltip a longer description of the action that will be displayed in the tooltip.
* @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
public MapMode(String name, String iconName, String tooltip, MapFrame mapFrame, Cursor cursor) {
Expand Down
2 changes: 1 addition & 1 deletion src/org/openstreetmap/josm/data/coor/LatLon.java
Expand Up @@ -411,7 +411,7 @@ public String toDisplayString() {
* Returns this lat/lon pair in human-readable format separated by {@code separator}.
* @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
public String toStringCSV(String separator) {
Expand Down
2 changes: 1 addition & 1 deletion src/org/openstreetmap/josm/data/osm/DataSet.java
Expand Up @@ -833,7 +833,7 @@ public void setHighlightedWaySegments(Collection<WaySegment> waySegments) {
*
* @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
public void setSelected(Collection<? extends PrimitiveId> selection, boolean fireSelectionChangeEvent) {
Expand Down
3 changes: 2 additions & 1 deletion src/org/openstreetmap/josm/plugins/PluginHandler.java
Expand Up @@ -140,7 +140,8 @@ public final class PluginHandler {
new DeprecatedPlugin("OpenStreetView", tr("replaced by new {0} plugin", "OpenStreetCam")),
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"))
);
}

Expand Down
Binary file removed tools/animal-sniffer-ant-tasks-1.15.jar
Binary file not shown.
Binary file added tools/animal-sniffer-ant-tasks.jar
Binary file not shown.

0 comments on commit d41ada6

Please sign in to comment.