Changeset 14417 in josm


Ignore:
Timestamp:
2018-11-07T22:18:57+01:00 (5 weeks ago)
Author:
Don-vip
Message:

see #16866 - drop/update remaining files

Location:
trunk
Files:
1 deleted
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/.checkstyle

    r12586 r14417  
    1111  <filter name="FilesFromPackage" enabled="true">
    1212    <filter-data value="src/com"/>
    13     <filter-data value="src/gnu"/>
    1413    <filter-data value="src/javax"/>
    1514    <filter-data value="src/oauth"/>
  • trunk/README

    r13395 r14417  
    204204    src/oauth, src/com/google
    205205    -> https://github.com/mttkay/signpost
    206 * GNU getopt Java port: Command line argument processing library
    207     src/gnu/getopt
    208     -> https://github.com/arenn/java-getopt
    209206* MultiSplitPane: Small lib for GUI layout management
    210207    src/org/openstreetmap/josm/gui/MultiSplitLayout.java, MultiSplitPane.java
  • trunk/build.xml

    r14383 r14417  
    274274    <target name="compile-cots" depends="init">
    275275        <!-- COTS -->
    276         <javac srcdir="${src.dir}" includes="com/**,javax/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/tukaani/**,gnu/**" nowarn="on" encoding="iso-8859-1"
     276        <javac srcdir="${src.dir}" includes="com/**,javax/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/tukaani/**" nowarn="on" encoding="iso-8859-1"
    277277            destdir="${build.dir}" target="${java.lang.version}" source="${java.lang.version}" debug="on" includeAntRuntime="false" createMissingPackageInfoClass="false">
    278278            <!-- get rid of "internal proprietary API" warning -->
     
    329329        <!-- JMapViewer -->
    330330        <javac sourcepath="" srcdir="${src.dir}" fork="yes"
    331             excludes="com/**,javax/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java,org/openstreetmap/gui/jmapviewer/JMapViewerTree.java,org/openstreetmap/gui/jmapviewer/checkBoxTree/**,org/openstreetmap/josm/**,org/tukaani/**,gnu/**"
     331            excludes="com/**,javax/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java,org/openstreetmap/gui/jmapviewer/JMapViewerTree.java,org/openstreetmap/gui/jmapviewer/checkBoxTree/**,org/openstreetmap/josm/**,org/tukaani/**"
    332332            destdir="${build.dir}" target="${java.lang.version}" source="${java.lang.version}" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8">
    333333            <compilerarg value="-J-Xbootclasspath/p:${error_prone_javac.jar}" unless:set="isJava9"/>
     
    355355        <!-- JOSM -->
    356356        <javac sourcepath="" srcdir="${src.dir}" fork="yes"
    357             excludes="com/**,javax/**,gnu/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/**,org/tukaani/**"
     357            excludes="com/**,javax/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/**,org/tukaani/**"
    358358            destdir="${build.dir}" target="${java.lang.version}" source="${java.lang.version}" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8">
    359359            <compilerarg value="-J-Xbootclasspath/p:${error_prone_javac.jar}" unless:set="isJava9"/>
     
    10071007        <jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/josm-tools.jar" includes="org/openstreetmap/josm/tools/**/*.class"/>
    10081008        <exec executable="jdeps" dir="${modules.dir}">
    1009             <arg line="-f 'java.*|org.xml.*|org.w3c.*|sun.*|com.*|gnu.*|oauth.*|org.apache.*|org.glassfish.*|org.jdesktop.*|org.openstreetmap.gui.*'"/>
     1009            <arg line="-f 'java.*|org.xml.*|org.w3c.*|sun.*|com.*|oauth.*|org.apache.*|org.glassfish.*|org.jdesktop.*|org.openstreetmap.gui.*'"/>
    10101010            <arg line="-dotoutput dots *.jar"/>
    10111011        </exec>
     
    10171017        <jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/metadata-extractor.jar" includes="com/drew/**/*.class"/>
    10181018        <jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/svgSalamander.jar" includes="com/kitfox/**/*.class"/>
    1019         <jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/gnu-getopt.jar" includes="gnu/**/*.class"/>
    10201019        <jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/javax-json.jar" includes="javax/**/*.class"/>
    10211020        <jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/oauth-signpost.jar" includes="oauth/**/*.class"/>
  • trunk/patches/series

    r6002 r14417  
    1110trim_svgsalamander.patch
    2 30gettext_i18n.patch
  • trunk/tools/spotbugs/josm-filter.xml

    r14254 r14417  
    5252    </Match>
    5353    <Match>
    54         <Class name="~gnu.getopt.*" />
    55     </Match>
    56     <Match>
    5754        <Class name="~javax.json.*" />
    5855    </Match>
Note: See TracChangeset for help on using the changeset viewer.