Changeset 36525 in osm

Timestamp:

2026-11-10T20:23:15+01:00 (less than one hour ago)

Author:

gaben

Message:

see #17858 - Java 17 switch in the plugin build files

also remove austriaaddresshelper, it's on GitHub; plus a typo fixed

Location:

applications/editors/josm/plugins

Files:

• build-common.xml (modified) (1 diff)
• build.xml (modified) (3 diffs)
• pom.xml (modified) (3 diffs)

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

@@ -56 +56 @@
     <!-- For Java specific stuff by version -->
     <condition property="isJava21"><matches string="${ant.java.version}" pattern="2[1-9]|[3-9][0-9]" /></condition>
-    <condition property="isJava21"><matches string="${ant.java.version}" pattern="2[5-9]|[3-9][0-9]" /></condition>
+    <condition property="isJava25"><matches string="${ant.java.version}" pattern="2[5-9]|[3-9][0-9]" /></condition>
 
     <!-- set the javadoc location -->

applications/editors/josm/plugins/build.xml

@@ -12 +12 @@
     <property name="java21_plugins" value="FIT/build.xml
                                             MicrosoftStreetside/build.xml" />
-    <property name="ordered_plugins" value="cadastre-fr/build.xml
-                                            javafx/build.xml
-                                            ImageIO/build.xml
-                                            Mapillary/build.xml
-                                            MapRoulette/build.xml
-                                            pmtiles/build.xml
-                                            todo/build.xml
-                                            jackson/build.xml
+    <property name="ordered_plugins" value="jackson/build.xml
                                             jaxb/build.xml
                                             jna/build.xml
@@ -29 +22 @@
                                             apache-http/build.xml
                                             geotools/build.xml
-                                            austriaaddresshelper/build.xml"/>
+                                            cadastre-fr/build.xml
+                                            javafx/build.xml
+                                            ImageIO/build.xml
+                                            Mapillary/build.xml
+                                            MapRoulette/build.xml
+                                            pmtiles/build.xml
+                                            todo/build.xml"/>
     <macrodef name="iterate">
         <attribute name="target"/>
@@ -36 +35 @@
                 <filelist dir="." files="${ordered_plugins}"/>
                 <filelist dir="." files="${java21_plugins}" if:set="isJava21"/>
-                <fileset  dir="." includes="*/build.xml" excludes="00_*/build.xml *.wip/build.xml ${ordered_plugins} ${java17_plugins} ${java21_plugins} "/>
+                <fileset  dir="." includes="*/build.xml" excludes="00_*/build.xml *.wip/build.xml ${ordered_plugins} ${java21_plugins} "/>
             </subant>
         </sequential>

applications/editors/josm/plugins/pom.xml

@@ -653 +653 @@
     <profile>
       <id>Mapillary</id>
-      <activation><file><exists>Mapillary/pom.xml</exists></file><jdk>[17,]</jdk></activation>
+      <activation><file><exists>Mapillary/pom.xml</exists></file></activation>
       <modules><module>Mapillary</module></modules>
     </profile>
     <profile>
       <id>MapRoulette</id>
-      <activation><file><exists>MapRoulette/pom.xml</exists></file><jdk>[17,]</jdk></activation>
+      <activation><file><exists>MapRoulette/pom.xml</exists></file></activation>
       <modules><module>MapRoulette</module></modules>
     </profile>
@@ -678 +678 @@
     <profile>
       <id>pt_assistant</id>
-      <activation><file><exists>pt_assistant/pom.xml</exists></file><jdk>[17,]</jdk></activation>
+      <activation><file><exists>pt_assistant/pom.xml</exists></file></activation>
       <modules><module>pt_assistant</module></modules>
     </profile>
@@ -693 +693 @@
     <profile>
       <id>todo</id>
-      <activation><file><exists>todo/pom.xml</exists></file><jdk>[17,]</jdk></activation>
+      <activation><file><exists>todo/pom.xml</exists></file></activation>
       <modules><module>todo</module></modules>
     </profile>