Skip to content

Commit

Permalink
Fix #22641: Update tag2link in dependencies (patch by gaben, modified…
Browse files Browse the repository at this point in the history 
… for additional dependencies)

ivy.xml
* tag2link: 2021.3.21 -> 2022.11.28
 * Just an update of wikidata to use for adding links to tags
* classgraph: 4.8.149 -> 4.8.154
 * Partial changelog: https://github.com/classgraph/classgraph/releases/tag/classgraph-4.8.154
* equalsverifier: 3.11 -> 3.12.3
 * Better diagnostic output
 * Full changelog: https://github.com/jqno/equalsverifier/blob/main/CHANGELOG.md

tools/ivy.xml
* proguard: 7.2.2 -> 7.3.0
 * Java 19 support
 * Full changelog: https://github.com/Guardsquare/proguard/releases/tag/v7.3.0
* pmd: 6.51.0 -> 6.53.0
 * Renamed BeanMembersShouldSerialize to NonSerializableClass
 * Various deprecations (of rules we exclude)
 * Partial changelog: https://pmd.sourceforge.io/pmd-6.53.0/pmd_release_notes.html

git-svn-id: https://josm.openstreetmap.de/svn/trunk@18629 0c6e7542-c601-0410-84e7-c038aed88b3b
  • Loading branch information
