Changeset 19250 in josm


Ignore:
Timestamp:
2024-10-25T12:32:55+02:00 (4 weeks ago)
Author:
taylor.smock
Message:

Dependency updates

ivy.xml:

  • junit5-system-exit: 1.1.2 -> 2.0.0 on Java 17+. This is needed since there are patches currently being applied to the JDK to remove the security manager (see JEP 486), and the 1.x series will no longer work. The 2.x series is Java 17+ only and runs as a javaagent.
  • tag2link: 2024.8.21 -> 2024.10.21
  • wiremock: 3.9.1 -> 3.9.2
  • junit5: 5.11.0 -> 5.11.3

tools/ivy.xml:

  • checkstyle: 10.18.1 -> 10.18.2
  • proguard-ant: 7.5.0 -> 7.6.0
  • pmd: 7.5.0 -> 7.6.0
  • errorprone: Not upgraded from 2.31.0 -> 2.34.0 (since it is Java 17+ only)
Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/build.xml

    r19174 r19250  
    388388            <pathelement path="${resources.dir}"/>
    389389        </path>
     390        <ivy:retrieve log="download-only" pattern="${test.dir}/lib/[artifact].[ext]" conf="junit5-system-exit"/>
    390391        <ivy:retrieve log="download-only" pattern="${test.dir}/lib/[artifact].[ext]" conf="jmockit"/>
    391392        <ivy:retrieve log="download-only" pattern="${tools.dir}/[artifact].[ext]" conf="commonslang"/>
    … …  
    464465                        <jvmarg value="-Djava.locale.providers=SPI,CLDR" />
    465466                        <jvmarg value="-Djava.security.manager=allow" if:set="isJava17" />
     467                        <jvmarg value="-javaagent:${test.dir}/lib/junit5-system-exit.jar" if:set="isJava17"/>
    466468                        <jvmarg value="-javaagent:${test.dir}/lib/jmockit.jar"/>
    467469                        <jvmarg value="-Djunit.jupiter.extensions.autodetection.enabled=true"/>

  • trunk/ivy.xml

    r19208 r19250  
    1313        <conf name="jmockit" description="JMockit test library"/>
    1414        <conf name="jacocoant" description="Jacoco Ant test library"/>
     15        <conf name="junit5-system-exit" description="Everything needed for running junit5-system-exit as a javaagent"/>
    1516        <!--  Meta configurations used in build scripts -->
    1617        <conf name="runtime" description="Libraries only needed at runtime" extends="implementation,api,runtimeOnly"/>
    1718        <conf name="compile" description="Libraries needed only for compilation" extends="implementation,api,provided"/>
    18         <conf name="test" description="Libraries only needed for testing" extends="compile,runtime,commonslang,jmockit"/>
     19        <conf name="test" description="Libraries only needed for testing" extends="compile,runtime,commonslang,jmockit,junit5-system-exit"/>
    1920        <conf name="sources" description="Source code of used libraries"/>
    2021    </configurations>
    … …  
    3435        <dependency conf="api->default" org="ch.poole" name="OpeningHoursParser" rev="0.28.2"/>
    3536        <!-- Don't forget to update org.openstreetmap.josm.tools.Tag2Link#PREF_SOURCE -->
    36         <dependency conf="api->default" org="org.webjars.npm" name="tag2link" rev="2024.8.21"/>
     37        <dependency conf="api->default" org="org.webjars.npm" name="tag2link" rev="2024.10.21"/>
    3738        <!-- sources->sources -->
    3839        <dependency conf="sources->sources" org="org.openstreetmap.jmapviewer" name="jmapviewer" rev="2.22"/>
    … …  
    4748        <dependency conf="sources->sources" org="com.formdev" name="svgSalamander" rev="1.1.4"/>
    4849        <dependency conf="sources->sources" org="ch.poole" name="OpeningHoursParser" rev="0.28.2"/>
    49         <dependency conf="sources->default" org="org.webjars.npm" name="tag2link" rev="2024.8.21"/><!-- sources->default sic! (tag2link-sources.jar is empty, see #19335) -->
     50        <dependency conf="sources->default" org="org.webjars.npm" name="tag2link" rev="2024.10.21"/><!-- sources->default sic! (tag2link-sources.jar is empty, see #19335) -->
    5051        <!-- commonslang->default -->
    5152        <dependency conf="commonslang->default" org="org.apache.commons" name="commons-lang3" rev="3.17.0"/>
    … …  
    5556        </dependency>
    5657        <dependency conf="jmockit->default" org="org.jmockit" name="jmockit" rev="1.49.a"/>
     58        <dependency conf="junit5-system-exit->default" org="com.ginsberg" name="junit5-system-exit" rev="${versions.junit5-system-exit}"/>
    5759        <!-- test->default -->
    5860        <dependency conf="test->default" org="com.github.spotbugs" name="spotbugs-annotations" rev="4.8.6"/>
    59         <dependency conf="test->default" org="com.ginsberg" name="junit5-system-exit" rev="1.1.2"/>
    60         <dependency conf="test->default" org="org.wiremock" name="wiremock" rev="3.9.1"/>
    61         <dependency conf="test->default" org="io.github.classgraph" name="classgraph" rev="4.8.175"/>
    62         <dependency conf="test->default" org="org.junit.platform" name="junit-platform-launcher" rev="1.11.0"/>
    63         <dependency conf="test->default" org="org.junit.platform" name="junit-platform-suite" rev="1.11.0"/>
    64         <dependency conf="test->default" org="org.junit.vintage" name="junit-vintage-engine" rev="5.11.0"/>
    65         <dependency conf="test->default" org="org.junit.jupiter" name="junit-jupiter-params" rev="5.11.0"/>
    66         <dependency conf="test->default" org="org.junit.jupiter" name="junit-jupiter-api" rev="5.11.0"/>
    67         <dependency conf="test->default" org="org.junit.jupiter" name="junit-jupiter-engine" rev="5.11.0"/>
    68         <dependency conf="test->default" org="org.junit.jupiter" name="junit-jupiter-migrationsupport" rev="5.11.0"/>
     61        <dependency conf="test->default" org="org.wiremock" name="wiremock" rev="3.9.2"/>
     62        <dependency conf="test->default" org="io.github.classgraph" name="classgraph" rev="4.8.177"/>
     63        <dependency conf="test->default" org="org.junit.platform" name="junit-platform-launcher" rev="1.11.3"/>
     64        <dependency conf="test->default" org="org.junit.platform" name="junit-platform-suite" rev="1.11.3"/>
     65        <dependency conf="test->default" org="org.junit.vintage" name="junit-vintage-engine" rev="5.11.3"/>
     66        <dependency conf="test->default" org="org.junit.jupiter" name="junit-jupiter-params" rev="5.11.3"/>
     67        <dependency conf="test->default" org="org.junit.jupiter" name="junit-jupiter-api" rev="5.11.3"/>
     68        <dependency conf="test->default" org="org.junit.jupiter" name="junit-jupiter-engine" rev="5.11.3"/>
     69        <dependency conf="test->default" org="org.junit.jupiter" name="junit-jupiter-migrationsupport" rev="5.11.3"/>
    6970        <dependency conf="test->default" org="net.trajano.commons" name="commons-testing" rev="2.1.0"/>
    7071        <dependency conf="test->default" org="nl.jqno.equalsverifier" name="equalsverifier" rev="3.16.2"/>

  • trunk/ivysettings.xml

    r19048 r19250  
    66    <ibiblio name="josm-nexus" m2compatible="true" root="https://josm.openstreetmap.de/nexus/content/repositories/public/" />
    77  </resolvers>
     8  <!-- Remove junit5-system-exit specific statements in build.xml when we drop Java 11 as a build platform -->
     9  <property name="versions.junit5-system-exit" value="1.1.2" unlessset="isJava17"/>
     10  <property name="versions.junit5-system-exit" value="2.0.0" ifset="isJava17"/>
    811</ivysettings>

  • trunk/pom.xml

    r19208 r19250  
    4141    <default-junitIT-includes>**/*TestIT.class</default-junitIT-includes>
    4242    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     43    <!-- Needed just in case something adds argLine for tests before we set it -->
     44    <argLine/>
    4345  </properties>
    4446  <packaging>jar</packaging>
    … …  
    463465          <!-- We might need @{argLine} in the future if another plugin has issues -->
    464466          <argLine>
    465             -javaagent:"${settings.localRepository}"/org/jmockit/jmockit/${jmockit.version}/jmockit-${jmockit.version}.jar
     467            @{argLine}
     468            -javaagent:${org.jmockit:jmockit:jar}
    466469            --add-opens java.base/java.io=ALL-UNNAMED
    467470            --add-opens java.base/java.lang=ALL-UNNAMED
    … …  
    742745    </plugins>
    743746  </build>
     747  <profiles>
     748    <profile>
     749      <id>java-17</id>
     750      <activation>
     751        <jdk>[17</jdk>
     752      </activation>
     753      <build>
     754        <plugins>
     755          <plugin>
     756          <artifactId>maven-surefire-plugin</artifactId>
     757            <configuration>
     758              <!-- We might need @{argLine} in the future if another plugin has issues -->
     759              <argLine>
     760                @{argLine}
     761                -javaagent:${com.ginsberg:junit5-system-exit:jar}
     762                -javaagent:${org.jmockit:jmockit:jar}
     763                --add-opens java.base/java.io=ALL-UNNAMED
     764                --add-opens java.base/java.lang=ALL-UNNAMED
     765                --add-opens java.base/java.nio=ALL-UNNAMED
     766                --add-opens java.base/java.text=ALL-UNNAMED
     767                --add-opens java.base/java.util=ALL-UNNAMED
     768                --add-opens java.base/jdk.internal.loader=ALL-UNNAMED
     769                --add-opens java.desktop/java.awt=ALL-UNNAMED
     770                --add-opens java.prefs/java.util.prefs=ALL-UNNAMED
     771              </argLine>
     772            </configuration>
     773          </plugin>
     774        </plugins>
     775      </build>
     776    </profile>
     777  </profiles>
    744778</project>

  • trunk/src/org/openstreetmap/josm/tools/Tag2Link.java

    r19208 r19250  
    6565
    6666    static final ListProperty PREF_SOURCE = new ListProperty("tag2link.source",
    67             Collections.singletonList("resource://META-INF/resources/webjars/tag2link/2024.8.21/index.json"));
     67            Collections.singletonList("resource://META-INF/resources/webjars/tag2link/2024.10.21/index.json"));
    6868
    6969    static final CachingProperty<List<String>> PREF_SEARCH_ENGINES = new ListProperty("tag2link.search",

  • trunk/tools/ivy.xml

    r19208 r19250  
    1717        <dependency org="net.java.dev.javacc" name="javacc" rev="7.0.13" conf="javacc->default"/>
    1818        <!-- checkstyle->default -->
    19         <dependency org="com.puppycrawl.tools" name="checkstyle" rev="10.18.1" conf="checkstyle->default"/>
     19        <dependency org="com.puppycrawl.tools" name="checkstyle" rev="10.18.2" conf="checkstyle->default"/>
    2020        <!-- proguard->default -->
    21         <dependency org="com.guardsquare" name="proguard-ant" rev="7.5.0" conf="proguard->default"/>
     21        <dependency org="com.guardsquare" name="proguard-ant" rev="7.6.0" conf="proguard->default"/>
    2222        <!-- pmd->default -->
    23         <dependency org="net.sourceforge.pmd" name="pmd-core" rev="7.5.0" conf="pmd->default"/>
    24         <dependency org="net.sourceforge.pmd" name="pmd-ant" rev="7.5.0" conf="pmd->default"/>
    25         <dependency org="net.sourceforge.pmd" name="pmd-java" rev="7.5.0" conf="pmd->default"/>
    26         <dependency org="org.xmlresolver" name="xmlresolver" rev="6.0.4" conf="pmd->default"/>
     23        <dependency org="net.sourceforge.pmd" name="pmd-core" rev="7.6.0" conf="pmd->default"/>
     24        <dependency org="net.sourceforge.pmd" name="pmd-ant" rev="7.6.0" conf="pmd->default"/>
     25        <dependency org="net.sourceforge.pmd" name="pmd-java" rev="7.6.0" conf="pmd->default"/>
     26        <dependency org="org.xmlresolver" name="xmlresolver" rev="6.0.10" conf="pmd->default"/>
    2727        <!-- spotbugs->default -->
    2828        <dependency org="com.github.spotbugs" name="spotbugs" rev="4.8.6" conf="spotbugs->default"/>
Note: See TracChangeset for help on using the changeset viewer.