Modify

Opened 2 years ago

Closed 2 years ago

#22641 closed task (fixed)

[patch] Update tag2link in dependencies

Reported by: gaben Owned by: team
Priority: minor Milestone: 23.01
Component: Core tag2link Version:
Keywords: Cc:

Description

I saw the tag2link bundle got updated in npm, but not in JOSM core. The following patch will make JOSM to use the latest ruleset.

  • ivy.xml

    IDEA additional info:
    Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
    <+>UTF-8
    diff --git a/ivy.xml b/ivy.xml
    a b  
    3232        <dependency conf="api->default" org="com.formdev" name="svgSalamander" rev="1.1.4"/>
    3333        <dependency conf="api->default" org="ch.poole" name="OpeningHoursParser" rev="0.27.0"/>
    3434        <dependency conf="api->default" org="oauth.signpost" name="signpost-core" rev="2.1.1"/>
    35         <dependency conf="api->default" org="org.webjars.npm" name="tag2link" rev="2021.3.21"/>
     35        <dependency conf="api->default" org="org.webjars.npm" name="tag2link" rev="2022.11.28"/>
    3636        <!-- sources->sources -->
    3737        <dependency conf="sources->sources" org="org.openstreetmap.jmapviewer" name="jmapviewer" rev="2.16"/>
    3838        <dependency conf="sources->sources" org="javax.json" name="javax.json-api" rev="1.1.4"/>
     
    4646        <dependency conf="sources->sources" org="com.formdev" name="svgSalamander" rev="1.1.4"/>
    4747        <dependency conf="sources->sources" org="ch.poole" name="OpeningHoursParser" rev="0.27.0"/>
    4848        <dependency conf="sources->sources" org="oauth.signpost" name="signpost-core" rev="2.1.1"/>
    49         <dependency conf="sources->default" org="org.webjars.npm" name="tag2link" rev="2021.3.21"/><!-- sources->default sic! (tag2link-sources.jar is empty, see #19335) -->
     49        <dependency conf="sources->default" org="org.webjars.npm" name="tag2link" rev="2022.11.28"/><!-- sources->default sic! (tag2link-sources.jar is empty, see #19335) -->
    5050        <!-- commonslang->default -->
    5151        <dependency conf="commonslang->default" org="org.apache.commons" name="commons-lang3" rev="3.12.0"/>
    5252        <!-- jacocoant->default -->
  • src/org/openstreetmap/josm/tools/Tag2Link.java

    IDEA additional info:
    Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
    <+>UTF-8
    diff --git a/src/org/openstreetmap/josm/tools/Tag2Link.java b/src/org/openstreetmap/josm/tools/Tag2Link.java
    a b  
    6464            .collect(Collectors.joining("|"));
    6565
    6666    static final ListProperty PREF_SOURCE = new ListProperty("tag2link.source",
    67             Collections.singletonList("resource://META-INF/resources/webjars/tag2link/2021.3.21/index.json"));
     67            Collections.singletonList("resource://META-INF/resources/webjars/tag2link/2022.11.28/index.json"));
    6868
    6969    static final CachingProperty<List<String>> PREF_SEARCH_ENGINES = new ListProperty("tag2link.search",
    7070            Arrays.asList("https://duckduckgo.com/?q=$1", "https://www.google.com/search?q=$1")).cached();
Relative:URL: ^/trunk
Repository:UUID: 0c6e7542-c601-0410-84e7-c038aed88b3b
Last:Changed Date: 2023-01-03 21:28:24 +0100 (Tue, 03 Jan 2023)
Revision:18622
Build-Date:2023-01-04 02:30:56
URL:https://josm.openstreetmap.de/svn/trunk

Attachments (0)

Change History (2)

comment:1 by taylor.smock, 2 years ago

I got the tag2link update out too late for 22.12 (I had been thinking that the webjars would automatically pick up the new maven coordinate and autorelease it).

I was planning on doing a general dependency update this week.

Anyway, thanks for the patch.

comment:2 by taylor.smock, 2 years ago

Resolution: fixed
Status: newclosed

In 18629/josm:

Fix #22641: Update tag2link in dependencies (patch by gaben, modified for additional dependencies)

ivy.xml

tools/ivy.xml

Modify Ticket

Change Properties
Set your email in Preferences
Action
as closed The owner will remain team.
as The resolution will be set.
The resolution will be deleted. Next status will be 'reopened'.

Add Comment


E-mail address and name can be saved in the Preferences .
 
Note: See TracTickets for help on using tickets.