Changeset 16021 in josm


Ignore:
Timestamp:
2020-03-03T23:57:35+01:00 (6 years ago)
Author:
simon04
Message:

see #16860 - Resolve org.glassfish:javax.json via Apache Ivy

Location:
trunk
Files:
64 deleted
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/build.xml

    r16020 r16021  
    294294    <target name="compile-cots" depends="init">
    295295        <!-- COTS -->
    296         <javac srcdir="${src.dir}" includes="com/**,javax/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/tukaani/**" nowarn="on" encoding="iso-8859-1"
     296        <javac srcdir="${src.dir}" includes="com/**,oauth/**,org/apache/commons/**,org/tukaani/**" nowarn="on" encoding="iso-8859-1"
    297297            destdir="${build.dir}" target="${java.lang.version}" source="${java.lang.version}" debug="on" includeAntRuntime="false" createMissingPackageInfoClass="false">
    298298            <!-- get rid of "internal proprietary API" warning -->
    … …  
    349349        <!-- JMapViewer -->
    350350        <javac sourcepath="" srcdir="${src.dir}" fork="yes"
    351             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/**"
     351            excludes="com/**,oauth/**,org/apache/commons/**,org/openstreetmap/gui/jmapviewer/Demo.java,org/openstreetmap/gui/jmapviewer/JMapViewerTree.java,org/openstreetmap/gui/jmapviewer/checkBoxTree/**,org/openstreetmap/josm/**,org/tukaani/**"
    352352            destdir="${build.dir}" target="${java.lang.version}" source="${java.lang.version}" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8">
    353353            <compilerarg value="-J-Xbootclasspath/p:${error_prone_javac.jar}" unless:set="isJava9"/>
    … …  
    375375        <!-- JOSM -->
    376376        <javac sourcepath="" srcdir="${src.dir}" fork="yes"
    377             excludes="com/**,javax/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/**,org/tukaani/**"
     377            excludes="com/**,oauth/**,org/apache/commons/**,org/openstreetmap/gui/jmapviewer/**,org/tukaani/**"
    378378            destdir="${build.dir}" target="${java.lang.version}" source="${java.lang.version}" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8">
    379379            <compilerarg value="-J-Xbootclasspath/p:${error_prone_javac.jar}" unless:set="isJava9"/>

  • trunk/ivy.xml

    r16016 r16021  
    1717    </configurations>
    1818    <dependencies>
     19        <dependency org="org.glassfish" name="javax.json" rev="1.1.4" conf="api->default"/>
    1920        <dependency org="ch.poole" name="OpeningHoursParser" rev="0.21.0" conf="api->default"/>
    2021    </dependencies>
Note: See TracChangeset for help on using the changeset viewer.