Changeset 19148 in josm


Ignore:
Timestamp:
2024-07-17T20:50:17+02:00 (6 weeks ago)
Author:
taylor.smock
Message:

Dependency updates

ivy.xml

  • Remove old dependencies (javax.json, jsr305 -- fixes #23220)
  • JMapViewer: 2.19 -> 2.20 - fixes deadlock when Bing attribution cannot be loaded (see #23721)
  • Wiremock: 3.6.0 -> 3.8.0
  • Various other minor dependency updates
Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/ivy.xml

    r19132 r19148  
    2121    <dependencies>
    2222        <!-- api->default -->
    23         <dependency conf="api->default" org="org.openstreetmap.jmapviewer" name="jmapviewer" rev="2.19"/>
    24         <!-- The javax json dependencies should be removed sometime in 2024 -->
    25         <dependency conf="api->default" org="javax.json" name="javax.json-api" rev="1.1.4"/>
    26         <dependency conf="api->default" org="org.glassfish" name="javax.json" rev="1.1.4"/>
     23        <dependency conf="api->default" org="org.openstreetmap.jmapviewer" name="jmapviewer" rev="2.20"/>
    2724        <dependency conf="api->default" org="jakarta.json" name="jakarta.json-api" rev="2.1.3"/>
    2825        <!-- parsson is an implementation for jakarta.json -->
     
    3128        <dependency conf="api->default" org="org.apache.commons" name="commons-compress" rev="1.26.2"/>
    3229        <dependency conf="api->default" org="jakarta.annotation" name="jakarta.annotation-api" rev="2.1.1" />
    33         <!-- jsr305 has some source files with non-free CC-BY-2.5 license. Remove after 2024-06-01 to give plugins time to migrate. See #23220 for details -->
    34         <dependency conf="api->default" org="com.google.code.findbugs" name="jsr305" rev="3.0.2"/>
    3530        <dependency conf="api->default" org="org.tukaani" name="xz" rev="1.9"/>
    3631        <dependency conf="api->default" org="com.adobe.xmp" name="xmpcore" rev="6.1.11"/>
     
    4136        <dependency conf="api->default" org="org.webjars.npm" name="tag2link" rev="2024.7.8"/>
    4237        <!-- sources->sources -->
    43         <dependency conf="sources->sources" org="org.openstreetmap.jmapviewer" name="jmapviewer" rev="2.19"/>
     38        <dependency conf="sources->sources" org="org.openstreetmap.jmapviewer" name="jmapviewer" rev="2.20"/>
    4439        <dependency conf="sources->sources" org="javax.json" name="javax.json-api" rev="1.1.4"/>
    4540        <dependency conf="sources->sources" org="org.glassfish" name="javax.json" rev="1.1.4"/>
     
    6560        <dependency conf="jmockit->default" org="org.jmockit" name="jmockit" rev="1.49.a"/>
    6661        <!-- test->default -->
    67         <dependency conf="test->default" org="com.github.spotbugs" name="spotbugs-annotations" rev="4.8.5"/>
     62        <dependency conf="test->default" org="com.github.spotbugs" name="spotbugs-annotations" rev="4.8.6"/>
    6863        <dependency conf="test->default" org="com.ginsberg" name="junit5-system-exit" rev="1.1.2"/>
    69         <dependency conf="test->default" org="org.wiremock" name="wiremock" rev="3.6.0"/>
    70         <dependency conf="test->default" org="io.github.classgraph" name="classgraph" rev="4.8.173"/>
    71         <dependency conf="test->default" org="org.junit.platform" name="junit-platform-launcher" rev="1.10.2"/>
    72         <dependency conf="test->default" org="org.junit.platform" name="junit-platform-suite" rev="1.10.2"/>
    73         <dependency conf="test->default" org="org.junit.vintage" name="junit-vintage-engine" rev="5.10.2"/>
    74         <dependency conf="test->default" org="org.junit.jupiter" name="junit-jupiter-params" rev="5.10.2"/>
    75         <dependency conf="test->default" org="org.junit.jupiter" name="junit-jupiter-api" rev="5.10.2"/>
    76         <dependency conf="test->default" org="org.junit.jupiter" name="junit-jupiter-engine" rev="5.10.2"/>
    77         <dependency conf="test->default" org="org.junit.jupiter" name="junit-jupiter-migrationsupport" rev="5.10.2"/>
     64        <dependency conf="test->default" org="org.wiremock" name="wiremock" rev="3.8.0"/>
     65        <dependency conf="test->default" org="io.github.classgraph" name="classgraph" rev="4.8.174"/>
     66        <dependency conf="test->default" org="org.junit.platform" name="junit-platform-launcher" rev="1.10.3"/>
     67        <dependency conf="test->default" org="org.junit.platform" name="junit-platform-suite" rev="1.10.3"/>
     68        <dependency conf="test->default" org="org.junit.vintage" name="junit-vintage-engine" rev="5.10.3"/>
     69        <dependency conf="test->default" org="org.junit.jupiter" name="junit-jupiter-params" rev="5.10.3"/>
     70        <dependency conf="test->default" org="org.junit.jupiter" name="junit-jupiter-api" rev="5.10.3"/>
     71        <dependency conf="test->default" org="org.junit.jupiter" name="junit-jupiter-engine" rev="5.10.3"/>
     72        <dependency conf="test->default" org="org.junit.jupiter" name="junit-jupiter-migrationsupport" rev="5.10.3"/>
    7873        <dependency conf="test->default" org="net.trajano.commons" name="commons-testing" rev="2.1.0"/>
    7974        <dependency conf="test->default" org="nl.jqno.equalsverifier" name="equalsverifier" rev="3.16.1"/>
  • trunk/nodist/pom.xml

    r19132 r19148  
    1818        <sonar.projectKey>JOSM</sonar.projectKey>
    1919        <jmockit.version>1.49.a</jmockit.version>
    20         <pmd.version>7.2.0</pmd.version>
     20        <pmd.version>7.3.0</pmd.version>
    2121    </properties>
    2222    <modules>
     
    237237                <groupId>org.junit</groupId>
    238238                <artifactId>junit-bom</artifactId>
    239                 <version>5.10.2</version>
     239                <version>5.10.3</version>
    240240                <type>pom</type>
    241241                <scope>import</scope>
     
    244244                <groupId>org.openstreetmap.jmapviewer</groupId>
    245245                <artifactId>jmapviewer</artifactId>
    246                 <version>2.19</version>
     246                <version>2.20</version>
    247247                <scope>provided</scope>
    248248            </dependency>
     
    323323                <groupId>com.github.spotbugs</groupId>
    324324                <artifactId>spotbugs-annotations</artifactId>
    325                 <version>4.8.5</version>
     325                <version>4.8.6</version>
    326326                <scope>test</scope>
    327327            </dependency>
     
    335335                <groupId>org.wiremock</groupId>
    336336                <artifactId>wiremock</artifactId>
    337                 <version>3.6.0</version>
     337                <version>3.8.0</version>
    338338                <scope>test</scope>
    339339            </dependency>
     
    341341                <groupId>io.github.classgraph</groupId>
    342342                <artifactId>classgraph</artifactId>
    343                 <version>4.8.173</version>
     343                <version>4.8.174</version>
    344344                <scope>test</scope>
    345345            </dependency>
     
    360360                <artifactId>commons-lang3</artifactId>
    361361                <version>3.14.0</version>
    362                 <scope>test</scope>
     362                <scope>compile</scope>
    363363            </dependency>
    364364            <dependency>
  • trunk/pom.xml

    r19097 r19148  
    7676      <artifactId>jmockit</artifactId>
    7777    </dependency>
    78     <!-- Deprecated dependencies (to remove sometime in 2024)-->
    79     <dependency>
    80       <groupId>javax.json</groupId>
    81       <artifactId>javax.json-api</artifactId>
    82       <version>1.1.4</version>
    83       <scope>compile</scope>
    84     </dependency>
    85     <dependency>
    86       <groupId>org.glassfish</groupId>
    87       <artifactId>javax.json</artifactId>
    88       <version>1.1.4</version>
    89       <scope>compile</scope>
    90     </dependency>
    91     <dependency>
    92       <groupId>com.google.code.findbugs</groupId>
    93       <artifactId>jsr305</artifactId>
    94       <version>3.0.2</version>
    95       <scope>compile</scope>
    96     </dependency>
    97     <!-- end Deprecated dependencies -->
    9878    <dependency>
    9979      <groupId>org.openstreetmap.jmapviewer</groupId>
     
    623603            </goals>
    624604            <configuration>
    625               <!-- TODO: Do we want to minimize the jar? <minimizeJar>true</minimizeJar> -->
     605              <minimizeJar>true</minimizeJar>
    626606              <filters>
    627607                <filter>
  • trunk/tools/ivy.xml

    r19113 r19148  
    2121        <dependency org="com.guardsquare" name="proguard-ant" rev="7.5.0" conf="proguard->default"/>
    2222        <!-- pmd->default -->
    23         <dependency org="net.sourceforge.pmd" name="pmd-core" rev="7.2.0" conf="pmd->default"/>
    24         <dependency org="net.sourceforge.pmd" name="pmd-ant" rev="7.2.0" conf="pmd->default"/>
    25         <dependency org="net.sourceforge.pmd" name="pmd-java" rev="7.2.0" conf="pmd->default"/>
     23        <dependency org="net.sourceforge.pmd" name="pmd-core" rev="7.3.0" conf="pmd->default"/>
     24        <dependency org="net.sourceforge.pmd" name="pmd-ant" rev="7.3.0" conf="pmd->default"/>
     25        <dependency org="net.sourceforge.pmd" name="pmd-java" rev="7.3.0" conf="pmd->default"/>
    2626        <dependency org="org.xmlresolver" name="xmlresolver" rev="6.0.4" conf="pmd->default"/>
    2727        <!-- spotbugs->default -->
    28         <dependency org="com.github.spotbugs" name="spotbugs" rev="4.8.5" conf="spotbugs->default"/>
    29         <dependency org="com.github.spotbugs" name="spotbugs-ant" rev="4.8.5" conf="spotbugs->default"/>
     28        <dependency org="com.github.spotbugs" name="spotbugs" rev="4.8.6" conf="spotbugs->default"/>
     29        <dependency org="com.github.spotbugs" name="spotbugs-ant" rev="4.8.6" conf="spotbugs->default"/>
    3030        <!-- errorprone->default -->
    31         <dependency org="com.google.errorprone" name="error_prone_core" rev="2.28.0" conf="errorprone->default"/>
     31        <dependency org="com.google.errorprone" name="error_prone_core" rev="2.29.0" conf="errorprone->default"/>
    3232        <!-- animal->default -->
    33         <dependency org="org.codehaus.mojo" name="animal-sniffer-ant-tasks" rev="1.23" conf="animal->default"/>
     33        <dependency org="org.codehaus.mojo" name="animal-sniffer-ant-tasks" rev="1.24" conf="animal->default"/>
    3434    </dependencies>
    3535</ivy-module>
Note: See TracChangeset for help on using the changeset viewer.