Index: applications/editors/josm/plugins/mapillary/.settings/pmd-ruleset.xml
===================================================================
--- applications/editors/josm/plugins/mapillary/.settings/pmd-ruleset.xml	(revision 32578)
+++ applications/editors/josm/plugins/mapillary/.settings/pmd-ruleset.xml	(revision 32579)
@@ -31,4 +31,9 @@
   <rule ref="rulesets/java/finalizers.xml"/>
   <rule ref="rulesets/java/imports.xml"/>
+  <rule ref="rulesets/java/naming.xml">
+    <exclude name="ShortVariable"/>
+    <exclude name="LongVariable"/>
+    <exclude name="AbstractNaming"/>
+  </rule>
   <rule ref="rulesets/java/optimizations.xml">
     <exclude name="LocalVariableCouldBeFinal" />
Index: applications/editors/josm/plugins/mapillary/build.gradle
===================================================================
--- applications/editors/josm/plugins/mapillary/build.gradle	(revision 32578)
+++ applications/editors/josm/plugins/mapillary/build.gradle	(revision 32579)
@@ -32,5 +32,5 @@
   // The JOSM-version can be specified as "latest", "tested" or the numeric version number.
   // When using a numeric version number you can leave out {changing=true}.
-  compile(':josm:10377')
+  compile(':josm:10485')
   // For plugins it's irrelevant, which version is specified, always the latest version is used.
   compile (name: 'apache-commons'){changing=true}
@@ -80,5 +80,5 @@
   toolVersion project.property('tools.pmd.version')
   ignoreFailures true
-  targetJdk 1.7 // 1.8 is not yet available
+  targetJdk 1.7 // 1.8 is not yet available (as of Gradle 2.14, see https://docs.gradle.org/current/javadoc/org/gradle/api/plugins/quality/TargetJdk.html)
   ruleSetConfig = resources.text.fromFile('.settings/pmd-ruleset.xml')
 }
Index: applications/editors/josm/plugins/mapillary/gradle.properties
===================================================================
--- applications/editors/josm/plugins/mapillary/gradle.properties	(revision 32578)
+++ applications/editors/josm/plugins/mapillary/gradle.properties	(revision 32579)
@@ -12,5 +12,5 @@
 #plugin.stage=...
 
-tools.pmd.version=5.4.2
+tools.pmd.version=5.5.0
 tools.findbugs.version=3.0.1
 tools.jacoco.version=0.7.7.201606060606
Index: applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryPreferenceSetting.java
===================================================================
--- applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryPreferenceSetting.java	(revision 32578)
+++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryPreferenceSetting.java	(revision 32579)
@@ -168,4 +168,5 @@
   }
 
+  @SuppressWarnings("PMD.ShortMethodName")
   @Override
   public boolean ok() {