Changeset 36524 in osm

Timestamp:

2026-11-10T18:43:58+01:00 (less than one hour ago)

Author:

stoecker

Message:

switch to Java 17

Location:

applications/editors/josm/plugins

Files:

• ImportImagePlugin/build.xml (modified) (1 diff)
• ImportImagePlugin/pom.xml (modified) (1 diff)
• SaudiNationalAddress/build.xml (modified) (1 diff)
• build-common.xml (modified) (3 diffs)
• build.xml (modified) (3 diffs)
• ejml/build.xml (modified) (1 diff)
• ejml/pom.xml (modified) (1 diff)
• http2/build.xml (modified) (2 diffs)
• http2/pom.xml (modified) (1 diff)
• pom.xml (modified) (2 diffs)

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

@@ -13 +13 @@
     <property name="plugin.link" value="https://wiki.openstreetmap.org/wiki/JOSM/Plugins/ImportImagePlugin"/>
     <property name="plugin.requires" value="jts;ejml;geotools"/>
-    <property name="plugin.minimum.java.version" value="11"/>
+    <property name="plugin.minimum.java.version" value="17"/>
     
     <!-- ** include targets that all plugins have in common ** -->

applications/editors/josm/plugins/ImportImagePlugin/pom.xml

@@ -35 +35 @@
         <plugin.link>https://wiki.openstreetmap.org/wiki/JOSM/Plugins/ImportImagePlugin</plugin.link>
         <plugin.requires>jts;ejml;geotools</plugin.requires>
-        <java.lang.version>11</java.lang.version>
+        <java.lang.version>17</java.lang.version>
     </properties>
     <dependencies>

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

@@ -14 +14 @@
     <property name="plugin.icon" value="images/icon.png"/>
     <property name="plugin.link" value="https://wiki.openstreetmap.org/wiki/JOSM/Plugins/SaudiNationalAddress"/>
-    <property name="java.lang.version" value="11"/>
+    <property name="java.lang.version" value="17"/>
     <!--<property name="plugin.early" value="..."/>-->
     <!--<property name="plugin.requires" value="..."/>-->

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

@@ -27 +27 @@
     <!-- this is the directory where the plugin jar is copied to -->
     <property name="plugin.dist.dir"        location="../../dist"/>
-    <property name="java.lang.version"      value="11" />
+    <property name="java.lang.version"      value="17" />
     <property name="javadoc.executable"     value="javadoc" />
     <property name="manifest"               value="MANIFEST"/>
@@ -55 +55 @@
     <condition property="isMac"><os family="Mac"/></condition>
     <!-- For Java specific stuff by version -->
-    <condition property="isJava14"><matches string="${ant.java.version}" pattern="1[4-9]|[2-9][0-9]" /></condition>
-    <condition property="isJava15"><matches string="${ant.java.version}" pattern="1[5-9]|[2-9][0-9]" /></condition>
-    <condition property="isJava17"><matches string="${ant.java.version}" pattern="1[7-9]|[2-9][0-9]" /></condition>
     <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>
 
     <!-- set the javadoc location -->
-    <property name="javadoc.link"           value="https://docs.oracle.com/en/java/javase/11/docs/api/" unless:set="isJava17"/>
-    <property name="javadoc.link"           value="https://docs.oracle.com/en/java/javase/17/docs/api/" if:set="isJava17" unless:set="isJava21"/>
-    <property name="javadoc.link"           value="https://docs.oracle.com/en/java/javase/21/docs/api/" if:set="isJava21"/>
+    <property name="javadoc.link"           value="https://docs.oracle.com/en/java/javase/17/docs/api/" unless:set="isJava21"/>
+    <property name="javadoc.link"           value="https://docs.oracle.com/en/java/javase/21/docs/api/" if:set="isJava21" unless:set="isJava25"/>
+    <property name="javadoc.link"           value="https://docs.oracle.com/en/java/javase/25/docs/api/" if:set="isJava25"/>
 
     <!-- Disable jacoco on Java 21+ (Jacoco does not yet support Java 21+) -->
@@ -639 +637 @@
                         <jvmarg value="--add-exports" />
                         <jvmarg value="java.desktop/com.sun.imageio.spi=ALL-UNNAMED"  />
-                        <jvmarg value="-XX:+ShowCodeDetailsInExceptionMessages" if:set="isJava14" unless:set="isJava15" />
-                        <jvmarg value="--enable-native-access=ALL-UNNAMED" if:set="isJava17" />
+                        <jvmarg value="--enable-native-access=ALL-UNNAMED" />
                         <sysproperty key="josm.home" value="../00_core_test_config/unit-josm.home"/>
                         <sysproperty key="josm.test.data" value="${plugin.test.dir}/data"/>

applications/editors/josm/plugins/build.xml

