From 3ab915c68218e6aa3cc3dc2b295662eb7dc2526b Mon Sep 17 00:00:00 2001
From: ThomasLohnert <thomas.lohnert@stfc.ac.uk>
Date: Fri, 9 Jul 2021 16:17:43 +0100
Subject: [PATCH] Update checkstyle.xml to be compatible with latest plugin
 version

---
 .../checkstyle.xml                                     | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/base/uk.ac.stfc.isis.ibex.client.tycho.parent/checkstyle.xml b/base/uk.ac.stfc.isis.ibex.client.tycho.parent/checkstyle.xml
index 49a504624b..cda6a85bd7 100644
--- a/base/uk.ac.stfc.isis.ibex.client.tycho.parent/checkstyle.xml
+++ b/base/uk.ac.stfc.isis.ibex.client.tycho.parent/checkstyle.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module PUBLIC "-//Checkstyle//DTD Check Configuration 1.3//EN" "https://checkstyle.org/dtds/configuration_1_3.dtd">
+<!DOCTYPE module PUBLIC "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN" "https://checkstyle.org/dtds/configuration_1_3.dtd">
 
 <!--
     This configuration file was written by the eclipse-cs plugin configuration editor
@@ -14,11 +14,11 @@
     <module name="SuppressWarningsHolder"/>
     <module name="ConstantName"/>
     <module name="JavadocMethod">
-      <property name="scope" value="protected"/>
+      <property name="accessModifiers" value="public, protected"/>
     </module>
     <module name="JavadocType">
       <property name="scope" value="protected"/>
-      <property name="tokens" value="INTERFACE_DEF,ENUM_DEF,CLASS_DEF,ANNOTATION_DEF"/>
+      <property name="tokens" value="INTERFACE_DEF,CLASS_DEF,ENUM_DEF,ANNOTATION_DEF"/>
     </module>
     <module name="JavadocStyle">
       <property name="scope" value="protected"/>
@@ -68,9 +68,7 @@
     <module name="EmptyStatement"/>
     <module name="EqualsHashCode"/>
     <module name="IllegalInstantiation"/>
-    <module name="MagicNumber">
-      <property name="constantWaiverParentToken" value="TYPECAST,METHOD_CALL,EXPR,ARRAY_INIT,UNARY_MINUS,UNARY_PLUS,ELIST,STAR,ASSIGN,PLUS,MINUS,DIV,LITERAL_NEW"/>
-    </module>
+    <module name="MagicNumber"/>
     <module name="MissingSwitchDefault"/>
     <module name="SimplifyBooleanExpression"/>
     <module name="SimplifyBooleanReturn"/>