Changeset 18909 in josm for trunk


Ignore:
Timestamp:
2023-12-13T23:57:16+01:00 (2 years ago)
Author:
taylor.smock
Message:

Dependency updates

ivy.xml

  • org.openstreetmap.jmapviewer:jmapviewer: 2.16 -> 2.18
    • Add default methods to JMapViewer TileSource interface
    • Modularize for Java 9+
    • Add layer option for Bing Imagery
  • jakarta.json:jakarta.json-api: 2.1.2 -> 2.1.3
  • org.eclipse.parsson:parsson: 1.1.4 -> 1.1.5
  • org.apache.commons:commons-jcs3-core: 3.1 -> 3.2
  • org.apache.commons:commons-compress: 1.23.0 -> 1.25.0
  • com.drewnoakes:metadata-extractor: 2.18.0 -> 2.19.0
  • ch.poole:OpeningHoursParser: 0.27.0 -> 0.27.1
  • org.webjars.npm:tag2link: 2022.11.28 -> 2023.11.21
    • This now parses OSM Wiki Data Items directly instead of via the (outdated) sophox API
  • org.apache.commons:commons-lang3: 3.13.0 -> 3.14.0
  • org.jacoco:org.jacoco.ant: 0.8.10 -> 0.8.11
    • Official Java 21 support
  • com.github.spotbugs:spotbugs-annotations: 4.7.3 -> 4.8.3
  • io.github.classgraph:classgraph: 4.8.162 -> 4.8.165
  • JUnit platform: 1.10.0 -> 1.10.1
  • JUnit packages: 5.10.0 -> 5.10.1
  • nl.jqno.equalsverifier:equalsverifier: 3.15.1 -> 3.15.4

