Changeset 36283 in osm

Timestamp:

2024-06-17T23:05:51+02:00 (5 months ago)

Author:

taylor.smock

Message:

See #17858: We no longer support Java 8 so we can get rid of Java 11- compilation code

Note: The minimum version for any plugin updated to Java 11+ should be 19044 OR
they should add plugin.minimum.java.version set to 11. The former is
preferable since older versions of JOSM running on Java 8 may attempt to download
newer plugins

File:

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

applications/editors/josm/plugins/build.xml

@@ -18 +18 @@
                                             pmtiles/build.xml
                                             todo/build.xml"/>
-    <property name="java11_plugins" value="geotools/build.xml
-                                           cadastre-fr/build.xml
-                                           opendata/build.xml
-                                           ImportImagePlugin/build.xml
-                                           OsmInspectorPlugin/build.xml" />
     <property name="ordered_plugins" value="jackson/build.xml
                                             jaxb/build.xml
@@ -32 +27 @@
                                             apache-commons/build.xml
                                             apache-http/build.xml
+                                            geotools/build.xml
+                                            Mapillary/build.xml
                                             austriaaddresshelper/build.xml"/>
     <property name="javafx_plugins" value="javafx/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"/>
@@ -45 +36 @@
             <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"/>
-                <filelist dir="." files="${java11_plugins}" if:set="isJava11"/>
                 <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 ${borked_java8_compilation} ${javafx_plugins} ${ordered_plugins} ${java11_plugins} ${java17_plugins} ${java21_plugins} "/>
+                <fileset  dir="." includes="*/build.xml" excludes="00_*/build.xml *.wip/build.xml ${javafx_plugins} ${ordered_plugins} ${java17_plugins} ${java21_plugins} "/>
             </subant>
         </sequential>