taylor.smock committed Jan 10, 2023
1 parent 9cbc747 commit f8e3481
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 12 deletions.
9 changes: 5 additions & 4 deletions ivy.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@
<dependency conf="api->default" org="com.formdev" name="svgSalamander" rev="1.1.4"/>
<dependency conf="api->default" org="ch.poole" name="OpeningHoursParser" rev="0.27.0"/>
<dependency conf="api->default" org="oauth.signpost" name="signpost-core" rev="2.1.1"/>
<dependency conf="api->default" org="org.webjars.npm" name="tag2link" rev="2021.3.21"/>
<!-- Don't forget to update org.openstreetmap.josm.tools.Tag2Link#PREF_SOURCE -->
<dependency conf="api->default" org="org.webjars.npm" name="tag2link" rev="2022.11.28"/>
<!-- sources->sources -->
<dependency conf="sources->sources" org="org.openstreetmap.jmapviewer" name="jmapviewer" rev="2.16"/>
<dependency conf="sources->sources" org="javax.json" name="javax.json-api" rev="1.1.4"/>
Expand All @@ -46,7 +47,7 @@
<dependency conf="sources->sources" org="com.formdev" name="svgSalamander" rev="1.1.4"/>
<dependency conf="sources->sources" org="ch.poole" name="OpeningHoursParser" rev="0.27.0"/>
<dependency conf="sources->sources" org="oauth.signpost" name="signpost-core" rev="2.1.1"/>
<dependency conf="sources->default" org="org.webjars.npm" name="tag2link" rev="2021.3.21"/><!-- sources->default sic! (tag2link-sources.jar is empty, see #19335) -->
<dependency conf="sources->default" org="org.webjars.npm" name="tag2link" rev="2022.11.28"/><!-- sources->default sic! (tag2link-sources.jar is empty, see #19335) -->
<!-- commonslang->default -->
<dependency conf="commonslang->default" org="org.apache.commons" name="commons-lang3" rev="3.12.0"/>
<!-- jacocoant->default -->
Expand All @@ -58,15 +59,15 @@
<dependency conf="test->default" org="com.github.spotbugs" name="spotbugs-annotations" rev="4.7.3"/>
<dependency conf="test->default" org="com.ginsberg" name="junit5-system-exit" rev="1.1.2"/>
<dependency conf="test->default" org="com.github.tomakehurst" name="wiremock-jre8" rev="2.35.0"/>
<dependency conf="test->default" org="io.github.classgraph" name="classgraph" rev="4.8.149"/>
<dependency conf="test->default" org="io.github.classgraph" name="classgraph" rev="4.8.154"/>
<dependency conf="test->default" org="org.junit.platform" name="junit-platform-launcher" rev="1.9.1"/>
<dependency conf="test->default" org="org.junit.vintage" name="junit-vintage-engine" rev="5.9.1"/>
<dependency conf="test->default" org="org.junit.jupiter" name="junit-jupiter-params" rev="5.9.1"/>
<dependency conf="test->default" org="org.junit.jupiter" name="junit-jupiter-api" rev="5.9.1"/>
<dependency conf="test->default" org="org.junit.jupiter" name="junit-jupiter-engine" rev="5.9.1"/>
<dependency conf="test->default" org="org.junit.jupiter" name="junit-jupiter-migrationsupport" rev="5.9.1"/>
<dependency conf="test->default" org="net.trajano.commons" name="commons-testing" rev="2.1.0"/>
<dependency conf="test->default" org="nl.jqno.equalsverifier" name="equalsverifier" rev="3.11"/>
<dependency conf="test->default" org="nl.jqno.equalsverifier" name="equalsverifier" rev="3.12.3"/>
<dependency conf="test->default" org="org.apache.commons" name="commons-lang3" rev="3.12.0"/>
<dependency conf="test->default" org="org.awaitility" name="awaitility" rev="4.2.0"/>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion src/org/openstreetmap/josm/tools/Tag2Link.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public final class Tag2Link {
.collect(Collectors.joining("|"));

static final ListProperty PREF_SOURCE = new ListProperty("tag2link.source",
Collections.singletonList("resource://META-INF/resources/webjars/tag2link/2021.3.21/index.json"));
Collections.singletonList("resource://META-INF/resources/webjars/tag2link/2022.11.28/index.json"));

static final CachingProperty<List<String>> PREF_SEARCH_ENGINES = new ListProperty("tag2link.search",
Arrays.asList("https://duckduckgo.com/?q=$1", "https://www.google.com/search?q=$1")).cached();
Expand Down
6 changes: 3 additions & 3 deletions tools/ivy.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
<!-- checkstyle->default -->
<dependency org="com.puppycrawl.tools" name="checkstyle" rev="9.3" conf="checkstyle->default"/>
<!-- proguard->default -->
<dependency org="com.guardsquare" name="proguard-ant" rev="7.2.2" conf="proguard->default"/>
<dependency org="com.guardsquare" name="proguard-ant" rev="7.3.0" conf="proguard->default"/>
<!-- pmd->default -->
<dependency org="net.sourceforge.pmd" name="pmd-core" rev="6.51.0" conf="pmd->default"/>
<dependency org="net.sourceforge.pmd" name="pmd-java" rev="6.51.0" conf="pmd->default"/>
<dependency org="net.sourceforge.pmd" name="pmd-core" rev="6.53.0" conf="pmd->default"/>
<dependency org="net.sourceforge.pmd" name="pmd-java" rev="6.53.0" conf="pmd->default"/>
<dependency org="net.sourceforge.saxon" name="saxon" rev="9.1.0.8" conf="pmd->default">
<artifact name="saxon" type="jar"/>
<artifact name="saxon" type="jar" maven:classifier="dom"/>
Expand Down
6 changes: 2 additions & 4 deletions tools/pmd/josm-ruleset.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<ruleset name="JOSM ruleset"
xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 http://pmd.sourceforge.net/ruleset_2_0_0.xsd">
xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 https://pmd.sourceforge.io/ruleset_2_0_0.xsd">

<description>JOSM PMD ruleset</description>

Expand Down Expand Up @@ -129,9 +129,7 @@
<exclude name="CyclomaticComplexity"/>
<exclude name="DataClass"/>
<exclude name="ExceptionAsFlowControl"/>
<exclude name="ExcessiveClassLength"/>
<exclude name="ExcessiveImports"/>
<exclude name="ExcessiveMethodLength"/>
<exclude name="ExcessiveParameterList"/>
<exclude name="ExcessivePublicCount"/>
<exclude name="GodClass"/>
Expand Down Expand Up @@ -168,7 +166,6 @@
<exclude name="AvoidFieldNameMatchingTypeName"/>
<exclude name="AvoidInstanceofChecksInCatchClause"/>
<exclude name="AvoidLiteralsInIfCondition"/>
<exclude name="BeanMembersShouldSerialize"/>
<exclude name="CloneThrowsCloneNotSupportedException"/>
<!-- <exclude name="CloseResource"/> -->
<exclude name="CompareObjectsWithEquals"/>
Expand All @@ -179,6 +176,7 @@
<exclude name="ImplicitSwitchFallThrough"/>
<exclude name="MissingSerialVersionUID"/>
<exclude name="MissingStaticMethodInNonInstantiatableClass"/>
<exclude name="NonSerializableClass"/>
<exclude name="NonStaticInitializer"/>
<exclude name="NullAssignment"/>
<exclude name="ReturnEmptyArrayRatherThanNull"/>
Expand Down

0 comments on commit f8e3481

Please sign in to comment.