Skip to content

Commit 08934e7

Browse files
author
taylor.smock
committed
Update PMD to 7.2.0
A bunch of rules were deprecated and replaced and the XPath expressions had to be updated from XPath 1 to XPath 3. git-svn-id: https://josm.openstreetmap.de/svn/trunk@19113 0c6e7542-c601-0410-84e7-c038aed88b3b
1 parent 3b5f357 commit 08934e7

File tree

6 files changed

+95
-82
lines changed

6 files changed

+95
-82
lines changed

‎ivy.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
<dependency conf="api->default" org="jakarta.json" name="jakarta.json-api" rev="2.1.3"/>
2828
<!-- parsson is an implementation for jakarta.json -->
2929
<dependency conf="runtimeOnly->default" org="org.eclipse.parsson" name="parsson" rev="1.1.6"/>
30-
<dependency conf="api->default" org="org.apache.commons" name="commons-jcs3-core" rev="3.2"/>
31-
<dependency conf="api->default" org="org.apache.commons" name="commons-compress" rev="1.26.1"/>
30+
<dependency conf="api->default" org="org.apache.commons" name="commons-jcs3-core" rev="3.2.1"/>
31+
<dependency conf="api->default" org="org.apache.commons" name="commons-compress" rev="1.26.2"/>
3232
<dependency conf="api->default" org="jakarta.annotation" name="jakarta.annotation-api" rev="2.1.1" />
3333
<!-- jsr305 has some source files with non-free CC-BY-2.5 license. Remove after 2024-06-01 to give plugins time to migrate. See #23220 for details -->
3434
<dependency conf="api->default" org="com.google.code.findbugs" name="jsr305" rev="3.0.2"/>
@@ -45,8 +45,8 @@
4545
<dependency conf="sources->sources" org="org.glassfish" name="javax.json" rev="1.1.4"/>
4646
<dependency conf="sources->sources" org="jakarta.json" name="jakarta.json-api" rev="2.1.3"/>
4747
<dependency conf="sources->sources" org="org.eclipse.parsson" name="parsson" rev="1.1.6"/>
48-
<dependency conf="sources->sources" org="org.apache.commons" name="commons-jcs3-core" rev="3.2"/>
49-
<dependency conf="sources->sources" org="org.apache.commons" name="commons-compress" rev="1.26.1"/>
48+
<dependency conf="sources->sources" org="org.apache.commons" name="commons-jcs3-core" rev="3.2.1"/>
49+
<dependency conf="sources->sources" org="org.apache.commons" name="commons-compress" rev="1.26.2"/>
5050
<dependency conf="sources->sources" org="jakarta.annotation" name="jakarta.annotation-api" rev="2.1.1" />
5151
<!-- jsr305 has some source files with non-free CC-BY-2.5 license. Remove after 2024-06-01 to give plugins time to migrate. See #23220 for details -->
5252
<dependency conf="sources->sources" org="com.google.code.findbugs" name="jsr305" rev="3.0.2"/>
@@ -64,10 +64,10 @@
6464
</dependency>
6565
<dependency conf="jmockit->default" org="org.jmockit" name="jmockit" rev="1.49.a"/>
6666
<!-- test->default -->
67-
<dependency conf="test->default" org="com.github.spotbugs" name="spotbugs-annotations" rev="4.8.4"/>
67+
<dependency conf="test->default" org="com.github.spotbugs" name="spotbugs-annotations" rev="4.8.5"/>
6868
<dependency conf="test->default" org="com.ginsberg" name="junit5-system-exit" rev="1.1.2"/>
69-
<dependency conf="test->default" org="org.wiremock" name="wiremock" rev="3.5.4"/>
70-
<dependency conf="test->default" org="io.github.classgraph" name="classgraph" rev="4.8.171"/>
69+
<dependency conf="test->default" org="org.wiremock" name="wiremock" rev="3.6.0"/>
70+
<dependency conf="test->default" org="io.github.classgraph" name="classgraph" rev="4.8.173"/>
7171
<dependency conf="test->default" org="org.junit.platform" name="junit-platform-launcher" rev="1.10.2"/>
7272
<dependency conf="test->default" org="org.junit.platform" name="junit-platform-suite" rev="1.10.2"/>
7373
<dependency conf="test->default" org="org.junit.vintage" name="junit-vintage-engine" rev="5.10.2"/>

‎nodist/pom.xml

