Changeset 19521 in josm


Ignore:
Timestamp:
2026-02-12T17:29:23+01:00 (45 hours ago)
Author:
stoecker
Message:

make ivy version selection compatible for plugins

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/build.xml

    r19519 r19521  
    4242        <property name="ivy.jar.dir" location="${tools.dir}/ivy"/>
    4343        <property name="ivy.jar.file" location="${ivy.jar.dir}/ivy-${ivy.version}.jar"/>
    44         <condition property="versions.jmockit" value="1.50" else="1.49.a">
    45             <isset property="isJava17"/>
    46         </condition>
    47         <condition property="versions.checkstyle" value="13.2.0">
    48             <isset property="isJava21"/>
    49         </condition>
    50         <!-- does not override previous value for Java >= 21 -->
    51         <condition property="versions.checkstyle" value="12.3.1" else="10.26.1">
    52             <isset property="isJava17"/>
    53         </condition>
    54         <condition property="versions.equalsverifier" value="4.3.1" else="3.19.4">
    55             <isset property="isJava17"/>
    56         </condition>
    5744       
    5845        <mkdir dir="${ivy.jar.dir}"/>

  • trunk/ivysettings.xml

    r19519 r19521  
    66    <ibiblio name="josm-nexus" m2compatible="true" root="https://josm.openstreetmap.de/repository/public/" />
    77  </resolvers>
    8   <!-- Remove junit5-system-exit specific statements in build.xml when we drop Java 11 as a build platform -->
     8
     9  <!-- Remove specific statements in build.xml when we drop older Java as a build platform -->
     10
    911  <property name="versions.junit5-system-exit" value="1.1.2" unlessset="isJava17"/>
    1012  <property name="versions.junit5-system-exit" value="2.0.2" ifset="isJava17"/>
     13 
     14  <property name="versions.checkstyle" value="10.26.1" unlessset="isJava17"/>
     15  <property name="versions.checkstyle" value="12.3.1" unlessset="isJava21" ifset="isJava17"/>
     16  <property name="versions.checkstyle" value="13.2.0" ifset="isJava21"/>
     17
     18  <property name="versions.jmockit" value="1.49.a" unlessset="isJava17"/>
     19  <property name="versions.jmockit" value="1.50" ifset="isJava17"/>
     20
     21  <property name="versions.equalsverifier" value="3.19.4" unlessset="isJava17"/>
     22  <property name="versions.equalsverifier" value="4.3.1" ifset="isJava17"/>
    1123</ivysettings>
Note: See TracChangeset for help on using the changeset viewer.