Skip to content

Commit f8e3481

Browse files
author
taylor.smock
committed
Fix #22641: Update tag2link in dependencies (patch by gaben, modified 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
1 parent 9cbc747 commit f8e3481

File tree

4 files changed

+11
-12
lines changed

4 files changed

+11
-12
lines changed

ivy.xml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@
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+
<!-- Don't forget to update org.openstreetmap.josm.tools.Tag2Link#PREF_SOURCE -->
36+
<dependency conf="api->default" org="org.webjars.npm" name="tag2link" rev="2022.11.28"/>
3637
<!-- sources->sources -->
3738
<dependency conf="sources->sources" org="org.openstreetmap.jmapviewer" name="jmapviewer" rev="2.16"/>
3839
<dependency conf="sources->sources" org="javax.json" name="javax.json-api" rev="1.1.4"/>
@@ -46,7 +47,7 @@
4647
<dependency conf="sources->sources" org="com.formdev" name="svgSalamander" rev="1.1.4"/>
4748
<dependency conf="sources->sources" org="ch.poole" name="OpeningHoursParser" rev="0.27.0"/>
4849
<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) -->
50+
<dependency conf="sources->default" org="org.webjars.npm" name="tag2link" rev="2022.11.28"/><!-- sources->default sic! (tag2link-sources.jar is empty, see #19335) -->
5051
<!-- commonslang->default -->
5152
<dependency conf="commonslang->default" org="org.apache.commons" name="commons-lang3" rev="3.12.0"/>
5253
<!-- jacocoant->default -->
@@ -58,15 +59,15 @@
5859
<dependency conf="test->default" org="com.github.spotbugs" name="spotbugs-annotations" rev="4.7.3"/>
5960
<dependency conf="test->default" org="com.ginsberg" name="junit5-system-exit" rev="1.1.2"/>
6061
<dependency conf="test->default" org="com.github.tomakehurst" name="wiremock-jre8" rev="2.35.0"/>
61-
<dependency conf="test->default" org="io.github.classgraph" name="classgraph" rev="4.8.149"/>
62+
<dependency conf="test->default" org="io.github.classgraph" name="classgraph" rev="4.8.154"/>
6263
<dependency conf="test->default" org="org.junit.platform" name="junit-platform-launcher" rev="1.9.1"/>
6364
<dependency conf="test->default" org="org.junit.vintage" name="junit-vintage-engine" rev="5.9.1"/>
6465
<dependency conf="test->default" org="org.junit.jupiter" name="junit-jupiter-params" rev="5.9.1"/>
6566
<dependency conf="test->default" org="org.junit.jupiter" name="junit-jupiter-api" rev="5.9.1"/>
6667
<dependency conf="test->default" org="org.junit.jupiter" name="junit-jupiter-engine" rev="5.9.1"/>
6768
<dependency conf="test->default" org="org.junit.jupiter" name="junit-jupiter-migrationsupport" rev="5.9.1"/>
6869
<dependency conf="test->default" org="net.trajano.commons" name="commons-testing" rev="2.1.0"/>
69-
<dependency conf="test->default" org="nl.jqno.equalsverifier" name="equalsverifier" rev="3.11"/>
70+
<dependency conf="test->default" org="nl.jqno.equalsverifier" name="equalsverifier" rev="3.12.3"/>
7071
<dependency conf="test->default" org="org.apache.commons" name="commons-lang3" rev="3.12.0"/>
7172
<dependency conf="test->default" org="org.awaitility" name="awaitility" rev="4.2.0"/>
7273
</dependencies>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public final class Tag2Link {
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();

tools/ivy.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
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.2.2" conf="proguard->default"/>
21+
<dependency org="com.guardsquare" name="proguard-ant" rev="7.3.0" conf="proguard->default"/>
2222
<!-- pmd->default -->
23-
<dependency org="net.sourceforge.pmd" name="pmd-core" rev="6.51.0" conf="pmd->default"/>
24-
<dependency org="net.sourceforge.pmd" name="pmd-java" rev="6.51.0" conf="pmd->default"/>
23+
<dependency org="net.sourceforge.pmd" name="pmd-core" rev="6.53.0" conf="pmd->default"/>
24+
<dependency org="net.sourceforge.pmd" name="pmd-java" rev="6.53.0" conf="pmd->default"/>
2525
<dependency org="net.sourceforge.saxon" name="saxon" rev="9.1.0.8" conf="pmd->default">
2626
<artifact name="saxon" type="jar"/>
2727
<artifact name="saxon" type="jar" maven:classifier="dom"/>

tools/pmd/josm-ruleset.xml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<ruleset name="JOSM ruleset"
33
xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
44
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5-
xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 http://pmd.sourceforge.net/ruleset_2_0_0.xsd">
5+
xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 https://pmd.sourceforge.io/ruleset_2_0_0.xsd">
66

77
<description>JOSM PMD ruleset</description>
88

@@ -129,9 +129,7 @@
129129
<exclude name="CyclomaticComplexity"/>
130130
<exclude name="DataClass"/>
131131
<exclude name="ExceptionAsFlowControl"/>
132-
<exclude name="ExcessiveClassLength"/>
133132
<exclude name="ExcessiveImports"/>
134-
<exclude name="ExcessiveMethodLength"/>
135133
<exclude name="ExcessiveParameterList"/>
136134
<exclude name="ExcessivePublicCount"/>
137135
<exclude name="GodClass"/>
@@ -168,7 +166,6 @@
168166
<exclude name="AvoidFieldNameMatchingTypeName"/>
169167
<exclude name="AvoidInstanceofChecksInCatchClause"/>
170168
<exclude name="AvoidLiteralsInIfCondition"/>
171-
<exclude name="BeanMembersShouldSerialize"/>
172169
<exclude name="CloneThrowsCloneNotSupportedException"/>
173170
<!-- <exclude name="CloseResource"/> -->
174171
<exclude name="CompareObjectsWithEquals"/>
@@ -179,6 +176,7 @@
179176
<exclude name="ImplicitSwitchFallThrough"/>
180177
<exclude name="MissingSerialVersionUID"/>
181178
<exclude name="MissingStaticMethodInNonInstantiatableClass"/>
179+
<exclude name="NonSerializableClass"/>
182180
<exclude name="NonStaticInitializer"/>
183181
<exclude name="NullAssignment"/>
184182
<exclude name="ReturnEmptyArrayRatherThanNull"/>

0 commit comments

Comments
 (0)