Changeset 36177 in osm

Timestamp:

2023-10-19T23:29:07+02:00 (15 months ago)

Author:

taylor.smock

Message:

Make geotools compile with Java 11 or later

File:

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

applications/editors/josm/plugins/build.xml

@@ -17 +17 @@
                                             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
@@ -22 +27 @@
                                             jts/build.xml
                                             ejml/build.xml
-                                            geotools/build.xml
                                             utilsplugin2/build.xml
                                             log4j/build.xml
@@ -38 +42 @@
                 <!-- 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 ${javafx_plugins} ${ordered_plugins} ${java17_plugins} ${java21_plugins} "/>
+                <fileset  dir="." includes="*/build.xml" excludes="00_*/build.xml *.wip/build.xml ${javafx_plugins} ${ordered_plugins} ${java11_plugins} ${java17_plugins} ${java21_plugins} "/>
             </subant>
         </sequential>