diff --git a/pom.xml b/pom.xml
index bea537c2f5..2b295473eb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@
     <bouncycastle.version>1.79</bouncycastle.version>
     <build-helper-maven-plugin.version>1.8</build-helper-maven-plugin.version>
     <buildnumber-maven-plugin.version>1.1</buildnumber-maven-plugin.version>
-    <checkstyle.version>8.35</checkstyle.version>
+    <checkstyle.version>13.3.0</checkstyle.version>
     <codehaus.mojo.version>1.3.2</codehaus.mojo.version>
     <commons-cli.version>1.6.0</commons-cli.version>
     <commons-codec.version>1.15</commons-codec.version>
@@ -74,7 +74,7 @@
     <dependency-maven-plugin.version>3.8.1</dependency-maven-plugin.version>
     <spotbugs.version>4.9.3</spotbugs.version>
     <spotbugs-maven-plugin.version>4.9.3.0</spotbugs-maven-plugin.version>
-    <spotbugs.plexus-velocity.version>2.3.0</spotbugs.plexus-velocity.version>
+    <plexus-velocity.version>2.3.0</plexus-velocity.version>
     <frontend-maven-plugin.version>1.15.0</frontend-maven-plugin.version>
     <guava.version>32.0.1-jre</guava.version>
     <hadoop.version>3.4.2</hadoop.version>
@@ -85,7 +85,7 @@
     <junit.version>4.13.2</junit.version>
     <leveldbjni-all.version>1.8</leveldbjni-all.version>
     <lifecycle-mapping.version>1.0.0</lifecycle-mapping.version>
-    <maven-checkstyle-plugin.version>3.1.1</maven-checkstyle-plugin.version>
+    <maven-checkstyle-plugin.version>3.6.0</maven-checkstyle-plugin.version>
     <maven-enforcer-plugin.version>3.0.0</maven-enforcer-plugin.version>
     <maven-project-info-reports-plugin.version>3.1.2</maven-project-info-reports-plugin.version>
     <maven-shade-plugin.version>3.6.0</maven-shade-plugin.version>
@@ -982,6 +982,12 @@
               <artifactId>tez-build-tools</artifactId>
               <version>${project.version}</version>
             </dependency>
+            <!-- Upgraded plexus-velocity is required by checkstyle since TEZ-4691 -->
+            <dependency>
+              <groupId>org.codehaus.plexus</groupId>
+              <artifactId>plexus-velocity</artifactId>
+              <version>${plexus-velocity.version}</version>
+            </dependency>
             <dependency>
               <groupId>com.puppycrawl.tools</groupId>
               <artifactId>checkstyle</artifactId>
@@ -993,8 +999,6 @@
             <suppressionsLocation>checkstyle/suppressions.xml</suppressionsLocation>
             <includeTestSourceDirectory>true</includeTestSourceDirectory>
             <failOnViolation>false</failOnViolation>
-            <format>xml</format>
-            <format>html</format>
             <outputFile>${project.build.directory}/test/checkstyle-errors.xml</outputFile>
           </configuration>
         </plugin>
@@ -1017,7 +1021,7 @@
             <dependency>
               <groupId>org.codehaus.plexus</groupId>
               <artifactId>plexus-velocity</artifactId>
-              <version>${spotbugs.plexus-velocity.version}</version>
+              <version>${plexus-velocity.version}</version>
             </dependency>
           </dependencies>
           <configuration>
diff --git a/tez-dag/src/test/java/org/apache/tez/dag/app/rm/TestLocalTaskScheduler.java b/tez-dag/src/test/java/org/apache/tez/dag/app/rm/TestLocalTaskScheduler.java
index 4602b8e7fc..617cd63282 100644
--- a/tez-dag/src/test/java/org/apache/tez/dag/app/rm/TestLocalTaskScheduler.java
+++ b/tez-dag/src/test/java/org/apache/tez/dag/app/rm/TestLocalTaskScheduler.java
@@ -51,7 +51,7 @@ public void maxTasksAllocationsCannotBeExceeded() {
 
     TaskSchedulerContext
         mockContext = TestTaskSchedulerHelpers.setupMockTaskSchedulerContext("", 0, "", true,
-        appAttemptId, 1000l, null, new Configuration());
+        appAttemptId, 1000L, null, new Configuration());
 
     LocalContainerFactory containerFactory = new LocalContainerFactory(appAttemptId, 1000);
 
diff --git a/tez-dag/src/test/java/org/apache/tez/dag/history/events/TestHistoryEventsProtoConversion.java b/tez-dag/src/test/java/org/apache/tez/dag/history/events/TestHistoryEventsProtoConversion.java
index bb9465cd12..6b64df2097 100644
--- a/tez-dag/src/test/java/org/apache/tez/dag/history/events/TestHistoryEventsProtoConversion.java
+++ b/tez-dag/src/test/java/org/apache/tez/dag/history/events/TestHistoryEventsProtoConversion.java
@@ -747,7 +747,7 @@ private void testVertexGroupCommitFinishedEvent() throws Exception {
     Collection<TezVertexID> vertexIds = Lists.newArrayList(vertexId1, vertexId2);
     VertexGroupCommitFinishedEvent event = new VertexGroupCommitFinishedEvent(
         TezDAGID.getInstance(ApplicationId.newInstance(0, 1), 1),
-        "fooGroup", vertexIds, 1000344l);
+        "fooGroup", vertexIds, 1000344L);
     {
       VertexGroupCommitFinishedEvent deserializedEvent =
           (VertexGroupCommitFinishedEvent) testProtoConversion(event);