diff --git a/javav2/example_code/apigateway/pom.xml b/javav2/example_code/apigateway/pom.xml
index 84298bf6f2b..b18c9a5c197 100644
--- a/javav2/example_code/apigateway/pom.xml
+++ b/javav2/example_code/apigateway/pom.xml
@@ -3,15 +3,13 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-
     <groupId>ApiGatewayV2</groupId>
     <artifactId>ApiGatewayV2</artifactId>
     <version>1.0-SNAPSHOT</version>
     <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <java.version>1.8</java.version>
+        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
     </properties>
-
     <build>
         <plugins>
             <plugin>
@@ -23,6 +21,21 @@
                     <target>${java.version}</target>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <version>3.1.2</version>
+                <configuration>
+                    <configLocation>src/main/resources/checkstyle.xml</configLocation>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
     <dependencyManagement>
@@ -30,7 +43,7 @@
             <dependency>
                 <groupId>software.amazon.awssdk</groupId>
                 <artifactId>bom</artifactId>
-                <version>2.19.14</version>
+                <version>2.21.16</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/javav2/example_code/apigateway/src/main/resources/checkstyle.xml b/javav2/example_code/apigateway/src/main/resources/checkstyle.xml
new file mode 100644
index 00000000000..3f5f94269cb
--- /dev/null
+++ b/javav2/example_code/apigateway/src/main/resources/checkstyle.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!DOCTYPE module PUBLIC
+        "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+        "http://checkstyle.sourceforge.net/dtds/configuration_1_3.dtd">
+
+<module name="Checker">
+  <module name="FileTabCharacter">
+    <property name="eachLine" value="true"/>
+  </module>
+  <module name="TreeWalker">
+    <module name="AvoidStarImport"/>
+    <module name="EmptyStatement"/>
+    <module name="IllegalCatch"/>
+  </module>
+</module>
\ No newline at end of file
diff --git a/javav2/example_code/appsync/pom.xml b/javav2/example_code/appsync/pom.xml
index 8c674c79637..c536c1fe6d3 100644
--- a/javav2/example_code/appsync/pom.xml
+++ b/javav2/example_code/appsync/pom.xml
@@ -7,8 +7,8 @@
     <artifactId>AppSyncJ2</artifactId>
     <version>1.0-SNAPSHOT</version>
     <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <java.version>1.8</java.version>
+        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
     </properties>
     <build>
         <plugins>
@@ -29,6 +29,21 @@
                     <target>${java.version}</target>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <version>3.1.2</version>
+                <configuration>
+                    <configLocation>src/main/resources/checkstyle.xml</configLocation>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
     <dependencyManagement>
@@ -36,7 +51,7 @@
             <dependency>
                 <groupId>software.amazon.awssdk</groupId>
                 <artifactId>bom</artifactId>
-                <version>2.20.45</version>
+                <version>2.21.16</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/javav2/example_code/appsync/src/main/resources/checkstyle.xml b/javav2/example_code/appsync/src/main/resources/checkstyle.xml
new file mode 100644
index 00000000000..3f5f94269cb
--- /dev/null
+++ b/javav2/example_code/appsync/src/main/resources/checkstyle.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!DOCTYPE module PUBLIC
+        "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+        "http://checkstyle.sourceforge.net/dtds/configuration_1_3.dtd">
+
+<module name="Checker">
+  <module name="FileTabCharacter">
+    <property name="eachLine" value="true"/>
+  </module>
+  <module name="TreeWalker">
+    <module name="AvoidStarImport"/>
+    <module name="EmptyStatement"/>
+    <module name="IllegalCatch"/>
+  </module>
+</module>
\ No newline at end of file
diff --git a/javav2/example_code/athena/pom.xml b/javav2/example_code/athena/pom.xml
index 7697bff9ae4..f2014ba0198 100644
--- a/javav2/example_code/athena/pom.xml
+++ b/javav2/example_code/athena/pom.xml
@@ -7,8 +7,8 @@
     <artifactId>athenaJ2Example</artifactId>
     <version>1.0-SNAPSHOT</version>
     <properties>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
     </properties>
     <build>
         <plugins>
@@ -17,6 +17,21 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>2.22.1</version>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <version>3.1.2</version>
+                <configuration>
+                    <configLocation>src/main/resources/checkstyle.xml</configLocation>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
     <dependencyManagement>
