Index: trunk/.classpath
===================================================================
--- trunk/.classpath	(revision 14603)
+++ trunk/.classpath	(revision 14604)
@@ -23,5 +23,5 @@
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="lib" path="test/lib/jmockit-1.43.jar">
+	<classpathentry kind="lib" path="test/lib/jmockit.jar">
 		<attributes>
 			<attribute name="test" value="true"/>
@@ -38,5 +38,5 @@
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="test/lib/equalsverifier-2.5.1.jar">
+	<classpathentry exported="true" kind="lib" path="test/lib/equalsverifier-3.1.2.jar">
 		<attributes>
 			<attribute name="test" value="true"/>
@@ -58,5 +58,5 @@
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="lib" path="test/lib/system-rules-1.16.1.jar">
+	<classpathentry kind="lib" path="test/lib/system-rules-1.19.0.jar">
 		<attributes>
 			<attribute name="test" value="true"/>
@@ -68,10 +68,10 @@
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="test/lib/wiremock-standalone-2.18.0.jar">
+	<classpathentry exported="true" kind="lib" path="test/lib/wiremock-standalone-2.20.0.jar">
 		<attributes>
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="test/lib/awaitility-3.1.2.jar">
+	<classpathentry exported="true" kind="lib" path="test/lib/awaitility-3.1.5.jar">
 		<attributes>
 			<attribute name="test" value="true"/>
@@ -84,5 +84,5 @@
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="lib" path="tools/pmd/commons-lang3-3.7.jar">
+	<classpathentry kind="lib" path="tools/pmd/commons-lang3-3.8.1.jar">
 		<attributes>
 			<attribute name="test" value="true"/>
@@ -99,10 +99,10 @@
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="lib" path="tools/groovy/groovy-cli-commons-2.5.1.jar">
+	<classpathentry kind="lib" path="tools/groovy/groovy-cli-commons-2.5.5.jar">
 		<attributes>
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="lib" path="tools/groovy/groovy-xml-2.5.1.jar">
+	<classpathentry kind="lib" path="tools/groovy/groovy-xml-2.5.5.jar">
 		<attributes>
 			<attribute name="test" value="true"/>
Index: trunk/build.xml
===================================================================
--- trunk/build.xml	(revision 14603)
+++ trunk/build.xml	(revision 14604)
@@ -82,5 +82,5 @@
             </fileset>
             <pathelement path="${dist.jar}"/>
-            <pathelement path="${pmd.dir}/commons-lang3-3.7.jar"/>
+            <pathelement path="${pmd.dir}/commons-lang3-3.8.1.jar"/>
             <pathelement path="${spotbugs.dir}/spotbugs-annotations.jar"/>
         </path>
@@ -497,5 +497,5 @@
                 <junit printsummary="${junit.printsummary}" fork="true" forkmode="once" failureproperty="test.@{testfamily}@{testITsuffix}.failed">
                     <jvmarg value="-Dfile.encoding=UTF-8"/>
-                    <jvmarg value="-javaagent:${test.dir}/lib/jmockit-1.43.jar"/>
+                    <jvmarg value="-javaagent:${test.dir}/lib/jmockit.jar"/>
                     <jvmarg value="--add-modules" if:set="isJava9" unless:set="isJava11" />
                     <jvmarg value="java.activation,java.se.ee" if:set="isJava9" unless:set="isJava11" />
Index: trunk/test/unit/org/openstreetmap/josm/actions/CombineWayActionTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/actions/CombineWayActionTest.java	(revision 14603)
+++ trunk/test/unit/org/openstreetmap/josm/actions/CombineWayActionTest.java	(revision 14604)
@@ -23,5 +23,4 @@
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import nl.jqno.equalsverifier.EqualsVerifier;
-import nl.jqno.equalsverifier.Warning;
 
 /**
@@ -66,5 +65,4 @@
         TestUtils.assumeWorkingEqualsVerifier();
         EqualsVerifier.forClass(NodePair.class).usingGetClass()
-            .suppress(Warning.ANNOTATION) // FIXME: remove it after https://github.com/jqno/equalsverifier/issues/197 is fixed
             .withPrefabValues(Node.class, new Node(1), new Node(2))
             .verify();
Index: trunk/test/unit/org/openstreetmap/josm/gui/MapStatusTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/MapStatusTest.java	(revision 14603)
+++ trunk/test/unit/org/openstreetmap/josm/gui/MapStatusTest.java	(revision 14604)
@@ -9,5 +9,4 @@
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import nl.jqno.equalsverifier.EqualsVerifier;
-import nl.jqno.equalsverifier.Warning;
 
 /**
@@ -30,5 +29,4 @@
         TestUtils.assumeWorkingEqualsVerifier();
         EqualsVerifier.forClass(MapStatus.StatusTextHistory.class)
-            .suppress(Warning.ANNOTATION) // FIXME: To remove once https://github.com/jqno/equalsverifier/issues/197 is fixed
             .withIgnoredFields("text").verify();
     }
Index: trunk/test/unit/org/openstreetmap/josm/testutils/mockers/ExtendedDialogMocker.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/testutils/mockers/ExtendedDialogMocker.java	(revision 14603)
+++ trunk/test/unit/org/openstreetmap/josm/testutils/mockers/ExtendedDialogMocker.java	(revision 14604)
@@ -18,4 +18,5 @@
 import mockit.Invocation;
 import mockit.Mock;
+import mockit.internal.reflection.FieldReflection;
 
 /**
@@ -157,5 +158,5 @@
                 final int mockResult = this.getMockResult(instance);
                 // TODO check validity of mockResult?
-                Deencapsulation.setField(instance, "result", mockResult);
+                FieldReflection.setField(instance.getClass(), instance, "result", mockResult);
                 Logging.info(
                     "{0} answering {1} to ExtendedDialog with content {2}",
Index: trunk/tools/pmd/josm-ruleset.xml
===================================================================
--- trunk/tools/pmd/josm-ruleset.xml	(revision 14603)
+++ trunk/tools/pmd/josm-ruleset.xml	(revision 14604)
@@ -55,7 +55,9 @@
     <exclude name="EmptyMethodInAbstractClassShouldBeAbstract"/>
     <exclude name="FieldDeclarationsShouldBeAtStartOfClass"/>
+    <exclude name="FieldNamingConventions"/>
     <exclude name="ForLoopsMustUseBraces"/>
     <exclude name="IfElseStmtsMustUseBraces"/>
     <exclude name="IfStmtsMustUseBraces"/>
+    <exclude name="LinguisticNaming"/>
     <exclude name="LocalVariableCouldBeFinal"/>
     <exclude name="LongVariable"/>
@@ -70,4 +72,5 @@
     <exclude name="UnnecessaryConstructor"/>
     <exclude name="UselessParentheses"/>
+    <exclude name="UseUnderscoresInNumericLiterals"/>
     <exclude name="VariableNamingConventions"/>
     <exclude name="WhileLoopsMustUseBraces"/>
@@ -85,6 +88,7 @@
     </properties>
   </rule>
-  <rule ref="category/java/codestyle.xml/VariableNamingConventions">
+  <rule ref="category/java/codestyle.xml/FieldNamingConventions">
     <properties>
+        <property name="enumConstantPattern" value="[A-Za-z][A-Za-z_0-9]*"/>
         <property name="violationSuppressXPath" value="//FieldDeclaration[@Public='true']
           | //FieldDeclaration/../Annotation/MarkerAnnotation/Name[@Image='pref']