Changeset 35010 in osm for applications/editors/josm

Timestamp:

2019-05-27T23:29:31+02:00 (6 years ago)

Author:

donvip

Message:

see #josm17152 - make sure plugins compiled with JDK8 are built against OUR OWN JAXB and not the one bundled in JDK8

File:

• applications/editors/josm/plugins/build-common.xml (modified) (2 diffs)

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

@@ -82 +82 @@
     <fileset id="jaxb.jars" dir="${plugin.tools.dir}/jaxb-ri/lib" includes="**/*.jar"/>
 
+    <path id="jdk8.boot.classpath">
+        <pathelement location="${error_prone_javac.jar}"/>
+        <fileset refid="jaxb.jars"/>
+    </path>
     <path id="plugin.classpath">
         <pathelement location="${josm}"/>
@@ -124 +128 @@
         <javac srcdir="${plugin.src.dir}" debug="true" destdir="${plugin.build.dir}" includeantruntime="false"
             encoding="UTF-8" target="${java.lang.version}" source="${java.lang.version}" fork="yes">
-            <compilerarg value="-J-Xbootclasspath/p:${error_prone_javac.jar}" unless:set="isJava9"/>
+            <compilerarg value="-J-Xbootclasspath/p:${toString:jdk8.boot.classpath}" unless:set="isJava9"/>
             <compilerarg line="-XDcompilePolicy=simple"/>
             <compilerarg value="-processorpath"/>