From f853b8c446e2f1a0471917fc02e5d68c8ff622f9 Mon Sep 17 00:00:00 2001
From: rnveach <rveach02@gmail.com>
Date: Tue, 15 Nov 2022 17:06:53 -0500
Subject: [PATCH] Issue #930: upgrade to checkstyle 10.4

---
 eclipse-pom.xml                                             | 6 +++---
 eclipsecs-sevntu-plugin/pom.xml                             | 2 +-
 sevntu-checks/pom.xml                                       | 2 +-
 .../checkstyle/checks/coding/Jsr305AnnotationsCheck.java    | 2 +-
 sevntu-checkstyle-sonar-plugin/pom.xml                      | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/eclipse-pom.xml b/eclipse-pom.xml
index 9c2f20d225..58d764eca0 100644
--- a/eclipse-pom.xml
+++ b/eclipse-pom.xml
@@ -22,14 +22,14 @@
   </modules>
 
   <properties>
-    <tycho-version>1.6.0</tycho-version>
+    <tycho-version>2.7.5</tycho-version>
   </properties>
 
   <repositories>
     <repository>
-      <id>2019-06</id>
+      <id>2020-09</id>
       <layout>p2</layout>
-      <url>https://download.eclipse.org/releases/2019-06</url>
+      <url>https://download.eclipse.org/releases/2020-09</url>
     </repository>
   </repositories>
 
diff --git a/eclipsecs-sevntu-plugin/pom.xml b/eclipsecs-sevntu-plugin/pom.xml
index 4fe65f7032..78cf636acb 100644
--- a/eclipsecs-sevntu-plugin/pom.xml
+++ b/eclipsecs-sevntu-plugin/pom.xml
@@ -28,7 +28,7 @@
   <properties>
     <eclipsecs.version>10.0.0-SNAPSHOT</eclipsecs.version>
     <!-- verify time version -->
-    <checkstyle.version>10.3.4</checkstyle.version>
+    <checkstyle.version>10.4</checkstyle.version>
     <checkstyle.configLocation>https://raw.githubusercontent.com/checkstyle/checkstyle/checkstyle-${checkstyle.version}/config/checkstyle_checks.xml</checkstyle.configLocation>
     <checkstyle.header>https://raw.githubusercontent.com/checkstyle/checkstyle/master/config/java.header</checkstyle.header>
     <checkstyle.regexp.header>https://raw.githubusercontent.com/checkstyle/checkstyle/master/config/java_regexp.header</checkstyle.regexp.header>
diff --git a/sevntu-checks/pom.xml b/sevntu-checks/pom.xml
index d96c711776..7f06d6f21f 100644
--- a/sevntu-checks/pom.xml
+++ b/sevntu-checks/pom.xml
@@ -16,7 +16,7 @@
   <properties>
     <project.build.sourceEncoding>iso-8859-1</project.build.sourceEncoding>
     <!-- It is compile dependency to checkstyle, this version has to be the same as eclipse-cs depends on -->
-    <checkstyle.eclipse-cs.version>10.0</checkstyle.eclipse-cs.version>
+    <checkstyle.eclipse-cs.version>10.4</checkstyle.eclipse-cs.version>
     <!-- verify time version -->
     <checkstyle.version>10.4</checkstyle.version>
     <checkstyle.configLocation>https://raw.githubusercontent.com/checkstyle/checkstyle/checkstyle-${checkstyle.version}/config/checkstyle_checks.xml</checkstyle.configLocation>
diff --git a/sevntu-checks/src/main/java/com/github/sevntu/checkstyle/checks/coding/Jsr305AnnotationsCheck.java b/sevntu-checks/src/main/java/com/github/sevntu/checkstyle/checks/coding/Jsr305AnnotationsCheck.java
index 60cec48b64..9013ecfedc 100644
--- a/sevntu-checks/src/main/java/com/github/sevntu/checkstyle/checks/coding/Jsr305AnnotationsCheck.java
+++ b/sevntu-checks/src/main/java/com/github/sevntu/checkstyle/checks/coding/Jsr305AnnotationsCheck.java
@@ -525,7 +525,7 @@ private static Set<NullnessAnnotation> findAnnotations(final DetailAST ast) {
         for (DetailAST child = modifiers.getFirstChild(); child != null; child =
                 child.getNextSibling()) {
             if (child.getType() == TokenTypes.ANNOTATION) {
-                addNextNullnessAnnotation(result, (DetailAST) child);
+                addNextNullnessAnnotation(result, child);
             }
         }
 
diff --git a/sevntu-checkstyle-sonar-plugin/pom.xml b/sevntu-checkstyle-sonar-plugin/pom.xml
index e5cea744bf..38fa5becfb 100644
--- a/sevntu-checkstyle-sonar-plugin/pom.xml
+++ b/sevntu-checkstyle-sonar-plugin/pom.xml
@@ -27,7 +27,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <checkstyle.version>10.4</checkstyle.version>
-    <checkstyle.plugin.version>3.1.2</checkstyle.plugin.version>
+    <checkstyle.plugin.version>3.2.0</checkstyle.plugin.version>
     <sonar.version>7.9</sonar.version>
     <staxmate.version>2.0.1</staxmate.version>
     <java.version>11</java.version>