Lines changed: 39 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,13 @@
1111
<project.reporting.outputEncoding>US-ASCII</project.reporting.outputEncoding>
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>
1416
<test.headless>true</test.headless>
1517
<sonar.host.url>https://josm.openstreetmap.de/sonar/</sonar.host.url>
1618
<sonar.projectKey>JOSM</sonar.projectKey>
1719
<jmockit.version>1.49.a</jmockit.version>
20+
<pmd.version>7.2.0</pmd.version>
1821
</properties>
1922
<modules>
2023
<module>..</module>
@@ -71,7 +74,32 @@
7174
<plugin>
7275
<groupId>org.apache.maven.plugins</groupId>
7376
<artifactId>maven-pmd-plugin</artifactId>
74-
<version>3.22.0</version>
77+
<version>3.23.0</version>
78+
<dependencies>
79+
<dependency>
80+
<groupId>net.sourceforge.pmd</groupId>
81+
<artifactId>pmd-core</artifactId>
82+
<version>${pmd.version}</version>
83+
</dependency>
84+
<dependency>
85+
<groupId>net.sourceforge.pmd</groupId>
86+
<artifactId>pmd-java</artifactId>
87+
<version>${pmd.version}</version>
88+
</dependency>
89+
<dependency>
90+
<groupId>net.sourceforge.pmd</groupId>
91+
<artifactId>pmd-javascript</artifactId>
92+
<version>${pmd.version}</version>
93+
</dependency>
94+
<dependency>
95+
<groupId>net.sourceforge.pmd</groupId>
96+
<artifactId>pmd-jsp</artifactId>
97+
<version>${pmd.version}</version>
98+
</dependency>
99+
</dependencies>
100+
<configuration>
101+
<targetJdk>${java.lang.version}</targetJdk>
102+
</configuration>
75103
</plugin>
76104
<plugin>
77105
<groupId>org.apache.maven.plugins</groupId>
@@ -199,6 +227,12 @@
199227
</build>
200228
<dependencyManagement>
201229
<dependencies>
230+
<dependency>
231+
<groupId>org.jmockit</groupId>
232+
<artifactId>jmockit</artifactId>
233+
<version>${jmockit.version}</version>
234+
<scope>test</scope>
235+
</dependency>
202236
<dependency>
203237
<groupId>org.junit</groupId>
204238
<artifactId>junit-bom</artifactId>
@@ -227,13 +261,13 @@
227261
<dependency>
228262
<groupId>org.apache.commons</groupId>
229263
<artifactId>commons-jcs3-core</artifactId>
230-
<version>3.2</version>
264+
<version>3.2.1</version>
231265
<scope>provided</scope>
232266
</dependency>
233267
<dependency>
234268
<groupId>org.apache.commons</groupId>
235269
<artifactId>commons-compress</artifactId>
236-
<version>1.26.1</version>
270+
<version>1.26.2</version>
237271
<scope>provided</scope>
238272
</dependency>
239273
<dependency>
@@ -285,12 +319,6 @@
285319
<version>0.8.12</version>
286320
<scope>test</scope>
287321
</dependency>
288-
<dependency>
289-
<groupId>org.jmockit</groupId>
290-
<artifactId>jmockit</artifactId>
291-
<version>${jmockit.version}</version>
292-
<scope>test</scope>
293-
</dependency>
294322
<dependency>
295323
<groupId>com.github.spotbugs</groupId>
296324
<artifactId>spotbugs-annotations</artifactId>
@@ -312,7 +340,7 @@
312340
<dependency>
313341
<groupId>io.github.classgraph</groupId>
314342
<artifactId>classgraph</artifactId>
315-
<version>4.8.172</version>
343+
<version>4.8.173</version>
316344
<scope>test</scope>
317345
</dependency>
318346
<dependency>
@@ -341,4 +369,4 @@
341369
</dependency>
342370
</dependencies>
343371
</dependencyManagement>
344-
</project>
372+
</project>