tools/ivy.xml

  • net.java.dev.javacc:javacc: 7.0.12 -> 7.0.13
  • com.guardsquare:proguard-ant: 7.4.0-beta02 -> 7.4.1
  • com.github.spotbugs:spotbugs-annotations: 4.7.3 -> 4.8.3
  • com.google.errorprone:error_prone_core: 2.22.0 -> 2.23.0
Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/ivy.xml

    r18877 r18909  
    2121    <dependencies>
    2222        <!-- api->default -->
    23         <dependency conf="api->default" org="org.openstreetmap.jmapviewer" name="jmapviewer" rev="2.16"/>
     23        <dependency conf="api->default" org="org.openstreetmap.jmapviewer" name="jmapviewer" rev="2.18"/>
    2424        <!-- The javax json dependencies should be removed sometime in 2024 -->
    2525        <dependency conf="api->default" org="javax.json" name="javax.json-api" rev="1.1.4"/>
    2626        <dependency conf="api->default" org="org.glassfish" name="javax.json" rev="1.1.4"/>
    27         <dependency conf="api->default" org="jakarta.json" name="jakarta.json-api" rev="2.1.2"/>
     27        <dependency conf="api->default" org="jakarta.json" name="jakarta.json-api" rev="2.1.3"/>
    2828        <!-- parsson is an implementation for jakarta.json -->
    29         <dependency conf="runtimeOnly->default" org="org.eclipse.parsson" name="parsson" rev="1.1.4"/>
    30         <dependency conf="api->default" org="org.apache.commons" name="commons-jcs3-core" rev="3.1"/>
    31         <dependency conf="api->default" org="org.apache.commons" name="commons-compress" rev="1.23.0"/>
     29        <dependency conf="runtimeOnly->default" org="org.eclipse.parsson" name="parsson" rev="1.1.5"/>
     30        <dependency conf="api->default" org="org.apache.commons" name="commons-jcs3-core" rev="3.2"/>
     31        <dependency conf="api->default" org="org.apache.commons" name="commons-compress" rev="1.25.0"/>
    3232        <dependency conf="api->default" org="jakarta.annotation" name="jakarta.annotation-api" rev="2.1.1" />
    3333        <!-- 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 -->
    … …  
    3535        <dependency conf="api->default" org="org.tukaani" name="xz" rev="1.9"/>
    3636        <dependency conf="api->default" org="com.adobe.xmp" name="xmpcore" rev="6.1.11"/>
    37         <dependency conf="api->default" org="com.drewnoakes" name="metadata-extractor" rev="2.18.0" transitive="false"/>
     37        <dependency conf="api->default" org="com.drewnoakes" name="metadata-extractor" rev="2.19.0" transitive="false"/>
    3838        <dependency conf="api->default" org="com.formdev" name="svgSalamander" rev="1.1.4"/>
    39         <dependency conf="api->default" org="ch.poole" name="OpeningHoursParser" rev="0.27.0"/>
     39        <dependency conf="api->default" org="ch.poole" name="OpeningHoursParser" rev="0.27.1"/>
    4040        <dependency conf="api->default" org="oauth.signpost" name="signpost-core" rev="2.1.1"/>
    4141        <!-- Don't forget to update org.openstreetmap.josm.tools.Tag2Link#PREF_SOURCE -->
    42         <dependency conf="api->default" org="org.webjars.npm" name="tag2link" rev="2022.11.28"/>
     42        <dependency conf="api->default" org="org.webjars.npm" name="tag2link" rev="2023.11.21"/>
    4343        <!-- sources->sources -->
    44         <dependency conf="sources->sources" org="org.openstreetmap.jmapviewer" name="jmapviewer" rev="2.16"/>
     44        <dependency conf="sources->sources" org="org.openstreetmap.jmapviewer" name="jmapviewer" rev="2.18"/>
    4545        <dependency conf="sources->sources" org="javax.json" name="javax.json-api" rev="1.1.4"/>
    4646        <dependency conf="sources->sources" org="org.glassfish" name="javax.json" rev="1.1.4"/>
    47         <dependency conf="sources->sources" org="jakarta.json" name="jakarta.json-api" rev="2.1.2"/>
    48         <dependency conf="sources->sources" org="org.eclipse.parsson" name="parsson" rev="1.1.4"/>
    49         <dependency conf="sources->sources" org="org.apache.commons" name="commons-jcs3-core" rev="3.1"/>
    50         <dependency conf="sources->sources" org="org.apache.commons" name="commons-compress" rev="1.23.0"/>
     47        <dependency conf="sources->sources" org="jakarta.json" name="jakarta.json-api" rev="2.1.3"/>
     48        <dependency conf="sources->sources" org="org.eclipse.parsson" name="parsson" rev="1.1.5"/>
     49        <dependency conf="sources->sources" org="org.apache.commons" name="commons-jcs3-core" rev="3.2"/>
     50        <dependency conf="sources->sources" org="org.apache.commons" name="commons-compress" rev="1.25.0"/>
    5151        <dependency conf="sources->sources" org="jakarta.annotation" name="jakarta.annotation-api" rev="2.1.1" />
    5252        <!-- 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 -->
    … …  
    5454        <dependency conf="sources->sources" org="org.tukaani" name="xz" rev="1.9"/>
    5555        <dependency conf="sources->sources" org="com.adobe.xmp" name="xmpcore" rev="6.1.11"/>
    56         <dependency conf="sources->sources" org="com.drewnoakes" name="metadata-extractor" rev="2.18.0" transitive="false"/>
     56        <dependency conf="sources->sources" org="com.drewnoakes" name="metadata-extractor" rev="2.19.0" transitive="false"/>
    5757        <dependency conf="sources->sources" org="com.formdev" name="svgSalamander" rev="1.1.4"/>
    58         <dependency conf="sources->sources" org="ch.poole" name="OpeningHoursParser" rev="0.27.0"/>
     58        <dependency conf="sources->sources" org="ch.poole" name="OpeningHoursParser" rev="0.27.1"/>
    5959        <dependency conf="sources->sources" org="oauth.signpost" name="signpost-core" rev="2.1.1"/>
    60         <dependency conf="sources->default" org="org.webjars.npm" name="tag2link" rev="2022.11.28"/><!-- sources->default sic! (tag2link-sources.jar is empty, see #19335) -->
     60        <dependency conf="sources->default" org="org.webjars.npm" name="tag2link" rev="2023.11.21"/><!-- sources->default sic! (tag2link-sources.jar is empty, see #19335) -->
    6161        <!-- commonslang->default -->
    62         <dependency conf="commonslang->default" org="org.apache.commons" name="commons-lang3" rev="3.13.0"/>
     62        <dependency conf="commonslang->default" org="org.apache.commons" name="commons-lang3" rev="3.14.0"/>
    6363        <!-- jacocoant->default -->
    64         <dependency conf="jacocoant->default" org="org.jacoco" name="org.jacoco.ant" rev="0.8.10">
     64        <dependency conf="jacocoant->default" org="org.jacoco" name="org.jacoco.ant" rev="0.8.11">
    6565            <artifact name="org.jacoco.ant" type="jar" maven:classifier="nodeps"/>
    6666        </dependency>
    6767        <dependency conf="jmockit->default" org="org.jmockit" name="jmockit" rev="1.49.a"/>
    6868        <!-- test->default -->
    69         <dependency conf="test->default" org="com.github.spotbugs" name="spotbugs-annotations" rev="4.7.3"/>
     69        <dependency conf="test->default" org="com.github.spotbugs" name="spotbugs-annotations" rev="4.8.3"/>
    7070        <dependency conf="test->default" org="com.ginsberg" name="junit5-system-exit" rev="1.1.2"/>
    7171        <dependency conf="test->default" org="com.github.tomakehurst" name="wiremock-jre8" rev="2.35.0"/>
    72         <dependency conf="test->default" org="io.github.classgraph" name="classgraph" rev="4.8.162"/>
    73         <dependency conf="test->default" org="org.junit.platform" name="junit-platform-launcher" rev="1.10.0"/>
    74         <dependency conf="test->default" org="org.junit.platform" name="junit-platform-suite" rev="1.10.0"/>
    75         <dependency conf="test->default" org="org.junit.vintage" name="junit-vintage-engine" rev="5.10.0"/>
    76         <dependency conf="test->default" org="org.junit.jupiter" name="junit-jupiter-params" rev="5.10.0"/>
    77         <dependency conf="test->default" org="org.junit.jupiter" name="junit-jupiter-api" rev="5.10.0"/>
    78         <dependency conf="test->default" org="org.junit.jupiter" name="junit-jupiter-engine" rev="5.10.0"/>
    79         <dependency conf="test->default" org="org.junit.jupiter" name="junit-jupiter-migrationsupport" rev="5.10.0"/>
     72        <dependency conf="test->default" org="io.github.classgraph" name="classgraph" rev="4.8.165"/>
     73        <dependency conf="test->default" org="org.junit.platform" name="junit-platform-launcher" rev="1.10.1"/>
     74        <dependency conf="test->default" org="org.junit.platform" name="junit-platform-suite" rev="1.10.1"/>
     75        <dependency conf="test->default" org="org.junit.vintage" name="junit-vintage-engine" rev="5.10.1"/>
     76        <dependency conf="test->default" org="org.junit.jupiter" name="junit-jupiter-params" rev="5.10.1"/>
     77        <dependency conf="test->default" org="org.junit.jupiter" name="junit-jupiter-api" rev="5.10.1"/>
     78        <dependency conf="test->default" org="org.junit.jupiter" name="junit-jupiter-engine" rev="5.10.1"/>
     79        <dependency conf="test->default" org="org.junit.jupiter" name="junit-jupiter-migrationsupport" rev="5.10.1"/>
    8080        <dependency conf="test->default" org="net.trajano.commons" name="commons-testing" rev="2.1.0"/>
    81         <dependency conf="test->default" org="nl.jqno.equalsverifier" name="equalsverifier" rev="3.15.1"/>
    82         <dependency conf="test->default" org="org.apache.commons" name="commons-lang3" rev="3.13.0"/>
     81        <dependency conf="test->default" org="nl.jqno.equalsverifier" name="equalsverifier" rev="3.15.4"/>
     82        <dependency conf="test->default" org="org.apache.commons" name="commons-lang3" rev="3.14.0"/>
    8383        <dependency conf="test->default" org="org.awaitility" name="awaitility" rev="4.2.0"/>
    8484    </dependencies>

  • trunk/ivysettings.xml

    r18871 r18909  
    88  <!-- Remove error_prone 2.10.0 specific statements in build.xml when we drop Java 8 as a build platform -->
    99  <property name="versions.error_prone" value="2.10.0" unlessset="isJava11"/>
    10   <property name="versions.error_prone" value="2.22.0" ifset="isJava11"/>
     10  <property name="versions.error_prone" value="2.23.0" ifset="isJava11"/>
    1111</ivysettings>

  • trunk/tools/ivy.xml

    r18871 r18909  
    1515    <dependencies>
    1616        <!-- javacc->default -->
    17         <dependency org="net.java.dev.javacc" name="javacc" rev="7.0.12" conf="javacc->default"/>
     17        <dependency org="net.java.dev.javacc" name="javacc" rev="7.0.13" conf="javacc->default"/>
    1818        <!-- checkstyle->default -->
    1919        <dependency org="com.puppycrawl.tools" name="checkstyle" rev="9.3" conf="checkstyle->default"/>
    2020        <!-- proguard->default -->
    21         <dependency org="com.guardsquare" name="proguard-ant" rev="7.4.0-beta02" conf="proguard->default"/>
     21        <dependency org="com.guardsquare" name="proguard-ant" rev="7.4.1" conf="proguard->default"/>
    2222        <!-- pmd->default -->
    2323        <dependency org="net.sourceforge.pmd" name="pmd-core" rev="6.55.0" conf="pmd->default"/>
    … …  
    2828        </dependency>
    2929        <!-- spotbugs->default -->
    30         <dependency org="com.github.spotbugs" name="spotbugs" rev="4.7.3" conf="spotbugs->default"/>
    31         <dependency org="com.github.spotbugs" name="spotbugs-ant" rev="4.7.3" conf="spotbugs->default"/>
     30        <dependency org="com.github.spotbugs" name="spotbugs" rev="4.8.3" conf="spotbugs->default"/>
     31        <dependency org="com.github.spotbugs" name="spotbugs-ant" rev="4.8.3" conf="spotbugs->default"/>
    3232        <!-- errorprone->default -->
    3333        <dependency org="com.google.errorprone" name="error_prone_core" rev="${versions.error_prone}" conf="errorprone->default"/>
Note: See TracChangeset for help on using the changeset viewer.