Changeset 36190 in osm for applications

Timestamp:

2023-10-31T18:08:05+01:00 (15 months ago)

Author:

taylor.smock

Message:

See #23218: Don't build some Java 8 plugins with Java 8

The Java 8 plugins that are failing to build under Java 8 have the same stack
trace as #21995. Since we are dropping Java 8 support in JOSM at the end of the
year, it most likely is not worth the time to figure out how to work around the
Java 8 javac bug. They are still built targeting Java 8 via the --release
javac flag (java.lang.version).

All the failing plugins use apache-commons.

File:

• applications/editors/josm/plugins/build.xml (modified) (3 diffs)

applications/editors/josm/plugins/build.xml

@@ -31 +31 @@
                                             apache-commons/build.xml
                                             apache-http/build.xml
-                                            Mapillary/build.xml
                                             austriaaddresshelper/build.xml"/>
     <property name="javafx_plugins" value="javafx/build.xml
                                            MicrosoftStreetside/build.xml"/>
+
+    <!-- We are dropping Java 8 support in January 2024 - these have issues compiling with Java 8, but not with Java 11+ targeting Java 8 -->
+    <!-- Note: Mapillary was in ordered_plugins -->
+    <property name="borked_java8_compilation" value="Mapillary/build.xml
+                                                     Dxf-Import/build.xml
+                                                     photo_geotagging/build.xml" />
     <macrodef name="iterate">
         <attribute name="target"/>
@@ -40 +45 @@
             <subant target="@{target}" inheritall="true">
                 <filelist dir="." files="${ordered_plugins}"/>
+                <filelist dir="." files="${borked_java8_compilation}" if:set="isJava11"/>
                 <!-- Build JavaFX plugins only with Java 11+ -->
                 <filelist dir="." files="${javafx_plugins}" if:set="isJava11"/>
@@ -45 +51 @@
                 <filelist dir="." files="${java17_plugins}" if:set="isJava17"/>
                 <filelist dir="." files="${java21_plugins}" if:set="isJava21"/>
-                <fileset  dir="." includes="*/build.xml" excludes="00_*/build.xml *.wip/build.xml ${javafx_plugins} ${ordered_plugins} ${java11_plugins} ${java17_plugins} ${java21_plugins} "/>
+                <fileset  dir="." includes="*/build.xml" excludes="00_*/build.xml *.wip/build.xml ${borked_java8_compilation} ${javafx_plugins} ${ordered_plugins} ${java11_plugins} ${java17_plugins} ${java21_plugins} "/>
             </subant>
         </sequential>