Changeset 19501 in josm

Timestamp:

2026-02-10T22:49:15+01:00 (39 hours ago)

Author:

stoecker

Message:

use older jmockit for Java 11, as 1.50 is Java17 only

Location:

trunk

Files:

• build.xml (modified) (2 diffs)
• ivy.xml (modified) (1 diff)

trunk/build.xml

@@ -108 +108 @@
         <!-- <condition property="isJava23"><matches string="${ant.java.version}" pattern="2[3-9]|[3-9][0-9]" /></condition> -->
         <condition property="isJava24"><matches string="${ant.java.version}" pattern="2[4-9]|[3-9][0-9]" /></condition>
+        <!-- <condition property="isJava25"><matches string="${ant.java.version}" pattern="2[5-9]|[3-9][0-9]" /></condition> -->
+        <!-- <condition property="isJava26"><matches string="${ant.java.version}" pattern="2[6-9]|[3-9][0-9]" /></condition> -->
         <!-- Disable jacoco on Java 19+, see https://github.com/jacoco/jacoco/pull/1282 -->
         <condition property="coverageByDefault">
@@ -113 +115 @@
                 <isset property="isJava19"/>
             </not>
+        </condition>
+        <condition property="versions.jmockit" value="1.50" else="1.49.a">
+            <isset property="isJava17"/>
         </condition>
         <property name="java.library.dir" value="jmods" />

trunk/ivy.xml

@@ -55 +55 @@
             <artifact name="org.jacoco.ant" type="jar" maven:classifier="nodeps"/>
         </dependency>
-        <dependency conf="jmockit->default" org="org.jmockit" name="jmockit" rev="1.50"/>
+        <dependency conf="jmockit->default" org="org.jmockit" name="jmockit" rev="${versions.jmockit}"/>
         <dependency conf="junit5-system-exit->default" org="com.ginsberg" name="junit5-system-exit" rev="${versions.junit5-system-exit}"/>
         <!-- test->default -->