@@ -9 +9 @@
     <!-- 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="isJava17"><matches string="${ant.java.version}" pattern="1[7-9]|[2-9][0-9]" /></condition>
     <!-- Specific plugins -->
     <property name="java21_plugins" value="FIT/build.xml
                                             MicrosoftStreetside/build.xml" />
-    <property name="java17_plugins" value="cadastre-fr/build.xml
+    <property name="ordered_plugins" value="cadastre-fr/build.xml
                                             javafx/build.xml
                                             ImageIO/build.xml
@@ -19 +18 @@
                                             MapRoulette/build.xml
                                             pmtiles/build.xml
-                                            todo/build.xml"/>
-    <property name="ordered_plugins" value="jackson/build.xml
+                                            todo/build.xml
+                                            jackson/build.xml
                                             jaxb/build.xml
                                             jna/build.xml
@@ -36 +35 @@
             <subant target="@{target}" inheritall="true">
                 <filelist dir="." files="${ordered_plugins}"/>
-                <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 ${ordered_plugins} ${java17_plugins} ${java21_plugins} "/>

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

@@ -12 +12 @@
     <property name="plugin.canloadatruntime" value="true"/>
     <property name="plugin.stage" value="15"/>
-    <property name="plugin.minimum.java.version" value="11"/>
+    <property name="plugin.minimum.java.version" value="17"/>
 
     <!-- ** include targets that all plugins have in common ** -->

applications/editors/josm/plugins/ejml/pom.xml

@@ -24 +24 @@
         <plugin.canloadatruntime>true</plugin.canloadatruntime>
         <plugin.stage>15</plugin.stage>
-        <plugin.minimum.java.version>11</plugin.minimum.java.version>
+        <plugin.minimum.java.version>17</plugin.minimum.java.version>
     </properties>
     <dependencies>

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

@@ -5 +5 @@
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
     <property name="plugin.main.version" value="15229"/>
-    <property name="java.lang.version" value="11" />
+    <property name="java.lang.version" value="17" />
     <!-- Configure these properties (replace "..." accordingly).
          See https://josm.openstreetmap.de/wiki/DevelopersGuide/DevelopingPlugins
@@ -11 +11 @@
     <property name="plugin.author" value="Don-vip"/>
     <property name="plugin.class" value="org.openstreetmap.josm.plugins.http2.Http2Plugin"/>
-    <property name="plugin.description" value="Provides HTTP/2 support. Requires Java 11 or later."/>
-    <property name="plugin.minimum.java.version" value="11"/>
+    <property name="plugin.description" value="Provides HTTP/2 support."/>
+    <property name="plugin.minimum.java.version" value="17"/>
     <property name="plugin.canloadatruntime" value="true"/>
     <property name="plugin.early" value="true"/>

applications/editors/josm/plugins/http2/pom.xml

@@ -19 +19 @@
         <plugin.author>Don-vip</plugin.author>
         <plugin.class>org.openstreetmap.josm.plugins.http2.Http2Plugin</plugin.class>
-        <plugin.description>Provides HTTP/2 support. Requires Java 11 or later.</plugin.description>
-        <java.lang.version>11</java.lang.version>
+        <plugin.description>Provides HTTP/2 support.</plugin.description>
+        <java.lang.version>17</java.lang.version>
         <plugin.canloadatruntime>true</plugin.canloadatruntime>
         <plugin.early>true</plugin.early>

applications/editors/josm/plugins/pom.xml

@@ -18 +18 @@
     <josm>../../core/dist/josm-custom.jar</josm>
     <josm.test.build.dir>../../core/test/build</josm.test.build.dir>
-    <java.lang.version>11</java.lang.version>
+    <java.lang.version>17</java.lang.version>
     <maven.compiler.release>${java.lang.version}</maven.compiler.release>
     <plugin.tools.dir>../00_tools</plugin.tools.dir>
@@ -562 +562 @@
     </profile>
     <profile>
-      <id>java-17-plugins</id>
-      <activation>
-        <jdk>[17,]</jdk>
-      </activation>
-      <modules>
-        <module>javafx</module>
-        <module>ImageIO</module>
-        <module>pmtiles</module>
-      </modules>
+      <id>javafx</id>
+      <activation><file><exists>javafx/pom.xml</exists></file></activation>
+      <modules><module>javafx</module></modules>
+    </profile>
+    <profile>
+      <id>ImageIO</id>
+      <activation><file><exists>ImageIO/pom.xml</exists></file></activation>
+      <modules><module>ImageIO</module></modules>
+    </profile>
+    <profile>
+      <id>pmtiles</id>
+      <activation><file><exists>pmtiles/pom.xml</exists></file></activation>
+      <modules><module>pmtiles</module></modules>
     </profile>
     <profile>