diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 3c82ad9f..55193963 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -19,11 +19,11 @@ jobs:
         path: ~/.m2/repository
         key: maven-cache-${{ hashFiles('**/pom.xml') }}
 
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v3
       with:
         distribution: corretto
-        java-version: 17
+        java-version: 21
 
     - name: Build with Maven
       run: mvn -e --no-transfer-progress install
diff --git a/pom.xml b/pom.xml
index bd96bc25..30940f19 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,10 +33,10 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <checkstyle.version>10.4</checkstyle.version>
+    <checkstyle.version>13.3.0</checkstyle.version>
     <maven.checkstyle.plugin.version>3.2.0</maven.checkstyle.plugin.version>
-    <maven.compiler.source>17</maven.compiler.source>
-    <maven.compiler.target>17</maven.compiler.target>
+    <maven.compiler.source>21</maven.compiler.source>
+    <maven.compiler.target>21</maven.compiler.target>
     <junit.version>5.9.1</junit.version>
   </properties>
 
@@ -115,9 +115,7 @@
               <includeResources>false</includeResources>
               <includeTestResources>false</includeTestResources>
               <includeTestSourceDirectory>true</includeTestSourceDirectory>
-              <configLocation>
-                https://raw.githubusercontent.com/checkstyle/checkstyle/checkstyle-${checkstyle.version}/config/checkstyle_checks.xml
-              </configLocation>
+              <configLocation>google_checks.xml</configLocation>
               <propertiesLocation>config/checkstyle.properties</propertiesLocation>
               <failOnViolation>true</failOnViolation>
               <logViolationsToConsole>true</logViolationsToConsole>
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/filters/JavaPatchFilterElement.java b/src/main/java/com/puppycrawl/tools/checkstyle/filters/JavaPatchFilterElement.java
index b3ce06ca..9aa5f3c4 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/filters/JavaPatchFilterElement.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/filters/JavaPatchFilterElement.java
@@ -185,7 +185,7 @@ public boolean accept(TreeWalkerAuditEvent event) {
      * @return true if it is matching
      */
     private boolean isFileNameMatching(TreeWalkerAuditEvent event) {
-        String eventFileName = event.getFileName();
+        String eventFileName = event.fileName();
         boolean result = eventFileName != null;
 
         if (result) {
@@ -225,7 +225,7 @@ private boolean isNeverSuppressCheck(TreeWalkerAuditEvent event) {
      */
     private boolean isLineMatching(TreeWalkerAuditEvent event) {
         boolean result = false;
-        if (event.getViolation() != null) {
+        if (event.violation() != null) {
             result = lineMatching(event.getLine());
         }
         return result;
@@ -337,7 +337,7 @@ private static boolean containsShortName(Set<String> checkNameSet,
     }
 
     private static String getCheckName(TreeWalkerAuditEvent event) {
-        final String[] checkNames = event.getViolation().getSourceName().split("\\.");
+        final String[] checkNames = event.violation().getSourceName().split("\\.");
         return checkNames[checkNames.length - 1];
     }
 
@@ -352,7 +352,7 @@ private static String getCheckShortName(TreeWalkerAuditEvent event) {
      * @return DetailAST event's corresponding ast node
      */
     private static DetailAST getEventAst(TreeWalkerAuditEvent event) {
-        DetailAST curNode = event.getRootAst();
+        DetailAST curNode = event.rootAst();
         DetailAST eventAst = null;
         while (curNode != null) {
             if (isMatchingAst(curNode, event)) {
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionJavaPatchFilterTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionJavaPatchFilterTest.java
index 8df78a8b..db317275 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionJavaPatchFilterTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionJavaPatchFilterTest.java
@@ -34,7 +34,7 @@ protected String getPatchFileLocation() {
     }
 
     @Override
-    protected String getPackageLocation() {
+    public String getPackageLocation() {
         return "com/puppycrawl/tools/checkstyle/filters/suppressionjavapatchfilter/";
     }
 
@@ -55,15 +55,12 @@ public void testShortName() throws Exception {
     public void testNonExistentPatchFileWithFalseOptional() throws Exception {
         try {
             testByConfig("Optional/false/defaultContextConfig.xml");
-        }
-        catch (CheckstyleException ex) {
-            assertEquals("cannot initialize module TreeWalker - "
-                            + "cannot initialize module "
-                            + "com.puppycrawl.tools.checkstyle.filters.SuppressionJavaPatchFilter "
-                            + "- an error occurred when loading patch file "
-                            + getPatchFileLocation() + "Optional/false//defaultContext.patch",
-                            ex.getMessage(),
-                    "Invalid error message");
+        } catch (CheckstyleException ex) {
+            assertEquals(
+            "cannot initialize module TreeWalker - cannot initialize module "
+                    + "com.puppycrawl.tools.checkstyle.filters.SuppressionJavaPatchFilter",
+                    ex.getMessage()
+            );
         }
     }
 
@@ -79,7 +76,7 @@ public void testNeverSuppressedChecks() throws Exception {
         testByConfig("neversuppressedchecks/CovariantEquals/"
                 + "checkID/newline/defaultContextConfig.xml");
         testByConfig("neversuppressedchecks/CovariantEquals"
-                        + "/checkID/patchedline/defaultContextConfig.xml");
+                + "/checkID/patchedline/defaultContextConfig.xml");
         testByConfig("neversuppressedchecks/CovariantEquals/"
                 + "checkShortName/context/defaultContextConfig.xml");
         testByConfig("neversuppressedchecks/CovariantEquals/"
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionPatchFilterTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionPatchFilterTest.java
index 7dc1fa03..69983491 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionPatchFilterTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionPatchFilterTest.java
@@ -30,7 +30,7 @@ protected String getPatchFileLocation() {
     }
 
     @Override
-    protected String getPackageLocation() {
+    public String getPackageLocation() {
         return "com/puppycrawl/tools/checkstyle/filters/suppressionpatchfilter/";
     }
 
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/jgit/GitDiffOnOpenSourceTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/jgit/GitDiffOnOpenSourceTest.java
index ee3190cb..f3f6a9f7 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/jgit/GitDiffOnOpenSourceTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/jgit/GitDiffOnOpenSourceTest.java
@@ -36,7 +36,7 @@
 public class GitDiffOnOpenSourceTest extends AbstractModuleTestSupport {
 
     @Override
-    protected String getPackageLocation() {
+    public String getPackageLocation() {
         return "com/puppycrawl/tools/checkstyle/filters/";
     }
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressionjavapatchfilter/Regexp/context/expected.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressionjavapatchfilter/Regexp/context/expected.txt
index de031c81..a7762e8d 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressionjavapatchfilter/Regexp/context/expected.txt
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressionjavapatchfilter/Regexp/context/expected.txt
@@ -1 +1 @@
-Test.java:0: Required pattern '// This code is copyrighted\n// \(c\) MyCompany' missing in file.
\ No newline at end of file
+Test.java:1: Required pattern '// This code is copyrighted\n// \(c\) MyCompany' missing in file.
\ No newline at end of file
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressionjavapatchfilter/coding/OverloadMethodsDeclarationOrder/context/expected.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressionjavapatchfilter/coding/OverloadMethodsDeclarationOrder/context/expected.txt
index 4ba166b3..6523de9f 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressionjavapatchfilter/coding/OverloadMethodsDeclarationOrder/context/expected.txt
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressionjavapatchfilter/coding/OverloadMethodsDeclarationOrder/context/expected.txt
@@ -1 +1 @@
-Test.java:7:5: All overloaded methods should be placed next to each other. Placing non-overloaded methods in between overloaded methods with the same type is a violation. Previous overloaded method located at line '5'.
\ No newline at end of file
+Test.java:7:5: All overloaded methods should be placed next to each other. Previous overloaded method located at line '5'.
\ No newline at end of file
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressionjavapatchfilter/coding/OverloadMethodsDeclarationOrder/newline/expected.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressionjavapatchfilter/coding/OverloadMethodsDeclarationOrder/newline/expected.txt
index 2b648be0..d0f3e917 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressionjavapatchfilter/coding/OverloadMethodsDeclarationOrder/newline/expected.txt
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressionjavapatchfilter/coding/OverloadMethodsDeclarationOrder/newline/expected.txt
@@ -1 +1 @@
-Test.java:15:5: All overloaded methods should be placed next to each other. Placing non-overloaded methods in between overloaded methods with the same type is a violation. Previous overloaded method located at line '13'.
\ No newline at end of file
+Test.java:15:5: All overloaded methods should be placed next to each other. Previous overloaded method located at line '13'.
\ No newline at end of file
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressionjavapatchfilter/coding/OverloadMethodsDeclarationOrder/patchedline/expected.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressionjavapatchfilter/coding/OverloadMethodsDeclarationOrder/patchedline/expected.txt
index 2b648be0..d0f3e917 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressionjavapatchfilter/coding/OverloadMethodsDeclarationOrder/patchedline/expected.txt
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressionjavapatchfilter/coding/OverloadMethodsDeclarationOrder/patchedline/expected.txt
@@ -1 +1 @@
-Test.java:15:5: All overloaded methods should be placed next to each other. Placing non-overloaded methods in between overloaded methods with the same type is a violation. Previous overloaded method located at line '13'.
\ No newline at end of file
+Test.java:15:5: All overloaded methods should be placed next to each other. Previous overloaded method located at line '13'.
\ No newline at end of file
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressionjavapatchfilter/javadoc/JavadocParagraph/context/expected.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressionjavapatchfilter/javadoc/JavadocParagraph/context/expected.txt
index e418bb8b..70dbcac1 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressionjavapatchfilter/javadoc/JavadocParagraph/context/expected.txt
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressionjavapatchfilter/javadoc/JavadocParagraph/context/expected.txt
@@ -1 +1 @@
-Test.java:7: <p> tag should be preceded with an empty line.
\ No newline at end of file
+Test.java:7:4: <p> tag should be preceded with an empty line.
\ No newline at end of file
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressionjavapatchfilter/javadoc/JavadocParagraph/newline/expected.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressionjavapatchfilter/javadoc/JavadocParagraph/newline/expected.txt
index 5bebc583..9a4b45f5 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressionjavapatchfilter/javadoc/JavadocParagraph/newline/expected.txt
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressionjavapatchfilter/javadoc/JavadocParagraph/newline/expected.txt
@@ -1 +1 @@
-Test.java:8: <p> tag should be preceded with an empty line.
\ No newline at end of file
+Test.java:8:4: <p> tag should be preceded with an empty line.
\ No newline at end of file
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressionjavapatchfilter/javadoc/JavadocParagraph/patchedline/expected.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressionjavapatchfilter/javadoc/JavadocParagraph/patchedline/expected.txt
index 5bebc583..9a4b45f5 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressionjavapatchfilter/javadoc/JavadocParagraph/patchedline/expected.txt
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressionjavapatchfilter/javadoc/JavadocParagraph/patchedline/expected.txt
@@ -1 +1 @@
-Test.java:8: <p> tag should be preceded with an empty line.
\ No newline at end of file
+Test.java:8:4: <p> tag should be preceded with an empty line.
\ No newline at end of file
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressionjavapatchfilter/javadoc/SummaryJavadocCheck/context/expected.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressionjavapatchfilter/javadoc/SummaryJavadocCheck/context/expected.txt
index 8b972476..383ddc18 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressionjavapatchfilter/javadoc/SummaryJavadocCheck/context/expected.txt
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressionjavapatchfilter/javadoc/SummaryJavadocCheck/context/expected.txt
@@ -1 +1 @@
-Test.java:4: Summary javadoc is missing.
\ No newline at end of file
+Test.java:4:8: Summary javadoc is missing.
\ No newline at end of file
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressionjavapatchfilter/javadoc/SummaryJavadocCheck/newline/expected.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressionjavapatchfilter/javadoc/SummaryJavadocCheck/newline/expected.txt
index 532db954..dec63543 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressionjavapatchfilter/javadoc/SummaryJavadocCheck/newline/expected.txt
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressionjavapatchfilter/javadoc/SummaryJavadocCheck/newline/expected.txt
@@ -1 +1 @@
-Test.java:9: Summary javadoc is missing.
\ No newline at end of file
+Test.java:9:8: Summary javadoc is missing.
\ No newline at end of file
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressionjavapatchfilter/javadoc/SummaryJavadocCheck/patchedline/expected.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressionjavapatchfilter/javadoc/SummaryJavadocCheck/patchedline/expected.txt
index 8b972476..383ddc18 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressionjavapatchfilter/javadoc/SummaryJavadocCheck/patchedline/expected.txt
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressionjavapatchfilter/javadoc/SummaryJavadocCheck/patchedline/expected.txt
@@ -1 +1 @@
-Test.java:4: Summary javadoc is missing.
\ No newline at end of file
+Test.java:4:8: Summary javadoc is missing.
\ No newline at end of file