Changeset 19293 in josm for trunk


Ignore:
Timestamp:
2025-01-28T00:43:42+01:00 (2 months ago)
Author:
taylor.smock
Message:

See #23913: Fetch remote API keys for Bing imagery

Update JMapViewer and other dependencies

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/ivy.xml

    r19250 r19293  
    2222    <dependencies>
    2323        <!-- api->default -->
    24         <dependency conf="api->default" org="org.openstreetmap.jmapviewer" name="jmapviewer" rev="2.22"/>
     24        <dependency conf="api->default" org="org.openstreetmap.jmapviewer" name="jmapviewer" rev="2.23"/>
    2525        <dependency conf="api->default" org="jakarta.json" name="jakarta.json-api" rev="2.1.3"/>
    2626        <!-- parsson is an implementation for jakarta.json -->
    … …  
    3737        <dependency conf="api->default" org="org.webjars.npm" name="tag2link" rev="2024.10.21"/>
    3838        <!-- sources->sources -->
    39         <dependency conf="sources->sources" org="org.openstreetmap.jmapviewer" name="jmapviewer" rev="2.22"/>
     39        <dependency conf="sources->sources" org="org.openstreetmap.jmapviewer" name="jmapviewer" rev="2.23"/>
    4040        <dependency conf="sources->sources" org="jakarta.json" name="jakarta.json-api" rev="2.1.3"/>
    4141        <dependency conf="sources->sources" org="org.eclipse.parsson" name="parsson" rev="1.1.7"/>
    … …  
    5858        <dependency conf="junit5-system-exit->default" org="com.ginsberg" name="junit5-system-exit" rev="${versions.junit5-system-exit}"/>
    5959        <!-- test->default -->
    60         <dependency conf="test->default" org="com.github.spotbugs" name="spotbugs-annotations" rev="4.8.6"/>
    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"/>
     60        <dependency conf="test->default" org="com.github.spotbugs" name="spotbugs-annotations" rev="4.9.0"/>
     61        <dependency conf="test->default" org="org.wiremock" name="wiremock" rev="3.10.0"/>
     62        <dependency conf="test->default" org="io.github.classgraph" name="classgraph" rev="4.8.179"/>
     63        <dependency conf="test->default" org="org.junit.platform" name="junit-platform-launcher" rev="1.11.4"/>
     64        <dependency conf="test->default" org="org.junit.platform" name="junit-platform-suite" rev="1.11.4"/>
     65        <dependency conf="test->default" org="org.junit.vintage" name="junit-vintage-engine" rev="5.11.4"/>
     66        <dependency conf="test->default" org="org.junit.jupiter" name="junit-jupiter-params" rev="5.11.4"/>
     67        <dependency conf="test->default" org="org.junit.jupiter" name="junit-jupiter-api" rev="5.11.4"/>
     68        <dependency conf="test->default" org="org.junit.jupiter" name="junit-jupiter-engine" rev="5.11.4"/>
     69        <dependency conf="test->default" org="org.junit.jupiter" name="junit-jupiter-migrationsupport" rev="5.11.4"/>
    7070        <dependency conf="test->default" org="net.trajano.commons" name="commons-testing" rev="2.1.0"/>
    71         <dependency conf="test->default" org="nl.jqno.equalsverifier" name="equalsverifier" rev="3.16.2"/>
     71        <dependency conf="test->default" org="nl.jqno.equalsverifier" name="equalsverifier" rev="3.18.1"/>
    7272        <dependency conf="test->default" org="org.apache.commons" name="commons-lang3" rev="3.17.0"/>
    7373        <dependency conf="test->default" org="org.awaitility" name="awaitility" rev="4.2.2"/>

  • trunk/ivysettings.xml

    r19250 r19293  
    88  <!-- Remove junit5-system-exit specific statements in build.xml when we drop Java 11 as a build platform -->
    99  <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"/>
     10  <property name="versions.junit5-system-exit" value="2.0.2" ifset="isJava17"/>
    1111</ivysettings>

  • trunk/nodist/pom.xml

    r19251 r19293  
    1818        <sonar.projectKey>JOSM</sonar.projectKey>
    1919        <jmockit.version>1.49.a</jmockit.version>
    20         <pmd.version>7.6.0</pmd.version>
     20        <pmd.version>7.9.0</pmd.version>
    2121        <jacoco.version>0.8.12</jacoco.version>
    22         <checkstyle.version>10.18.2</checkstyle.version>
    23         <spotbugs.version>4.8.6</spotbugs.version>
     22        <checkstyle.version>10.21.2</checkstyle.version>
     23        <spotbugs.version>4.9.0</spotbugs.version>
    2424        <!-- Note: 2.0.0 requires Java 17, and we'll need to upgrade to it for Java 25 LTS (see JEP 486)-->
    2525        <junit5-system-exit.version>1.1.2</junit5-system-exit.version>
    … …  
    254254                <groupId>org.junit</groupId>
    255255                <artifactId>junit-bom</artifactId>
    256                 <version>5.11.3</version>
     256                <version>5.11.4</version>
    257257                <type>pom</type>
    258258                <scope>import</scope>
    … …  
    261261                <groupId>org.openstreetmap.jmapviewer</groupId>
    262262                <artifactId>jmapviewer</artifactId>
    263                 <version>2.22</version>
     263                <version>2.23</version>
    264264                <scope>provided</scope>
    265265            </dependency>
    … …  
    352352                <groupId>org.wiremock</groupId>
    353353                <artifactId>wiremock</artifactId>
    354                 <version>3.9.2</version>
     354                <version>3.10.0</version>
    355355                <scope>test</scope>
    356356            </dependency>
    … …  
    358358                <groupId>io.github.classgraph</groupId>
    359359                <artifactId>classgraph</artifactId>
    360                 <version>4.8.177</version>
     360                <version>4.8.179</version>
    361361                <scope>test</scope>
    362362            </dependency>
    … …  
    370370                <groupId>nl.jqno.equalsverifier</groupId>
    371371                <artifactId>equalsverifier</artifactId>
    372                 <version>3.16.2</version>
     372                <version>3.18.1</version>
    373373                <scope>test</scope>
    374374            </dependency>
    … …  
    394394            </activation>
    395395            <properties>
    396                 <junit5-system-exit.version>2.0.0</junit5-system-exit.version>
     396                <junit5-system-exit.version>2.0.2</junit5-system-exit.version>
    397397            </properties>
    398398        </profile>

  • trunk/test/unit/org/openstreetmap/josm/testutils/TileSourceRule.java

    r17195 r19293  
    152152                "tms",
    153153                (String) null,
    154                 (String) null
     154                (String) null,
     155                this.label
    155156            );
    156157        }

  • trunk/tools/ivy.xml

    r19250 r19293  
    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.2" conf="checkstyle->default"/>
     19        <dependency org="com.puppycrawl.tools" name="checkstyle" rev="10.21.2" conf="checkstyle->default"/>
    2020        <!-- proguard->default -->
    21         <dependency org="com.guardsquare" name="proguard-ant" rev="7.6.0" conf="proguard->default"/>
     21        <dependency org="com.guardsquare" name="proguard-ant" rev="7.6.1" conf="proguard->default"/>
    2222        <!-- 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"/>
     23        <dependency org="net.sourceforge.pmd" name="pmd-core" rev="7.9.0" conf="pmd->default"/>
     24        <dependency org="net.sourceforge.pmd" name="pmd-ant" rev="7.9.0" conf="pmd->default"/>
     25        <dependency org="net.sourceforge.pmd" name="pmd-java" rev="7.9.0" conf="pmd->default"/>
     26        <dependency org="org.xmlresolver" name="xmlresolver" rev="6.0.12" conf="pmd->default"/>
    2727        <!-- 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"/>
     28        <dependency org="com.github.spotbugs" name="spotbugs" rev="4.9.0" conf="spotbugs->default"/>
     29        <dependency org="com.github.spotbugs" name="spotbugs-ant" rev="4.9.0" conf="spotbugs->default"/>
    3030        <!-- errorprone->default -->
    31         <dependency org="com.google.errorprone" name="error_prone_core" rev="2.31.0" conf="errorprone->default"/>
     31        <dependency org="com.google.errorprone" name="error_prone_core" rev="2.36.0" conf="errorprone->default"/>
    3232        <!-- animal->default -->
    3333        <dependency org="org.codehaus.mojo" name="animal-sniffer-ant-tasks" rev="1.24" conf="animal->default"/>
Note: See TracChangeset for help on using the changeset viewer.