‎scripts/TagInfoExtract.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,12 @@ public class TagInfoExtract {
102102
/**
103103
* Main method.
104104
* @param args Main program arguments
105-
* @throws Exception if any error occurs
105+
* @throws IOException if an IO exception occurs
106+
* @throws OsmTransferException if something happened when communicating with the OSM server
107+
* @throws ParseException if there was an issue parsing MapCSS
108+
* @throws SAXException if there was an issue parsing XML
106109
*/
107-
public static void main(String[] args) throws Exception {
110+
public static void main(String[] args) throws IOException, OsmTransferException, ParseException, SAXException {
108111
HttpClient.setFactory(Http1Client::new);
109112
TagInfoExtract script = new TagInfoExtract();
110113
script.parseCommandLineArguments(args);

‎src/org/openstreetmap/josm/data/projection/CustomProjection.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import org.openstreetmap.josm.tools.Logging;
3838
import org.openstreetmap.josm.tools.Utils;
3939
import org.openstreetmap.josm.tools.bugreport.BugReport;
40+
import org.openstreetmap.josm.tools.bugreport.ReportedException;
4041

4142
/**
4243
* Custom projection.
@@ -222,7 +223,6 @@ public CustomProjection(String pref) {
222223
* @param code unique code for this projection - may be null
223224
* @param pref the string that defines the custom projection
224225
*/
225-
@SuppressWarnings("PMD.PreserveStackTrace") // PMD 7.2.x doesn't like log + new exception here for some reason.
226226
public CustomProjection(String name, String code, String pref) {
227227
this.name = name;
228228
this.code = code;
@@ -234,7 +234,9 @@ public CustomProjection(String name, String code, String pref) {
234234
try {
235235
update(null);
236236
} catch (ProjectionConfigurationException ex1) {
237-
throw BugReport.intercept(ex1).put("name", name).put("code", code).put("pref", pref);
237+
ReportedException reportedException = BugReport.intercept(ex1).put("name", name).put("code", code).put("pref", pref);
238+
reportedException.addSuppressed(ex);
239+
throw reportedException;
238240
}
239241
}
240242
}

‎tools/ivy.xml

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,19 @@
1616
<!-- javacc->default -->
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.15.0" conf="checkstyle->default"/>
19+
<dependency org="com.puppycrawl.tools" name="checkstyle" rev="10.17.0" conf="checkstyle->default"/>
2020
<!-- proguard->default -->
21-
<dependency org="com.guardsquare" name="proguard-ant" rev="7.4.2" conf="proguard->default"/>
21+
<dependency org="com.guardsquare" name="proguard-ant" rev="7.5.0" conf="proguard->default"/>
2222
<!-- pmd->default -->
23-
<!-- PMD 7.0.0 has too many false positives right now. When updating, don't forget to add pmd-ant as a new dependency -->
24-
<dependency org="net.sourceforge.pmd" name="pmd-core" rev="6.55.0" conf="pmd->default"/>
25-
<dependency org="net.sourceforge.pmd" name="pmd-java" rev="6.55.0" conf="pmd->default"/>
26-
<dependency org="net.sourceforge.saxon" name="saxon" rev="9.1.0.8" conf="pmd->default">
27-
<artifact name="saxon" type="jar"/>
28-
<artifact name="saxon" type="jar" maven:classifier="dom"/>
29-
</dependency>
23+
<dependency org="net.sourceforge.pmd" name="pmd-core" rev="7.2.0" conf="pmd->default"/>
24+
<dependency org="net.sourceforge.pmd" name="pmd-ant" rev="7.2.0" conf="pmd->default"/>
25+
<dependency org="net.sourceforge.pmd" name="pmd-java" rev="7.2.0" conf="pmd->default"/>
26+
<dependency org="org.xmlresolver" name="xmlresolver" rev="6.0.4" conf="pmd->default"/>
3027
<!-- spotbugs->default -->
31-
<dependency org="com.github.spotbugs" name="spotbugs" rev="4.8.4" conf="spotbugs->default"/>
32-
<dependency org="com.github.spotbugs" name="spotbugs-ant" rev="4.8.4" conf="spotbugs->default"/>
28+
<dependency org="com.github.spotbugs" name="spotbugs" rev="4.8.5" conf="spotbugs->default"/>
29+
<dependency org="com.github.spotbugs" name="spotbugs-ant" rev="4.8.5" conf="spotbugs->default"/>
3330
<!-- errorprone->default -->
34-
<dependency org="com.google.errorprone" name="error_prone_core" rev="2.26.1" conf="errorprone->default"/>
31+
<dependency org="com.google.errorprone" name="error_prone_core" rev="2.28.0" conf="errorprone->default"/>
3532
<!-- animal->default -->
3633
<dependency org="org.codehaus.mojo" name="animal-sniffer-ant-tasks" rev="1.23" conf="animal->default"/>
3734
</dependencies>

0 commit comments

Comments
 (0)