Changeset 19208 in josm


Ignore:
Timestamp:
2024-09-05T18:15:17+02:00 (4 months ago)
Author:
taylor.smock
Message:

Dependency updates:

ivy.xml:

  • jmapviewer: 2.21 -> 2.22: Fix a NumberFormatException (fix #23888)
  • commons-compress: 1.27.0 -> 1.27.1
  • tag2link: 2024.8.12 -> 2024.8.21
  • commons-lang3: 3.16.0 -> 3.17.0
  • classgraph: 4.8.174 -> 4.8.175
  • junit: 5.10.3 -> 5.11.0: Repeatable @..Source annotations for parameterized tests
  • equalsverifier: 3.16.1 -> 3.16.2

tools/ivy.xml:

  • checkstyle: 10.17 -> 10.18: Better support for Java 21
  • pmd: 7.4.0 -> 7.5.0
  • errorprone: 2.30.0 -> 2.31.0: Note: this is the last planned release that supports running on Java 11.
Location:
trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/ivy.xml

    r19191 r19208  
    2121    <dependencies>
    2222        <!-- api->default -->
    23         <dependency conf="api->default" org="org.openstreetmap.jmapviewer" name="jmapviewer" rev="2.21"/>
     23        <dependency conf="api->default" org="org.openstreetmap.jmapviewer" name="jmapviewer" rev="2.22"/>
    2424        <dependency conf="api->default" org="jakarta.json" name="jakarta.json-api" rev="2.1.3"/>
    2525        <!-- parsson is an implementation for jakarta.json -->
    2626        <dependency conf="runtimeOnly->default" org="org.eclipse.parsson" name="parsson" rev="1.1.7"/>
    2727        <dependency conf="api->default" org="org.apache.commons" name="commons-jcs3-core" rev="3.2.1"/>
    28         <dependency conf="api->default" org="org.apache.commons" name="commons-compress" rev="1.27.0"/>
     28        <dependency conf="api->default" org="org.apache.commons" name="commons-compress" rev="1.27.1"/>
    2929        <dependency conf="api->default" org="jakarta.annotation" name="jakarta.annotation-api" rev="2.1.1" />
    3030        <dependency conf="api->default" org="org.tukaani" name="xz" rev="1.10"/>
    … …  
    3434        <dependency conf="api->default" org="ch.poole" name="OpeningHoursParser" rev="0.28.2"/>
    3535        <!-- 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.12"/>
     36        <dependency conf="api->default" org="org.webjars.npm" name="tag2link" rev="2024.8.21"/>
    3737        <!-- sources->sources -->
    38         <dependency conf="sources->sources" org="org.openstreetmap.jmapviewer" name="jmapviewer" rev="2.21"/>
     38        <dependency conf="sources->sources" org="org.openstreetmap.jmapviewer" name="jmapviewer" rev="2.22"/>
    3939        <dependency conf="sources->sources" org="jakarta.json" name="jakarta.json-api" rev="2.1.3"/>
    4040        <dependency conf="sources->sources" org="org.eclipse.parsson" name="parsson" rev="1.1.7"/>
    4141        <dependency conf="sources->sources" org="org.apache.commons" name="commons-jcs3-core" rev="3.2.1"/>
    42         <dependency conf="sources->sources" org="org.apache.commons" name="commons-compress" rev="1.27.0"/>
     42        <dependency conf="sources->sources" org="org.apache.commons" name="commons-compress" rev="1.27.1"/>
    4343        <dependency conf="sources->sources" org="jakarta.annotation" name="jakarta.annotation-api" rev="2.1.1" />
    4444        <dependency conf="sources->sources" org="org.tukaani" name="xz" rev="1.10"/>
    … …  
    4747        <dependency conf="sources->sources" org="com.formdev" name="svgSalamander" rev="1.1.4"/>
    4848        <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.12"/><!-- sources->default sic! (tag2link-sources.jar is empty, see #19335) -->
     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) -->
    5050        <!-- commonslang->default -->
    51         <dependency conf="commonslang->default" org="org.apache.commons" name="commons-lang3" rev="3.16.0"/>
     51        <dependency conf="commonslang->default" org="org.apache.commons" name="commons-lang3" rev="3.17.0"/>
    5252        <!-- jacocoant->default -->
    5353        <dependency conf="jacocoant->default" org="org.jacoco" name="org.jacoco.ant" rev="0.8.12">
    … …  
    5959        <dependency conf="test->default" org="com.ginsberg" name="junit5-system-exit" rev="1.1.2"/>
    6060        <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.174"/>
    62         <dependency conf="test->default" org="org.junit.platform" name="junit-platform-launcher" rev="1.10.3"/>
    63         <dependency conf="test->default" org="org.junit.platform" name="junit-platform-suite" rev="1.10.3"/>
    64         <dependency conf="test->default" org="org.junit.vintage" name="junit-vintage-engine" rev="5.10.3"/>
    65         <dependency conf="test->default" org="org.junit.jupiter" name="junit-jupiter-params" rev="5.10.3"/>
    66         <dependency conf="test->default" org="org.junit.jupiter" name="junit-jupiter-api" rev="5.10.3"/>
    67         <dependency conf="test->default" org="org.junit.jupiter" name="junit-jupiter-engine" rev="5.10.3"/>
    68         <dependency conf="test->default" org="org.junit.jupiter" name="junit-jupiter-migrationsupport" rev="5.10.3"/>
     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"/>
    6969        <dependency conf="test->default" org="net.trajano.commons" name="commons-testing" rev="2.1.0"/>
    70         <dependency conf="test->default" org="nl.jqno.equalsverifier" name="equalsverifier" rev="3.16.1"/>
    71         <dependency conf="test->default" org="org.apache.commons" name="commons-lang3" rev="3.16.0"/>
     70        <dependency conf="test->default" org="nl.jqno.equalsverifier" name="equalsverifier" rev="3.16.2"/>
     71        <dependency conf="test->default" org="org.apache.commons" name="commons-lang3" rev="3.17.0"/>
    7272        <dependency conf="test->default" org="org.awaitility" name="awaitility" rev="4.2.2"/>
    7373    </dependencies>

  • trunk/nodist/pom.xml

    r19206 r19208  
    1212        <java.lang.version>11</java.lang.version>
    1313        <maven.compiler.release>${java.lang.version}</maven.compiler.release>
    14         <maven.compiler.source>${maven.compiler.release}</maven.compiler.source>
    15         <maven.compiler.target>${maven.compiler.release}</maven.compiler.target>
     14        <maven.compiler.source>${java.lang.version}</maven.compiler.source>
     15        <maven.compiler.target>${java.lang.version}</maven.compiler.target>
    1616        <test.headless>true</test.headless>
    1717        <sonar.host.url>https://josm.openstreetmap.de/sonar/</sonar.host.url>
    1818        <sonar.projectKey>JOSM</sonar.projectKey>
    1919        <jmockit.version>1.49.a</jmockit.version>
    20         <pmd.version>7.4.0</pmd.version>
     20        <pmd.version>7.5.0</pmd.version>
    2121        <jacoco.version>0.8.12</jacoco.version>
    22         <checkstyle.version>10.17.0</checkstyle.version>
     22        <checkstyle.version>10.18.1</checkstyle.version>
    2323        <spotbugs.version>4.8.6</spotbugs.version>
    2424    </properties>
    … …  
    242242                <groupId>org.junit</groupId>
    243243                <artifactId>junit-bom</artifactId>
    244                 <version>5.10.3</version>
     244                <version>5.11.0</version>
    245245                <type>pom</type>
    246246                <scope>import</scope>
    … …  
    249249                <groupId>org.openstreetmap.jmapviewer</groupId>
    250250                <artifactId>jmapviewer</artifactId>
    251                 <version>2.21</version>
     251                <version>2.22</version>
    252252                <scope>provided</scope>
    253253            </dependency>
    … …  
    273273                <groupId>org.apache.commons</groupId>
    274274                <artifactId>commons-compress</artifactId>
    275                 <version>1.27.0</version>
     275                <version>1.27.1</version>
    276276                <scope>provided</scope>
    277277            </dependency>
    … …  
    316316                <groupId>org.webjars.npm</groupId>
    317317                <artifactId>tag2link</artifactId>
    318                 <version>2024.8.12</version>
     318                <version>2024.8.21</version>
    319319                <scope>provided</scope>
    320320            </dependency>
    … …  
    346346                <groupId>io.github.classgraph</groupId>
    347347                <artifactId>classgraph</artifactId>
    348                 <version>4.8.174</version>
     348                <version>4.8.175</version>
    349349                <scope>test</scope>
    350350            </dependency>
    … …  
    358358                <groupId>nl.jqno.equalsverifier</groupId>
    359359                <artifactId>equalsverifier</artifactId>
    360                 <version>3.16.1</version>
     360                <version>3.16.2</version>
    361361                <scope>test</scope>
    362362            </dependency>
    … …  
    364364                <groupId>org.apache.commons</groupId>
    365365                <artifactId>commons-lang3</artifactId>
    366                 <version>3.16.0</version>
     366                <version>3.17.0</version>
    367367                <scope>test</scope>
    368368            </dependency>

  • trunk/pom.xml

    r19206 r19208  
    460460          </excludes>
    461461          <skipAfterFailureCount>1</skipAfterFailureCount>
     462          <useModulePath>false</useModulePath> <!-- testing with modules seems to be problematic right now -->
    462463          <!-- We might need @{argLine} in the future if another plugin has issues -->
    463464          <argLine>

  • trunk/src/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/Layers.java

    r19108 r19208  
    8989     */
    9090    public Layers(final JsonObject layerInfo) {
    91         this (null, layerInfo);
     91        this(null, layerInfo);
    9292    }
    9393

  • trunk/src/org/openstreetmap/josm/gui/widgets/UrlLabel.java

    r18211 r19208  
    3838     */
    3939    public UrlLabel(String url) {
    40         this (url, url, 0);
     40        this(url, url, 0);
    4141    }
    4242
    … …  
    4747     */
    4848    public UrlLabel(String url, int fontPlus) {
    49         this (url, url, fontPlus);
     49        this(url, url, fontPlus);
    5050    }
    5151
    … …  
    5656     */
    5757    public UrlLabel(String url, String description) {
    58         this (url, description, 0);
     58        this(url, description, 0);
    5959    }
    6060

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

    r19191 r19208  
    3636/**
    3737 * Extracts web links from OSM tags.
    38  *
     38 * <p>
    3939 * The following rules are used:
    4040 * <ul>
    … …  
    6565
    6666    static final ListProperty PREF_SOURCE = new ListProperty("tag2link.source",
    67             Collections.singletonList("resource://META-INF/resources/webjars/tag2link/2024.8.12/index.json"));
     67            Collections.singletonList("resource://META-INF/resources/webjars/tag2link/2024.8.21/index.json"));
    6868
    6969    static final CachingProperty<List<String>> PREF_SEARCH_ENGINES = new ListProperty("tag2link.search",

  • trunk/tools/ivy.xml

    r19191 r19208  
    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.17.0" conf="checkstyle->default"/>
     19        <dependency org="com.puppycrawl.tools" name="checkstyle" rev="10.18.1" conf="checkstyle->default"/>
    2020        <!-- proguard->default -->
    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.4.0" conf="pmd->default"/>
    24         <dependency org="net.sourceforge.pmd" name="pmd-ant" rev="7.4.0" conf="pmd->default"/>
    25         <dependency org="net.sourceforge.pmd" name="pmd-java" rev="7.4.0" conf="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"/>
    2626        <dependency org="org.xmlresolver" name="xmlresolver" rev="6.0.4" conf="pmd->default"/>
    2727        <!-- spotbugs->default -->
    … …  
    2929        <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.30.0" conf="errorprone->default"/>
     31        <dependency org="com.google.errorprone" name="error_prone_core" rev="2.31.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.