Changeset 34375 in osm for applications/editors/josm


Ignore:
Timestamp:
2018-06-30T21:54:46+02:00 (7 years ago)
Author:
donvip
Message:

see #josm15560, see #josm16047 - include JAXB, removed in JDK11

Location:
applications/editors/josm/plugins
Files:
15 added
3 edited

Legend:

Unmodified
Added
Removed

  • applications/editors/josm/plugins/build-common.xml

    r34373 r34375  
    5959        </not>
    6060    </condition>
    61     <target name="-jaxb_before9" unless="isJava9">
    62         <property name="xjc" value="${java.home}${file.separator}..${file.separator}bin${file.separator}xjc" />
    63     </target>
    64     <target name="-jaxb_after9" if="isJava9">
    65         <property name="xjc" value="${java.home}${file.separator}bin${file.separator}xjc" />
     61    <target name="-jaxb">
     62        <property name="xjc" value="..${file.separator}00_tools${file.separator}jaxb-ri${file.separator}bin${file.separator}xjc" />
    6663    </target>
    6764

  • applications/editors/josm/plugins/dataimport/build.xml

    r33581 r34375  
    2222    <import file="../build-common.xml"/>
    2323
    24     <target name="pre-compile" depends="-jaxb_before9, -jaxb_after9" unless="jaxb.notRequired">
     24    <target name="pre-compile" depends="-jaxb" unless="jaxb.notRequired">
    2525        <exec executable="${xjc}" failonerror="true">
    2626            <arg value="-d"/>

  • applications/editors/josm/plugins/opendata/build.xml

    r34335 r34375  
    8989    </target>
    9090   
    91     <target name="xjc_neptune" depends="init, -jaxb_before9, -jaxb_after9" unless="jaxb.notRequired">
     91    <target name="xjc_neptune" depends="init, -jaxb" unless="jaxb.notRequired">
    9292        <exec executable="${xjc}" failonerror="true">
    9393            <arg value="-d"/>
Note: See TracChangeset for help on using the changeset viewer.