Changeset 35910 in osm for applications/editors/josm

Timestamp:

2022-02-07T16:19:11+01:00 (3 years ago)

Author:

taylor.smock

Message:

opendata: Appropriately set the Java release version

This fixes #21830: java.lang.UnsupportedClassVersionError when trying to open *.ods file

This was caused by compiling the opendata plugin with Java 11, where everything
in the includes directory was compiled with Java 11 instead of Java 8
(java.lang.version defaults to Java 8).

Location:

applications/editors/josm/plugins/opendata

Files:

• build.xml (modified) (4 diffs)
• test/unit/org/openstreetmap/josm/plugins/opendata/core/io/geographic/KmlReaderTest.java (modified) (1 diff)

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

@@ -34 +34 @@
     <target name="compile_poi" depends="init">
         <echo message="compiling Apache POI ... "/>
-        <javac srcdir="includes/org/apache/poi" debug="false" destdir="${plugin.build.dir}" includeAntRuntime="false" encoding="ISO-8859-1" />
+        <javac srcdir="includes/org/apache/poi" debug="false" destdir="${plugin.build.dir}" includeAntRuntime="false" encoding="ISO-8859-1" release="${java.lang.version}" />
     </target>
     <!--
@@ -43 +43 @@
     <target name="compile_jopendoc" depends="init">
         <echo message="compiling JOpenDocument ... "/>
-        <javac srcdir="includes/org/jopendocument" debug="false" destdir="${plugin.build.dir}" includeAntRuntime="false" encoding="ISO-8859-1" >
+        <javac srcdir="includes/org/jopendocument" debug="false" destdir="${plugin.build.dir}" includeAntRuntime="false" encoding="ISO-8859-1" release="${java.lang.version}">
             <classpath>
                 <!-- JDOM is required in an older version than the one embedded in geotools jar -->
@@ -58 +58 @@
     <target name="compile_j7zip" depends="init">
         <echo message="compiling J7Zip ... "/>
-        <javac srcdir="includes/org/j7zip" debug="true" destdir="${plugin.build.dir}" includeAntRuntime="false" encoding="UTF-8" />
+        <javac srcdir="includes/org/j7zip" debug="true" destdir="${plugin.build.dir}" includeAntRuntime="false" encoding="UTF-8" release="${java.lang.version}" />
     </target>
     <!--
@@ -67 +67 @@
     <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" release="${java.lang.version}">
             <classpath>
                 <fileset refid="jaxb.jars"/>

applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/geographic/KmlReaderTest.java

@@ -23 +23 @@
      * Setup test.
      */
-    RegisterExtension
+    @RegisterExtension
     JOSMTestRules rules = new JOSMTestRules().projection();