Changeset 34409 in osm for applications/editors/josm

Timestamp:

2018-07-09T21:13:03+02:00 (7 years ago)

Author:

donvip

Message:

see #josm15560, see #josm16047 - fix JABX builds

Location:

applications/editors/josm/plugins

Files:

• build-common.xml (modified) (3 diffs)
• opendata/build.xml (modified) (2 diffs)

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

@@ -20 +20 @@
     <property name="spotbugs-ant.jar"       location="../00_core_tools/spotbugs/spotbugs-ant.jar"/>
     <property name="annotations.jar"        location="../00_core_tools/spotbugs/spotbugs-annotations.jar"/>
+    <property name="plugin.tools.dir"       location="../00_tools"/>
     <property name="plugin.build.dir"       location="build"/>
     <property name="plugin.test.dir"        location="test"/>
@@ -69 +70 @@
     <fileset id="plugin.requires.jars" dir="${plugin.dist.dir}" includes="nothing"/>
 
+    <fileset id="jaxb.jars" dir="${plugin.tools.dir}/jaxb-ri/lib" includes="**/*.jar"/>
+
     <path id="plugin.classpath">
         <pathelement location="${josm}"/>
@@ -77 +80 @@
         </fileset>
         <fileset refid="plugin.requires.jars"/>
+        <fileset refid="jaxb.jars"/>
     </path>
 

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

@@ -66 +66 @@
     <target name="compile_neptune" depends="init, xjc_neptune">
         <echo message="compiling Neptune ... "/>
-        <javac srcdir="includes/neptune" debug="false" destdir="${plugin.build.dir}" includeAntRuntime="false" encoding="UTF-8" />
+        <javac srcdir="includes/neptune" debug="false" destdir="${plugin.build.dir}" includeAntRuntime="false" encoding="UTF-8">
+            <classpath>
+                <fileset refid="jaxb.jars"/>
+            </classpath>
+        </javac>
     </target>
     <!--
@@ -83 +87 @@
                 <pathelement location="${ejml}"/>
                 <pathelement location="${geotools}"/>
+                <fileset refid="jaxb.jars"/>
             </classpath>
             <compilerarg value="-Xlint:deprecation"/>