@@ -24,7 +39,7 @@
             <dependency>
                 <groupId>software.amazon.awssdk</groupId>
                 <artifactId>bom</artifactId>
-                <version>2.20.25</version>
+                <version>2.21.16</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/javav2/example_code/athena/src/main/resources/checkstyle.xml b/javav2/example_code/athena/src/main/resources/checkstyle.xml
new file mode 100644
index 00000000000..3f5f94269cb
--- /dev/null
+++ b/javav2/example_code/athena/src/main/resources/checkstyle.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!DOCTYPE module PUBLIC
+        "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+        "http://checkstyle.sourceforge.net/dtds/configuration_1_3.dtd">
+
+<module name="Checker">
+  <module name="FileTabCharacter">
+    <property name="eachLine" value="true"/>
+  </module>
+  <module name="TreeWalker">
+    <module name="AvoidStarImport"/>
+    <module name="EmptyStatement"/>
+    <module name="IllegalCatch"/>
+  </module>
+</module>
\ No newline at end of file
diff --git a/javav2/example_code/autoscale/pom.xml b/javav2/example_code/autoscale/pom.xml
index 8d467460404..ae6ffa21c8a 100644
--- a/javav2/example_code/autoscale/pom.xml
+++ b/javav2/example_code/autoscale/pom.xml
@@ -7,8 +7,8 @@
     <artifactId>AutoScalingV2</artifactId>
     <version>1.0-SNAPSHOT</version>
     <properties>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
     </properties>
     <build>
         <plugins>
@@ -17,6 +17,21 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>2.22.1</version>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <version>3.1.2</version>
+                <configuration>
+                    <configLocation>src/main/resources/checkstyle.xml</configLocation>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
     <dependencyManagement>
@@ -24,7 +39,7 @@
             <dependency>
                 <groupId>software.amazon.awssdk</groupId>
                 <artifactId>bom</artifactId>
-                <version>2.20.25</version>
+                <version>2.21.16</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/javav2/example_code/autoscale/src/main/resources/checkstyle.xml b/javav2/example_code/autoscale/src/main/resources/checkstyle.xml
new file mode 100644
index 00000000000..3f5f94269cb
--- /dev/null
+++ b/javav2/example_code/autoscale/src/main/resources/checkstyle.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!DOCTYPE module PUBLIC
+        "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+        "http://checkstyle.sourceforge.net/dtds/configuration_1_3.dtd">
+
+<module name="Checker">
+  <module name="FileTabCharacter">
+    <property name="eachLine" value="true"/>
+  </module>
+  <module name="TreeWalker">
+    <module name="AvoidStarImport"/>
+    <module name="EmptyStatement"/>
+    <module name="IllegalCatch"/>
+  </module>
+</module>
\ No newline at end of file
diff --git a/javav2/example_code/cloudformation/pom.xml b/javav2/example_code/cloudformation/pom.xml
index b86b27d7879..db8bba3259a 100644
--- a/javav2/example_code/cloudformation/pom.xml
+++ b/javav2/example_code/cloudformation/pom.xml
@@ -7,8 +7,8 @@
     <artifactId>CloudFormationV2</artifactId>
     <version>1.0-SNAPSHOT</version>
     <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <java.version>1.8</java.version>
+        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
     </properties>
     <build>
         <plugins>
@@ -29,6 +29,21 @@
                     <groups>IntegrationTest</groups>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <version>3.1.2</version>
+                <configuration>
+                    <configLocation>src/main/resources/checkstyle.xml</configLocation>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
     <dependencyManagement>
@@ -36,7 +51,7 @@
             <dependency>
                 <groupId>software.amazon.awssdk</groupId>
                 <artifactId>bom</artifactId>
-                <version>2.20.45</version>
+                <version>2.21.16</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/javav2/example_code/cloudformation/src/main/java/com/example/cloudformation/CreateStack.java b/javav2/example_code/cloudformation/src/main/java/com/example/cloudformation/CreateStack.java
index 045132bb67f..1c602e66e5c 100644
--- a/javav2/example_code/cloudformation/src/main/java/com/example/cloudformation/CreateStack.java
+++ b/javav2/example_code/cloudformation/src/main/java/com/example/cloudformation/CreateStack.java
@@ -85,7 +85,6 @@ public static void createCFStack(CloudFormationClient cfClient,
                                     String value){
 
        try {
-           CloudFormationWaiter waiter = cfClient.waiter();
            Parameter myParameter = Parameter.builder()
                .parameterKey(key)
                .parameterValue(value)
@@ -100,12 +99,6 @@ public static void createCFStack(CloudFormationClient cfClient,
                .build();
 
            cfClient.createStack(stackRequest);
-           DescribeStacksRequest stacksRequest = DescribeStacksRequest.builder()
-               .stackName(stackName)
-               .build();
-
-           WaiterResponse<DescribeStacksResponse> waiterResponse = waiter.waitUntilStackCreateComplete(stacksRequest);
-           waiterResponse.matched().response().ifPresent(System.out::println);
            System.out.println(stackName +" is ready");
 
        } catch (CloudFormationException e) {
diff --git a/javav2/example_code/cloudformation/src/main/resources/checkstyle.xml b/javav2/example_code/cloudformation/src/main/resources/checkstyle.xml
new file mode 100644
index 00000000000..3f5f94269cb
--- /dev/null
+++ b/javav2/example_code/cloudformation/src/main/resources/checkstyle.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!DOCTYPE module PUBLIC
+        "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+        "http://checkstyle.sourceforge.net/dtds/configuration_1_3.dtd">
+
+<module name="Checker">
+  <module name="FileTabCharacter">
+    <property name="eachLine" value="true"/>
+  </module>
+  <module name="TreeWalker">
+    <module name="AvoidStarImport"/>
+    <module name="EmptyStatement"/>
+    <module name="IllegalCatch"/>
+  </module>
+</module>
\ No newline at end of file
diff --git a/javav2/example_code/cloudfront/checkstyle.xml b/javav2/example_code/cloudfront/checkstyle.xml
deleted file mode 100644
index 8e0601fd3d4..00000000000
--- a/javav2/example_code/cloudfront/checkstyle.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" ?>
-
-<!DOCTYPE module PUBLIC
-        "-//Checkstyle//DTD Checkstyle Configuration 1.2//EN"
-        "https://checkstyle.org/dtds/configuration_1_2.dtd">
-
-<module name="Checker">
-    <module name="TreeWalker">
-
-        <module name="IllegalCatch"/>
-        <module name="EmptyStatement"/>
-        <module name="AvoidStarImport"/>
-        <module name="UnusedImports"/>
-        <module name="ParameterAssignment"/>
-        <module name="LocalVariableName"/>
-        <module name="NoLineWrap"/>
-        <module name="SingleSpaceSeparator"/>
-        <module name="MethodName"/>
-        <module name="MemberName"/>
-        <module name="LocalVariableName"/>
-        <module name="LeftCurly"/>
-        <module name="RightCurly"/>
-        <module name="DeclarationOrder"/>
-    </module>
-</module>
\ No newline at end of file
diff --git a/javav2/example_code/cloudfront/pom.xml b/javav2/example_code/cloudfront/pom.xml
index 87d56cf702d..06be606fd0f 100644
--- a/javav2/example_code/cloudfront/pom.xml
+++ b/javav2/example_code/cloudfront/pom.xml
@@ -7,8 +7,8 @@
     <artifactId>CloudFrontJ2</artifactId>
     <version>1.0-SNAPSHOT</version>
     <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <java.version>1.8</java.version>
+        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
     </properties>
     <build>
         <plugins>
@@ -29,6 +29,21 @@
                     <groups>IntegrationTest</groups>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <version>3.1.2</version> <!-- Replace with the latest version -->
+                <configuration>
+                    <configLocation>src/main/resources/checkstyle.xml</configLocation>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
     <dependencyManagement>
@@ -36,7 +51,7 @@
             <dependency>
                 <groupId>software.amazon.awssdk</groupId>
                 <artifactId>bom</artifactId>
-                <version>2.20.25</version>
+                <version>2.21.16</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -69,6 +84,15 @@
             <artifactId>junit-platform-commons</artifactId>
             <version>1.9.2</version>
         </dependency>
+        <dependency>
+            <groupId>com.googlecode.json-simple</groupId>
+            <artifactId>json-simple</artifactId>
+            <version>1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>s3</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.junit.platform</groupId>
             <artifactId>junit-platform-launcher</artifactId>
diff --git a/javav2/example_code/cloudfront/src/main/resources/checkstyle.xml b/javav2/example_code/cloudfront/src/main/resources/checkstyle.xml
new file mode 100644
index 00000000000..3f5f94269cb
--- /dev/null
+++ b/javav2/example_code/cloudfront/src/main/resources/checkstyle.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!DOCTYPE module PUBLIC
+        "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+        "http://checkstyle.sourceforge.net/dtds/configuration_1_3.dtd">
+
+<module name="Checker">
+  <module name="FileTabCharacter">
+    <property name="eachLine" value="true"/>
+  </module>
+  <module name="TreeWalker">
+    <module name="AvoidStarImport"/>
+    <module name="EmptyStatement"/>
+    <module name="IllegalCatch"/>
+  </module>
+</module>
\ No newline at end of file
diff --git a/javav2/example_code/cloudfront/src/test/java/CloudFrontTest.java b/javav2/example_code/cloudfront/src/test/java/CloudFrontTest.java
index dff2c7eeb51..126cd476880 100644
--- a/javav2/example_code/cloudfront/src/test/java/CloudFrontTest.java
+++ b/javav2/example_code/cloudfront/src/test/java/CloudFrontTest.java
@@ -80,7 +80,7 @@ public void CreateFunction() {
     @Tag("IntegrationTest")
     @Order(2)
     public void DescribeFunction() {
-        eTagVal = DescribeFunction.describeSinFunction(cloudFrontClient, functionName);
+        eTagVal = DescribeFunction.describeFunction(cloudFrontClient, functionName);
         assertFalse(eTagVal.isEmpty());
         System.out.println("Test 2 passed");
     }
@@ -97,7 +97,7 @@ public void ListFunctions(){
     @Tag("IntegrationTest")
     @Order(4)
    public void GetDistrubutions() {
-        assertDoesNotThrow(() ->GetDistrubutions.getCFDistrubutions(cloudFrontClient));
+        assertDoesNotThrow(() ->GetDistributions.getCFDistributions(cloudFrontClient));
         System.out.println("Test 4 passed");
    }
 
diff --git a/javav2/example_code/cloudtrail/pom.xml b/javav2/example_code/cloudtrail/pom.xml
index dc573eaccd0..00d599483e1 100644
--- a/javav2/example_code/cloudtrail/pom.xml
+++ b/javav2/example_code/cloudtrail/pom.xml
@@ -7,8 +7,8 @@
     <artifactId>CloudTrailJ2</artifactId>
     <version>1.0-SNAPSHOT</version>
     <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <java.version>1.8</java.version>
+        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
     </properties>
     <build>
         <plugins>
@@ -29,6 +29,21 @@
                     <groups>IntegrationTest</groups>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <version>3.1.2</version>
+                <configuration>
+                    <configLocation>src/main/resources/checkstyle.xml</configLocation>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
     <dependencyManagement>
@@ -36,7 +51,7 @@
             <dependency>
                 <groupId>software.amazon.awssdk</groupId>
                 <artifactId>bom</artifactId>
-                <version>2.20.25</version>
+                <version>2.21.16</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/javav2/example_code/cloudtrail/src/main/resources/checkstyle.xml b/javav2/example_code/cloudtrail/src/main/resources/checkstyle.xml
new file mode 100644
index 00000000000..3f5f94269cb
--- /dev/null
+++ b/javav2/example_code/cloudtrail/src/main/resources/checkstyle.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!DOCTYPE module PUBLIC
+        "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+        "http://checkstyle.sourceforge.net/dtds/configuration_1_3.dtd">
+
+<module name="Checker">
+  <module name="FileTabCharacter">
+    <property name="eachLine" value="true"/>
+  </module>
+  <module name="TreeWalker">
+    <module name="AvoidStarImport"/>
+    <module name="EmptyStatement"/>
+    <module name="IllegalCatch"/>
+  </module>
+</module>
\ No newline at end of file
diff --git a/javav2/example_code/cloudwatch/pom.xml b/javav2/example_code/cloudwatch/pom.xml
index 5b062bb2e4d..9ba0b74b7c1 100755
--- a/javav2/example_code/cloudwatch/pom.xml
+++ b/javav2/example_code/cloudwatch/pom.xml
@@ -7,8 +7,8 @@
     <artifactId>CloudwatchJ2Project</artifactId>
     <version>1.0-SNAPSHOT</version>
     <properties>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
     </properties>
     <build>
         <plugins>
@@ -20,6 +20,21 @@
                     <groups>IntegrationTest</groups>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <version>3.1.2</version>
+                <configuration>
+                    <configLocation>src/main/resources/checkstyle.xml</configLocation>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
          </plugins>
     </build>
     <dependencyManagement>
@@ -27,7 +42,7 @@
             <dependency>
                 <groupId>software.amazon.awssdk</groupId>
                 <artifactId>bom</artifactId>
-                <version>2.20.25</version>
+                <version>2.21.16</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/javav2/example_code/cloudwatch/src/main/resources/checkstyle.xml b/javav2/example_code/cloudwatch/src/main/resources/checkstyle.xml
new file mode 100644
index 00000000000..3f5f94269cb
--- /dev/null
+++ b/javav2/example_code/cloudwatch/src/main/resources/checkstyle.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!DOCTYPE module PUBLIC
+        "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+        "http://checkstyle.sourceforge.net/dtds/configuration_1_3.dtd">
+
+<module name="Checker">
+  <module name="FileTabCharacter">
+    <property name="eachLine" value="true"/>
+  </module>
+  <module name="TreeWalker">
+    <module name="AvoidStarImport"/>
+    <module name="EmptyStatement"/>
+    <module name="IllegalCatch"/>
+  </module>
+</module>
\ No newline at end of file
diff --git a/javav2/example_code/codecommit/pom.xml b/javav2/example_code/codecommit/pom.xml
index 0168cb854ec..e735aeac0b3 100644
--- a/javav2/example_code/codecommit/pom.xml
+++ b/javav2/example_code/codecommit/pom.xml
@@ -7,8 +7,8 @@
     <artifactId>CodeCommitJ2</artifactId>
     <version>1.0-SNAPSHOT</version>
     <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <java.version>1.8</java.version>
+        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
     </properties>
     <build>
         <plugins>
@@ -26,6 +26,21 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>2.22.1</version>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <version>3.1.2</version>
+                <configuration>
+                    <configLocation>src/main/resources/checkstyle.xml</configLocation>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
     <dependencyManagement>
@@ -33,7 +48,7 @@
             <dependency>
                 <groupId>software.amazon.awssdk</groupId>
                 <artifactId>bom</artifactId>
-                <version>2.19.14</version>
+                <version>2.21.16</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/javav2/example_code/codecommit/src/main/resources/checkstyle.xml b/javav2/example_code/codecommit/src/main/resources/checkstyle.xml
new file mode 100644
index 00000000000..3f5f94269cb
--- /dev/null
+++ b/javav2/example_code/codecommit/src/main/resources/checkstyle.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!DOCTYPE module PUBLIC
+        "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+        "http://checkstyle.sourceforge.net/dtds/configuration_1_3.dtd">
+
+<module name="Checker">
+  <module name="FileTabCharacter">
+    <property name="eachLine" value="true"/>
+  </module>
+  <module name="TreeWalker">
+    <module name="AvoidStarImport"/>
+    <module name="EmptyStatement"/>
+    <module name="IllegalCatch"/>
+  </module>
+</module>
\ No newline at end of file
diff --git a/javav2/example_code/codedeploy/pom.xml b/javav2/example_code/codedeploy/pom.xml
index b5ded68ac9d..c54e4bcf779 100644
--- a/javav2/example_code/codedeploy/pom.xml
+++ b/javav2/example_code/codedeploy/pom.xml
@@ -7,8 +7,8 @@
     <artifactId>CodeDeployJ2</artifactId>
     <version>1.0-SNAPSHOT</version>
     <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <java.version>1.8</java.version>
+        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
     </properties>
     <build>
         <plugins>
@@ -29,6 +29,21 @@
                     <groups>IntegrationTest</groups>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <version>3.1.2</version>
+                <configuration>
+                    <configLocation>src/main/resources/checkstyle.xml</configLocation>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
     <dependencyManagement>
@@ -36,7 +51,7 @@
             <dependency>
                 <groupId>software.amazon.awssdk</groupId>
                 <artifactId>bom</artifactId>
-                <version>2.20.25</version>
+                <version>2.21.16</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/javav2/example_code/codedeploy/src/main/resources/checkstyle.xml b/javav2/example_code/codedeploy/src/main/resources/checkstyle.xml
new file mode 100644
index 00000000000..3f5f94269cb
--- /dev/null
+++ b/javav2/example_code/codedeploy/src/main/resources/checkstyle.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!DOCTYPE module PUBLIC
+        "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+        "http://checkstyle.sourceforge.net/dtds/configuration_1_3.dtd">
+
+<module name="Checker">
+  <module name="FileTabCharacter">
+    <property name="eachLine" value="true"/>
+  </module>
+  <module name="TreeWalker">
+    <module name="AvoidStarImport"/>
+    <module name="EmptyStatement"/>
+    <module name="IllegalCatch"/>
+  </module>
+</module>
\ No newline at end of file
diff --git a/javav2/example_code/codepipeline/pom.xml b/javav2/example_code/codepipeline/pom.xml
index c2f743d8b3b..e32ec9e8745 100644
--- a/javav2/example_code/codepipeline/pom.xml
+++ b/javav2/example_code/codepipeline/pom.xml
@@ -3,16 +3,13 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-
     <groupId>org.example</groupId>
     <artifactId>CodePipelineV2</artifactId>
     <version>1.0-SNAPSHOT</version>
-
     <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <java.version>1.8</java.version>
+        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
     </properties>
-
     <build>
         <plugins>
             <plugin>
@@ -29,6 +26,21 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>2.22.1</version>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <version>3.1.2</version>
+                <configuration>
+                    <configLocation>src/main/resources/checkstyle.xml</configLocation>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
     <dependencyManagement>
@@ -36,7 +48,7 @@
             <dependency>
                 <groupId>software.amazon.awssdk</groupId>
                 <artifactId>bom</artifactId>
-                <version>2.20.25</version>
+                <version>2.21.16</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/javav2/example_code/codepipeline/src/main/resources/checkstyle.xml b/javav2/example_code/codepipeline/src/main/resources/checkstyle.xml
new file mode 100644
index 00000000000..3f5f94269cb
--- /dev/null
+++ b/javav2/example_code/codepipeline/src/main/resources/checkstyle.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!DOCTYPE module PUBLIC
+        "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+        "http://checkstyle.sourceforge.net/dtds/configuration_1_3.dtd">
+
+<module name="Checker">
+  <module name="FileTabCharacter">
+    <property name="eachLine" value="true"/>
+  </module>
+  <module name="TreeWalker">
+    <module name="AvoidStarImport"/>
+    <module name="EmptyStatement"/>
+    <module name="IllegalCatch"/>
+  </module>
+</module>
\ No newline at end of file
diff --git a/javav2/example_code/cognito/pom.xml b/javav2/example_code/cognito/pom.xml
index 26c30e615b2..7dc7c77ddcd 100644
--- a/javav2/example_code/cognito/pom.xml
+++ b/javav2/example_code/cognito/pom.xml
@@ -7,8 +7,8 @@
     <artifactId>cognitoJ2Example</artifactId>
     <version>1.0-SNAPSHOT</version>
     <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <java.version>1.8</java.version>
+        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
     </properties>
     <build>
         <plugins>
@@ -29,6 +29,21 @@
                     <groups>IntegrationTest</groups>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <version>3.1.2</version>
+                <configuration>
+                    <configLocation>src/main/resources/checkstyle.xml</configLocation>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
     <dependencyManagement>
@@ -36,7 +51,7 @@
             <dependency>
                 <groupId>software.amazon.awssdk</groupId>
                 <artifactId>bom</artifactId>
-                <version>2.20.25</version>
+                <version>2.21.16</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/javav2/example_code/cognito/src/main/resources/checkstyle.xml b/javav2/example_code/cognito/src/main/resources/checkstyle.xml
new file mode 100644
index 00000000000..3f5f94269cb
--- /dev/null
+++ b/javav2/example_code/cognito/src/main/resources/checkstyle.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!DOCTYPE module PUBLIC
+        "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+        "http://checkstyle.sourceforge.net/dtds/configuration_1_3.dtd">
+
+<module name="Checker">
+  <module name="FileTabCharacter">
+    <property name="eachLine" value="true"/>
+  </module>
+  <module name="TreeWalker">
+    <module name="AvoidStarImport"/>
+    <module name="EmptyStatement"/>
+    <module name="IllegalCatch"/>
+  </module>
+</module>
\ No newline at end of file