diff --git a/pom.xml b/pom.xml
index 0ca364e1..8e282af9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <awssdk.version>2.10.49</awssdk.version>
-        <checkstyle.version>8.18</checkstyle.version>
+        <checkstyle.version>8.29</checkstyle.version>
         <commons-io.version>2.6</commons-io.version>
         <jackson.version>2.10.1</jackson.version>
         <maven-checkstyle-plugin.version>3.1.0</maven-checkstyle-plugin.version>
@@ -211,7 +211,6 @@
         </dependency>
     </dependencies>
     <pluginRepositories>
-        <!-- Supports software.amazon.awssdk:build-tools -->
         <pluginRepository>
             <id>jitpack.io</id>
             <url>https://jitpack.io</url>
@@ -226,6 +225,11 @@
                 <version>${spotless.version}</version>
                 <configuration>
                     <java>
+                        <!-- this automatically inserts line breaks, so apply it before eclipse formatter! -->
+                        <importOrder>
+                            <order>com,java,javax,org,software</order>
+                        </importOrder>
+                        <removeUnusedImports/>
                         <eclipse>
                             <!-- This formatter covers alot of linting, but not 100% of what checkstyle will enforce -->
                             <file>${basedir}/src/main/resources/com/amazonaws/cloudformation/eclipse-java-formatter.xml</file>
@@ -234,10 +238,6 @@
                         <licenseHeader>
                             <file>licenseHeader</file>
                         </licenseHeader>
-                        <removeUnusedImports/>
-                        <importOrder>
-                            <order>com,java,javax,org,software</order>
-                        </importOrder>
                     </java>
                 </configuration>
                 <executions>
@@ -342,11 +342,6 @@
                         <artifactId>checkstyle</artifactId>
                         <version>${checkstyle.version}</version>
                     </dependency>
-                    <dependency>
-                        <groupId>com.github.aws.aws-sdk-java-v2</groupId>
-                        <artifactId>build-tools</artifactId>
-                        <version>2.10.18</version>
-                    </dependency>
                 </dependencies>
                 <executions>
                     <execution>
diff --git a/src/main/java/software/amazon/cloudformation/LambdaWrapper.java b/src/main/java/software/amazon/cloudformation/LambdaWrapper.java
index 1211c013..2a51e994 100644
--- a/src/main/java/software/amazon/cloudformation/LambdaWrapper.java
+++ b/src/main/java/software/amazon/cloudformation/LambdaWrapper.java
@@ -15,7 +15,6 @@
 package software.amazon.cloudformation;
 
 import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly;
-
 import com.amazonaws.AmazonServiceException;
 import com.amazonaws.services.lambda.runtime.Context;
 import com.amazonaws.services.lambda.runtime.LambdaLogger;
@@ -23,7 +22,6 @@
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException;
 import com.google.common.annotations.VisibleForTesting;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -36,14 +34,12 @@
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
-
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.json.JSONObject;
 import org.json.JSONTokener;
-
 import software.amazon.awssdk.http.SdkHttpClient;
 import software.amazon.awssdk.http.apache.ApacheHttpClient;
 import software.amazon.awssdk.utils.StringUtils;
diff --git a/src/main/java/software/amazon/cloudformation/Response.java b/src/main/java/software/amazon/cloudformation/Response.java
index a1997af7..9b6a6ac6 100644
--- a/src/main/java/software/amazon/cloudformation/Response.java
+++ b/src/main/java/software/amazon/cloudformation/Response.java
@@ -15,9 +15,7 @@
 package software.amazon.cloudformation;
 
 import java.util.List;
-
 import lombok.Data;
-
 import software.amazon.cloudformation.proxy.HandlerErrorCode;
 import software.amazon.cloudformation.proxy.OperationStatus;
 
diff --git a/src/main/java/software/amazon/cloudformation/exceptions/BaseHandlerException.java b/src/main/java/software/amazon/cloudformation/exceptions/BaseHandlerException.java
index 08c17d42..e8d156fe 100644
--- a/src/main/java/software/amazon/cloudformation/exceptions/BaseHandlerException.java
+++ b/src/main/java/software/amazon/cloudformation/exceptions/BaseHandlerException.java
@@ -15,7 +15,6 @@
 package software.amazon.cloudformation.exceptions;
 
 import lombok.Getter;
-
 import software.amazon.cloudformation.proxy.HandlerErrorCode;
 
 @Getter
diff --git a/src/main/java/software/amazon/cloudformation/injection/CloudFormationProvider.java b/src/main/java/software/amazon/cloudformation/injection/CloudFormationProvider.java
index 4f775602..dc98dfad 100644
--- a/src/main/java/software/amazon/cloudformation/injection/CloudFormationProvider.java
+++ b/src/main/java/software/amazon/cloudformation/injection/CloudFormationProvider.java
@@ -15,7 +15,6 @@
 package software.amazon.cloudformation.injection;
 
 import java.net.URI;
-
 import software.amazon.awssdk.http.SdkHttpClient;
 import software.amazon.awssdk.services.cloudformation.CloudFormationClient;
 
diff --git a/src/main/java/software/amazon/cloudformation/loggers/CloudWatchLogHelper.java b/src/main/java/software/amazon/cloudformation/loggers/CloudWatchLogHelper.java
index d9a39922..8e59442e 100644
--- a/src/main/java/software/amazon/cloudformation/loggers/CloudWatchLogHelper.java
+++ b/src/main/java/software/amazon/cloudformation/loggers/CloudWatchLogHelper.java
@@ -15,10 +15,8 @@
 package software.amazon.cloudformation.loggers;
 
 import com.amazonaws.services.lambda.runtime.LambdaLogger;
-
 import java.time.Instant;
 import java.util.UUID;
-
 import software.amazon.awssdk.services.cloudwatchlogs.CloudWatchLogsClient;
 import software.amazon.awssdk.services.cloudwatchlogs.model.CreateLogGroupRequest;
 import software.amazon.awssdk.services.cloudwatchlogs.model.CreateLogStreamRequest;
diff --git a/src/main/java/software/amazon/cloudformation/loggers/CloudWatchLogPublisher.java b/src/main/java/software/amazon/cloudformation/loggers/CloudWatchLogPublisher.java
index 75ca8e45..390c152c 100644
--- a/src/main/java/software/amazon/cloudformation/loggers/CloudWatchLogPublisher.java
+++ b/src/main/java/software/amazon/cloudformation/loggers/CloudWatchLogPublisher.java
@@ -15,10 +15,8 @@
 package software.amazon.cloudformation.loggers;
 
 import com.amazonaws.services.lambda.runtime.LambdaLogger;
-
 import java.time.Instant;
 import java.util.Date;
-
 import software.amazon.awssdk.services.cloudwatchlogs.CloudWatchLogsClient;
 import software.amazon.awssdk.services.cloudwatchlogs.model.InputLogEvent;
 import software.amazon.awssdk.services.cloudwatchlogs.model.PutLogEventsRequest;
diff --git a/src/main/java/software/amazon/cloudformation/metrics/MetricsPublisher.java b/src/main/java/software/amazon/cloudformation/metrics/MetricsPublisher.java
index 32b2910c..9043c222 100644
--- a/src/main/java/software/amazon/cloudformation/metrics/MetricsPublisher.java
+++ b/src/main/java/software/amazon/cloudformation/metrics/MetricsPublisher.java
@@ -15,7 +15,6 @@
 package software.amazon.cloudformation.metrics;
 
 import java.time.Instant;
-
 import software.amazon.cloudformation.Action;
 import software.amazon.cloudformation.proxy.HandlerErrorCode;
 
diff --git a/src/main/java/software/amazon/cloudformation/metrics/MetricsPublisherImpl.java b/src/main/java/software/amazon/cloudformation/metrics/MetricsPublisherImpl.java
index 94342be3..a44a525c 100644
--- a/src/main/java/software/amazon/cloudformation/metrics/MetricsPublisherImpl.java
+++ b/src/main/java/software/amazon/cloudformation/metrics/MetricsPublisherImpl.java
@@ -19,7 +19,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import software.amazon.awssdk.services.cloudwatch.CloudWatchClient;
 import software.amazon.awssdk.services.cloudwatch.model.Dimension;
 import software.amazon.awssdk.services.cloudwatch.model.MetricDatum;
diff --git a/src/main/java/software/amazon/cloudformation/proxy/AmazonWebServicesClientProxy.java b/src/main/java/software/amazon/cloudformation/proxy/AmazonWebServicesClientProxy.java
index 3c4c8db4..2a3aae5b 100644
--- a/src/main/java/software/amazon/cloudformation/proxy/AmazonWebServicesClientProxy.java
+++ b/src/main/java/software/amazon/cloudformation/proxy/AmazonWebServicesClientProxy.java
@@ -22,7 +22,6 @@
 import com.amazonaws.auth.BasicSessionCredentials;
 import com.google.common.base.Preconditions;
 import com.google.common.util.concurrent.Uninterruptibles;
-
 import java.time.Duration;
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
@@ -31,9 +30,7 @@
 import java.util.function.BiFunction;
 import java.util.function.Function;
 import java.util.function.Supplier;
-
 import javax.annotation.Nonnull;
-
 import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
 import software.amazon.awssdk.auth.credentials.AwsSessionCredentials;
 import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
diff --git a/src/main/java/software/amazon/cloudformation/proxy/CloudFormationCallbackAdapter.java b/src/main/java/software/amazon/cloudformation/proxy/CloudFormationCallbackAdapter.java
index 63355a43..0c1a7b61 100644
--- a/src/main/java/software/amazon/cloudformation/proxy/CloudFormationCallbackAdapter.java
+++ b/src/main/java/software/amazon/cloudformation/proxy/CloudFormationCallbackAdapter.java
@@ -15,11 +15,8 @@
 package software.amazon.cloudformation.proxy;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
-
 import java.util.UUID;
-
 import org.json.JSONObject;
-
 import software.amazon.awssdk.services.cloudformation.CloudFormationClient;
 import software.amazon.awssdk.services.cloudformation.model.RecordHandlerProgressRequest;
 import software.amazon.awssdk.services.cloudformation.model.RecordHandlerProgressResponse;
diff --git a/src/main/java/software/amazon/cloudformation/proxy/HandlerRequest.java b/src/main/java/software/amazon/cloudformation/proxy/HandlerRequest.java
index e154e1b2..a5d698bb 100644
--- a/src/main/java/software/amazon/cloudformation/proxy/HandlerRequest.java
+++ b/src/main/java/software/amazon/cloudformation/proxy/HandlerRequest.java
@@ -16,7 +16,6 @@
 
 import lombok.Data;
 import lombok.NoArgsConstructor;
-
 import software.amazon.cloudformation.Action;
 
 /**
diff --git a/src/main/java/software/amazon/cloudformation/proxy/LoggerProxy.java b/src/main/java/software/amazon/cloudformation/proxy/LoggerProxy.java
index 7ac4548e..6bea0f9a 100644
--- a/src/main/java/software/amazon/cloudformation/proxy/LoggerProxy.java
+++ b/src/main/java/software/amazon/cloudformation/proxy/LoggerProxy.java
@@ -16,7 +16,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-
 import software.amazon.cloudformation.loggers.LogPublisher;
 
 public class LoggerProxy implements Logger {
diff --git a/src/main/java/software/amazon/cloudformation/proxy/MetricsPublisherProxy.java b/src/main/java/software/amazon/cloudformation/proxy/MetricsPublisherProxy.java
index 8f28d2aa..84e5bfc1 100644
--- a/src/main/java/software/amazon/cloudformation/proxy/MetricsPublisherProxy.java
+++ b/src/main/java/software/amazon/cloudformation/proxy/MetricsPublisherProxy.java
@@ -17,7 +17,6 @@
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.List;
-
 import software.amazon.cloudformation.Action;
 import software.amazon.cloudformation.metrics.MetricsPublisher;
 
diff --git a/src/main/java/software/amazon/cloudformation/proxy/ProgressEvent.java b/src/main/java/software/amazon/cloudformation/proxy/ProgressEvent.java
index a3facba4..639bdaa2 100644
--- a/src/main/java/software/amazon/cloudformation/proxy/ProgressEvent.java
+++ b/src/main/java/software/amazon/cloudformation/proxy/ProgressEvent.java
@@ -15,10 +15,8 @@
 package software.amazon.cloudformation.proxy;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-
 import java.util.List;
 import java.util.function.Function;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
diff --git a/src/main/java/software/amazon/cloudformation/proxy/ProxyClient.java b/src/main/java/software/amazon/cloudformation/proxy/ProxyClient.java
index b14f8a5d..589305ab 100644
--- a/src/main/java/software/amazon/cloudformation/proxy/ProxyClient.java
+++ b/src/main/java/software/amazon/cloudformation/proxy/ProxyClient.java
@@ -16,7 +16,6 @@
 
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Function;
-
 import software.amazon.awssdk.awscore.AwsRequest;
 import software.amazon.awssdk.awscore.AwsResponse;
 
diff --git a/src/main/java/software/amazon/cloudformation/proxy/RequestData.java b/src/main/java/software/amazon/cloudformation/proxy/RequestData.java
index 640b061b..d63affb8 100644
--- a/src/main/java/software/amazon/cloudformation/proxy/RequestData.java
+++ b/src/main/java/software/amazon/cloudformation/proxy/RequestData.java
@@ -15,7 +15,6 @@
 package software.amazon.cloudformation.proxy;
 
 import java.util.Map;
-
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
diff --git a/src/main/java/software/amazon/cloudformation/proxy/ResourceHandlerRequest.java b/src/main/java/software/amazon/cloudformation/proxy/ResourceHandlerRequest.java
index b37fa789..5cceff69 100644
--- a/src/main/java/software/amazon/cloudformation/proxy/ResourceHandlerRequest.java
+++ b/src/main/java/software/amazon/cloudformation/proxy/ResourceHandlerRequest.java
@@ -15,7 +15,6 @@
 package software.amazon.cloudformation.proxy;
 
 import java.util.Map;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
diff --git a/src/main/java/software/amazon/cloudformation/proxy/ResourceHandlerTestPayload.java b/src/main/java/software/amazon/cloudformation/proxy/ResourceHandlerTestPayload.java
index d4602201..cf79fb8f 100644
--- a/src/main/java/software/amazon/cloudformation/proxy/ResourceHandlerTestPayload.java
+++ b/src/main/java/software/amazon/cloudformation/proxy/ResourceHandlerTestPayload.java
@@ -18,7 +18,6 @@
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-
 import software.amazon.cloudformation.Action;
 
 /**
diff --git a/src/main/java/software/amazon/cloudformation/proxy/StdCallbackContext.java b/src/main/java/software/amazon/cloudformation/proxy/StdCallbackContext.java
index a4def297..99f3cd71 100644
--- a/src/main/java/software/amazon/cloudformation/proxy/StdCallbackContext.java
+++ b/src/main/java/software/amazon/cloudformation/proxy/StdCallbackContext.java
@@ -27,7 +27,6 @@
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.google.common.annotations.VisibleForTesting;
-
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.util.Collection;
@@ -36,7 +35,6 @@
 import java.util.Map;
 import java.util.function.BiFunction;
 import java.util.function.Function;
-
 import javax.annotation.concurrent.ThreadSafe;
 
 /**
diff --git a/src/main/java/software/amazon/cloudformation/proxy/aws/AWSServiceSerdeModule.java b/src/main/java/software/amazon/cloudformation/proxy/aws/AWSServiceSerdeModule.java
index 73b4e9bc..aac8f857 100644
--- a/src/main/java/software/amazon/cloudformation/proxy/aws/AWSServiceSerdeModule.java
+++ b/src/main/java/software/amazon/cloudformation/proxy/aws/AWSServiceSerdeModule.java
@@ -25,7 +25,6 @@
 import com.fasterxml.jackson.databind.SerializationConfig;
 import com.fasterxml.jackson.databind.deser.Deserializers;
 import com.fasterxml.jackson.databind.ser.Serializers;
-
 import software.amazon.awssdk.core.SdkPojo;
 import software.amazon.awssdk.utils.builder.SdkBuilder;
 
diff --git a/src/main/java/software/amazon/cloudformation/proxy/aws/SdkPojoDeserializer.java b/src/main/java/software/amazon/cloudformation/proxy/aws/SdkPojoDeserializer.java
index cd572f56..1e42f6ee 100644
--- a/src/main/java/software/amazon/cloudformation/proxy/aws/SdkPojoDeserializer.java
+++ b/src/main/java/software/amazon/cloudformation/proxy/aws/SdkPojoDeserializer.java
@@ -23,7 +23,6 @@
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
-
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -33,7 +32,6 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-
 import software.amazon.awssdk.core.SdkBytes;
 import software.amazon.awssdk.core.SdkField;
 import software.amazon.awssdk.core.SdkPojo;
diff --git a/src/main/java/software/amazon/cloudformation/proxy/aws/SdkPojoSerializer.java b/src/main/java/software/amazon/cloudformation/proxy/aws/SdkPojoSerializer.java
index 4807ff2d..5a784ce9 100644
--- a/src/main/java/software/amazon/cloudformation/proxy/aws/SdkPojoSerializer.java
+++ b/src/main/java/software/amazon/cloudformation/proxy/aws/SdkPojoSerializer.java
@@ -19,13 +19,11 @@
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.ser.std.StdSerializer;
-
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.time.Instant;
 import java.util.Collection;
 import java.util.Map;
-
 import software.amazon.awssdk.core.SdkBytes;
 import software.amazon.awssdk.core.SdkField;
 import software.amazon.awssdk.core.SdkPojo;
diff --git a/src/main/java/software/amazon/cloudformation/proxy/delay/AbstractDelay.java b/src/main/java/software/amazon/cloudformation/proxy/delay/AbstractDelay.java
index 7dd952c5..4a046a5c 100644
--- a/src/main/java/software/amazon/cloudformation/proxy/delay/AbstractDelay.java
+++ b/src/main/java/software/amazon/cloudformation/proxy/delay/AbstractDelay.java
@@ -15,9 +15,7 @@
 package software.amazon.cloudformation.proxy.delay;
 
 import com.google.common.base.Preconditions;
-
 import java.time.Duration;
-
 import software.amazon.cloudformation.proxy.Delay;
 
 /**
diff --git a/src/main/java/software/amazon/cloudformation/proxy/delay/BaseBuilder.java b/src/main/java/software/amazon/cloudformation/proxy/delay/BaseBuilder.java
index 6df40ea0..ced06808 100644
--- a/src/main/java/software/amazon/cloudformation/proxy/delay/BaseBuilder.java
+++ b/src/main/java/software/amazon/cloudformation/proxy/delay/BaseBuilder.java
@@ -15,7 +15,6 @@
 package software.amazon.cloudformation.proxy.delay;
 
 import java.time.Duration;
-
 import software.amazon.cloudformation.proxy.Delay;
 
 /**
diff --git a/src/main/java/software/amazon/cloudformation/proxy/delay/Blended.java b/src/main/java/software/amazon/cloudformation/proxy/delay/Blended.java
index 5119b74c..49e81fbe 100644
--- a/src/main/java/software/amazon/cloudformation/proxy/delay/Blended.java
+++ b/src/main/java/software/amazon/cloudformation/proxy/delay/Blended.java
@@ -17,7 +17,6 @@
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
-
 import software.amazon.cloudformation.proxy.Delay;
 
 /**
diff --git a/src/main/java/software/amazon/cloudformation/proxy/delay/Constant.java b/src/main/java/software/amazon/cloudformation/proxy/delay/Constant.java
index 22ac2332..368f476b 100644
--- a/src/main/java/software/amazon/cloudformation/proxy/delay/Constant.java
+++ b/src/main/java/software/amazon/cloudformation/proxy/delay/Constant.java
@@ -15,7 +15,6 @@
 package software.amazon.cloudformation.proxy.delay;
 
 import com.google.common.base.Preconditions;
-
 import java.time.Duration;
 
 /**
diff --git a/src/main/java/software/amazon/cloudformation/proxy/delay/DelayBasedBuilder.java b/src/main/java/software/amazon/cloudformation/proxy/delay/DelayBasedBuilder.java
index a7f2d435..8008d9ff 100644
--- a/src/main/java/software/amazon/cloudformation/proxy/delay/DelayBasedBuilder.java
+++ b/src/main/java/software/amazon/cloudformation/proxy/delay/DelayBasedBuilder.java
@@ -15,7 +15,6 @@
 package software.amazon.cloudformation.proxy.delay;
 
 import java.time.Duration;
-
 import software.amazon.cloudformation.proxy.Delay;
 
 /**
diff --git a/src/main/java/software/amazon/cloudformation/proxy/delay/Exponential.java b/src/main/java/software/amazon/cloudformation/proxy/delay/Exponential.java
index 20d86124..17292ab4 100644
--- a/src/main/java/software/amazon/cloudformation/proxy/delay/Exponential.java
+++ b/src/main/java/software/amazon/cloudformation/proxy/delay/Exponential.java
@@ -15,7 +15,6 @@
 package software.amazon.cloudformation.proxy.delay;
 
 import com.google.common.base.Preconditions;
-
 import java.time.Duration;
 
 /**
diff --git a/src/main/java/software/amazon/cloudformation/proxy/delay/MinDelayAbstractBase.java b/src/main/java/software/amazon/cloudformation/proxy/delay/MinDelayAbstractBase.java
index 4e6d8975..0a85b8d5 100644
--- a/src/main/java/software/amazon/cloudformation/proxy/delay/MinDelayAbstractBase.java
+++ b/src/main/java/software/amazon/cloudformation/proxy/delay/MinDelayAbstractBase.java
@@ -15,7 +15,6 @@
 package software.amazon.cloudformation.proxy.delay;
 
 import com.google.common.base.Preconditions;
-
 import java.time.Duration;
 
 /**
diff --git a/src/main/java/software/amazon/cloudformation/proxy/delay/MinDelayBasedBuilder.java b/src/main/java/software/amazon/cloudformation/proxy/delay/MinDelayBasedBuilder.java
index 0f6972e1..82809c76 100644
--- a/src/main/java/software/amazon/cloudformation/proxy/delay/MinDelayBasedBuilder.java
+++ b/src/main/java/software/amazon/cloudformation/proxy/delay/MinDelayBasedBuilder.java
@@ -15,7 +15,6 @@
 package software.amazon.cloudformation.proxy.delay;
 
 import java.time.Duration;
-
 import software.amazon.cloudformation.proxy.Delay;
 
 /**
diff --git a/src/main/java/software/amazon/cloudformation/proxy/delay/MultipleOf.java b/src/main/java/software/amazon/cloudformation/proxy/delay/MultipleOf.java
index 855873b0..99e5f418 100644
--- a/src/main/java/software/amazon/cloudformation/proxy/delay/MultipleOf.java
+++ b/src/main/java/software/amazon/cloudformation/proxy/delay/MultipleOf.java
@@ -15,7 +15,6 @@
 package software.amazon.cloudformation.proxy.delay;
 
 import com.google.common.base.Preconditions;
-
 import java.time.Duration;
 
 /**
diff --git a/src/main/java/software/amazon/cloudformation/resource/IdentifierUtils.java b/src/main/java/software/amazon/cloudformation/resource/IdentifierUtils.java
index c5712a9b..9b7d2c82 100644
--- a/src/main/java/software/amazon/cloudformation/resource/IdentifierUtils.java
+++ b/src/main/java/software/amazon/cloudformation/resource/IdentifierUtils.java
@@ -15,7 +15,6 @@
 package software.amazon.cloudformation.resource;
 
 import java.util.Random;
-
 import org.apache.commons.lang3.RandomStringUtils;
 
 public class IdentifierUtils {
diff --git a/src/main/java/software/amazon/cloudformation/resource/Serializer.java b/src/main/java/software/amazon/cloudformation/resource/Serializer.java
index 39b03770..a53f903f 100644
--- a/src/main/java/software/amazon/cloudformation/resource/Serializer.java
+++ b/src/main/java/software/amazon/cloudformation/resource/Serializer.java
@@ -22,9 +22,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
-
 import java.io.IOException;
-
 import software.amazon.cloudformation.proxy.aws.AWSServiceSerdeModule;
 
 public class Serializer {
diff --git a/src/main/java/software/amazon/cloudformation/scheduler/CloudWatchScheduler.java b/src/main/java/software/amazon/cloudformation/scheduler/CloudWatchScheduler.java
index 82449021..181ddebf 100644
--- a/src/main/java/software/amazon/cloudformation/scheduler/CloudWatchScheduler.java
+++ b/src/main/java/software/amazon/cloudformation/scheduler/CloudWatchScheduler.java
@@ -15,12 +15,9 @@
 package software.amazon.cloudformation.scheduler;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
-
 import java.util.Objects;
 import java.util.UUID;
-
 import lombok.Data;
-
 import software.amazon.awssdk.services.cloudwatchevents.CloudWatchEventsClient;
 import software.amazon.awssdk.services.cloudwatchevents.model.DeleteRuleRequest;
 import software.amazon.awssdk.services.cloudwatchevents.model.PutRuleRequest;
diff --git a/src/main/resources/com/amazonaws/cloudformation/checkstyle.xml b/src/main/resources/com/amazonaws/cloudformation/checkstyle.xml
index b2ca4cd2..a16f0f9d 100644
--- a/src/main/resources/com/amazonaws/cloudformation/checkstyle.xml
+++ b/src/main/resources/com/amazonaws/cloudformation/checkstyle.xml
@@ -31,6 +31,12 @@
         <property name="eachLine" value="true"/>
     </module>
 
+    <!-- Enforce maximum line lengths. -->
+    <module name="LineLength">
+        <property name="max" value="130"/>
+        <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
+    </module>
+
     <module name="SuppressionFilter">
         <property name="file"
                   value="${checkstyle.suppressions.file}"
@@ -66,12 +72,6 @@
             <property name="allowNonPrintableEscapes" value="true"/>
         </module>
 
-        <!-- Enforce maximum line lengths. -->
-        <module name="LineLength">
-            <property name="max" value="130"/>
-            <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
-        </module>
-
         <!-- Stars must not be used in import statements. -->
         <module name="AvoidStarImport"/>
 
@@ -279,7 +279,8 @@
         <!-- Static imports must occur before external package imports. -->
         <module name="CustomImportOrder">
             <property name="sortImportsInGroupAlphabetically" value="true"/>
-            <property name="separateLineBetweenGroups" value="true"/>
+            <!-- this is plain up broken in 8.29 when set to true -->
+            <property name="separateLineBetweenGroups" value="false"/>
             <property name="customImportOrderRules" value="STATIC###THIRD_PARTY_PACKAGE"/>
         </module>
 
@@ -353,16 +354,10 @@
             <property name="ignoreComments" value="true"/>
         </module>
 
-        <!-- Checks that we don't use plural enum names -->
-        <module name="software.amazon.awssdk.buildtools.checkstyle.PluralEnumNames"/>
-
         <!-- Checks for redundant public modifier on interfaces and other redundant modifiers -->
         <module name="RedundantModifier" />
 
         <!-- Checks for utility and constants classes to have private constructor-->
         <module name="HideUtilityClassConstructor"/>
-
-        <!-- Checks that no 'final' are added on local variables -->
-        <module name="software.amazon.awssdk.buildtools.checkstyle.UnnecessaryFinalOnLocalVariableCheck" />
     </module>
 </module>
diff --git a/src/main/resources/com/amazonaws/cloudformation/eclipse-java-formatter.xml b/src/main/resources/com/amazonaws/cloudformation/eclipse-java-formatter.xml
index 3320a451..a8ace07d 100644
--- a/src/main/resources/com/amazonaws/cloudformation/eclipse-java-formatter.xml
+++ b/src/main/resources/com/amazonaws/cloudformation/eclipse-java-formatter.xml
@@ -307,7 +307,7 @@
         <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="0"/>
         <setting id="org.eclipse.jdt.core.formatter.lineSplit" value="130"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
diff --git a/src/main/resources/com/amazonaws/cloudformation/intellij-codestyle.xml b/src/main/resources/com/amazonaws/cloudformation/intellij-codestyle.xml
index 4c41185a..cfc533c0 100644
--- a/src/main/resources/com/amazonaws/cloudformation/intellij-codestyle.xml
+++ b/src/main/resources/com/amazonaws/cloudformation/intellij-codestyle.xml
@@ -23,7 +23,6 @@
     <option name="IMPORT_LAYOUT_TABLE">
         <value>
             <package name="" withSubpackages="true" static="true" />
-            <emptyLine />
             <package name="" withSubpackages="true" static="false" />
             <emptyLine />
         </value>
diff --git a/src/test/java/software/amazon/cloudformation/LambdaWrapperTest.java b/src/test/java/software/amazon/cloudformation/LambdaWrapperTest.java
index 55c8a23a..9a6615e5 100644
--- a/src/test/java/software/amazon/cloudformation/LambdaWrapperTest.java
+++ b/src/test/java/software/amazon/cloudformation/LambdaWrapperTest.java
@@ -22,12 +22,10 @@
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.ArgumentMatchers.isNull;
 import static org.mockito.Mockito.*;
-
 import com.amazonaws.AmazonServiceException;
 import com.amazonaws.services.lambda.runtime.Context;
 import com.amazonaws.services.lambda.runtime.LambdaLogger;
 import com.fasterxml.jackson.core.type.TypeReference;
-
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -41,7 +39,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import org.json.JSONObject;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -52,7 +49,6 @@
 import org.mockito.ArgumentMatchers;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
-
 import software.amazon.awssdk.http.SdkHttpClient;
 import software.amazon.awssdk.services.cloudformation.model.OperationStatusCheckFailedException;
 import software.amazon.cloudformation.exceptions.ResourceAlreadyExistsException;
diff --git a/src/test/java/software/amazon/cloudformation/TestModel.java b/src/test/java/software/amazon/cloudformation/TestModel.java
index b92df79e..277d3dfc 100644
--- a/src/test/java/software/amazon/cloudformation/TestModel.java
+++ b/src/test/java/software/amazon/cloudformation/TestModel.java
@@ -15,7 +15,6 @@
 package software.amazon.cloudformation;
 
 import java.util.Map;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
diff --git a/src/test/java/software/amazon/cloudformation/WrapperOverride.java b/src/test/java/software/amazon/cloudformation/WrapperOverride.java
index d7087e63..ccfa0b94 100644
--- a/src/test/java/software/amazon/cloudformation/WrapperOverride.java
+++ b/src/test/java/software/amazon/cloudformation/WrapperOverride.java
@@ -15,20 +15,16 @@
 package software.amazon.cloudformation;
 
 import com.fasterxml.jackson.core.type.TypeReference;
-
 import java.io.ByteArrayInputStream;
 import java.nio.charset.StandardCharsets;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Queue;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-
 import org.json.JSONObject;
 import org.json.JSONTokener;
-
 import software.amazon.awssdk.http.SdkHttpClient;
 import software.amazon.cloudformation.injection.CredentialsProvider;
 import software.amazon.cloudformation.loggers.CloudWatchLogPublisher;
diff --git a/src/test/java/software/amazon/cloudformation/exceptions/CfnAccessDeniedExceptionTests.java b/src/test/java/software/amazon/cloudformation/exceptions/CfnAccessDeniedExceptionTests.java
index cb45ca9e..4c41dada 100644
--- a/src/test/java/software/amazon/cloudformation/exceptions/CfnAccessDeniedExceptionTests.java
+++ b/src/test/java/software/amazon/cloudformation/exceptions/CfnAccessDeniedExceptionTests.java
@@ -16,9 +16,7 @@
 
 import static junit.framework.Assert.assertEquals;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-
 import org.junit.jupiter.api.Test;
-
 import software.amazon.cloudformation.proxy.HandlerErrorCode;
 
 public class CfnAccessDeniedExceptionTests {
diff --git a/src/test/java/software/amazon/cloudformation/exceptions/CfnAlreadyExistsExceptionTests.java b/src/test/java/software/amazon/cloudformation/exceptions/CfnAlreadyExistsExceptionTests.java
index cb9f83fc..8922033c 100644
--- a/src/test/java/software/amazon/cloudformation/exceptions/CfnAlreadyExistsExceptionTests.java
+++ b/src/test/java/software/amazon/cloudformation/exceptions/CfnAlreadyExistsExceptionTests.java
@@ -16,9 +16,7 @@
 
 import static junit.framework.Assert.*;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-
 import org.junit.jupiter.api.Test;
-
 import software.amazon.cloudformation.proxy.HandlerErrorCode;
 
 public class CfnAlreadyExistsExceptionTests {
diff --git a/src/test/java/software/amazon/cloudformation/exceptions/CfnGeneralServiceExceptionTests.java b/src/test/java/software/amazon/cloudformation/exceptions/CfnGeneralServiceExceptionTests.java
index 3a3dc5e7..24a95ad0 100644
--- a/src/test/java/software/amazon/cloudformation/exceptions/CfnGeneralServiceExceptionTests.java
+++ b/src/test/java/software/amazon/cloudformation/exceptions/CfnGeneralServiceExceptionTests.java
@@ -16,9 +16,7 @@
 
 import static junit.framework.Assert.assertEquals;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-
 import org.junit.jupiter.api.Test;
-
 import software.amazon.cloudformation.proxy.HandlerErrorCode;
 
 public class CfnGeneralServiceExceptionTests {
diff --git a/src/test/java/software/amazon/cloudformation/exceptions/CfnInternalFailureExceptionTests.java b/src/test/java/software/amazon/cloudformation/exceptions/CfnInternalFailureExceptionTests.java
index c05cc58f..cc629dfb 100644
--- a/src/test/java/software/amazon/cloudformation/exceptions/CfnInternalFailureExceptionTests.java
+++ b/src/test/java/software/amazon/cloudformation/exceptions/CfnInternalFailureExceptionTests.java
@@ -16,9 +16,7 @@
 
 import static junit.framework.Assert.assertEquals;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-
 import org.junit.jupiter.api.Test;
-
 import software.amazon.cloudformation.proxy.HandlerErrorCode;
 
 public class CfnInternalFailureExceptionTests {
diff --git a/src/test/java/software/amazon/cloudformation/exceptions/CfnInvalidCredentialsExceptionTests.java b/src/test/java/software/amazon/cloudformation/exceptions/CfnInvalidCredentialsExceptionTests.java
index 05a69fd0..4ba54dbf 100644
--- a/src/test/java/software/amazon/cloudformation/exceptions/CfnInvalidCredentialsExceptionTests.java
+++ b/src/test/java/software/amazon/cloudformation/exceptions/CfnInvalidCredentialsExceptionTests.java
@@ -16,9 +16,7 @@
 
 import static junit.framework.Assert.assertEquals;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-
 import org.junit.jupiter.api.Test;
-
 import software.amazon.cloudformation.proxy.HandlerErrorCode;
 
 public class CfnInvalidCredentialsExceptionTests {
diff --git a/src/test/java/software/amazon/cloudformation/exceptions/CfnInvalidRequestExceptionTests.java b/src/test/java/software/amazon/cloudformation/exceptions/CfnInvalidRequestExceptionTests.java
index 46e37c01..5f3b0a71 100644
--- a/src/test/java/software/amazon/cloudformation/exceptions/CfnInvalidRequestExceptionTests.java
+++ b/src/test/java/software/amazon/cloudformation/exceptions/CfnInvalidRequestExceptionTests.java
@@ -16,9 +16,7 @@
 
 import static junit.framework.Assert.assertEquals;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-
 import org.junit.jupiter.api.Test;
-
 import software.amazon.cloudformation.proxy.HandlerErrorCode;
 
 public class CfnInvalidRequestExceptionTests {
diff --git a/src/test/java/software/amazon/cloudformation/exceptions/CfnNetworkFailureExceptionTests.java b/src/test/java/software/amazon/cloudformation/exceptions/CfnNetworkFailureExceptionTests.java
index 534e2ee6..175785db 100644
--- a/src/test/java/software/amazon/cloudformation/exceptions/CfnNetworkFailureExceptionTests.java
+++ b/src/test/java/software/amazon/cloudformation/exceptions/CfnNetworkFailureExceptionTests.java
@@ -16,9 +16,7 @@
 
 import static junit.framework.Assert.assertEquals;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-
 import org.junit.jupiter.api.Test;
-
 import software.amazon.cloudformation.proxy.HandlerErrorCode;
 
 public class CfnNetworkFailureExceptionTests {
diff --git a/src/test/java/software/amazon/cloudformation/exceptions/CfnNotFoundExceptionTests.java b/src/test/java/software/amazon/cloudformation/exceptions/CfnNotFoundExceptionTests.java
index 8b0b5cff..7c5a019b 100644
--- a/src/test/java/software/amazon/cloudformation/exceptions/CfnNotFoundExceptionTests.java
+++ b/src/test/java/software/amazon/cloudformation/exceptions/CfnNotFoundExceptionTests.java
@@ -16,9 +16,7 @@
 
 import static junit.framework.Assert.assertEquals;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-
 import org.junit.jupiter.api.Test;
-
 import software.amazon.cloudformation.proxy.HandlerErrorCode;
 
 public class CfnNotFoundExceptionTests {
diff --git a/src/test/java/software/amazon/cloudformation/exceptions/CfnNotStabilizedExceptionTests.java b/src/test/java/software/amazon/cloudformation/exceptions/CfnNotStabilizedExceptionTests.java
index ef4ab4fc..2d45dbc9 100644
--- a/src/test/java/software/amazon/cloudformation/exceptions/CfnNotStabilizedExceptionTests.java
+++ b/src/test/java/software/amazon/cloudformation/exceptions/CfnNotStabilizedExceptionTests.java
@@ -16,9 +16,7 @@
 
 import static junit.framework.Assert.assertEquals;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-
 import org.junit.jupiter.api.Test;
-
 import software.amazon.cloudformation.proxy.HandlerErrorCode;
 
 public class CfnNotStabilizedExceptionTests {
diff --git a/src/test/java/software/amazon/cloudformation/exceptions/CfnNotUpdatableExceptionTests.java b/src/test/java/software/amazon/cloudformation/exceptions/CfnNotUpdatableExceptionTests.java
index 99d9b16d..1ca4dd04 100644
--- a/src/test/java/software/amazon/cloudformation/exceptions/CfnNotUpdatableExceptionTests.java
+++ b/src/test/java/software/amazon/cloudformation/exceptions/CfnNotUpdatableExceptionTests.java
@@ -16,9 +16,7 @@
 
 import static junit.framework.Assert.assertEquals;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-
 import org.junit.jupiter.api.Test;
-
 import software.amazon.cloudformation.proxy.HandlerErrorCode;
 
 public class CfnNotUpdatableExceptionTests {
diff --git a/src/test/java/software/amazon/cloudformation/exceptions/CfnServiceInternalErrorExceptionTests.java b/src/test/java/software/amazon/cloudformation/exceptions/CfnServiceInternalErrorExceptionTests.java
index 8c0de7b2..49265db8 100644
--- a/src/test/java/software/amazon/cloudformation/exceptions/CfnServiceInternalErrorExceptionTests.java
+++ b/src/test/java/software/amazon/cloudformation/exceptions/CfnServiceInternalErrorExceptionTests.java
@@ -16,9 +16,7 @@
 
 import static junit.framework.Assert.assertEquals;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-
 import org.junit.jupiter.api.Test;
-
 import software.amazon.cloudformation.proxy.HandlerErrorCode;
 
 public class CfnServiceInternalErrorExceptionTests {
diff --git a/src/test/java/software/amazon/cloudformation/exceptions/CfnServiceLimitExceededExceptionTests.java b/src/test/java/software/amazon/cloudformation/exceptions/CfnServiceLimitExceededExceptionTests.java
index c10891c8..0572dc2a 100644
--- a/src/test/java/software/amazon/cloudformation/exceptions/CfnServiceLimitExceededExceptionTests.java
+++ b/src/test/java/software/amazon/cloudformation/exceptions/CfnServiceLimitExceededExceptionTests.java
@@ -16,9 +16,7 @@
 
 import static junit.framework.Assert.assertEquals;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-
 import org.junit.jupiter.api.Test;
-
 import software.amazon.cloudformation.proxy.HandlerErrorCode;
 
 public class CfnServiceLimitExceededExceptionTests {
diff --git a/src/test/java/software/amazon/cloudformation/exceptions/CfnThrottlingExceptionTests.java b/src/test/java/software/amazon/cloudformation/exceptions/CfnThrottlingExceptionTests.java
index 265269be..68593642 100644
--- a/src/test/java/software/amazon/cloudformation/exceptions/CfnThrottlingExceptionTests.java
+++ b/src/test/java/software/amazon/cloudformation/exceptions/CfnThrottlingExceptionTests.java
@@ -16,9 +16,7 @@
 
 import static junit.framework.Assert.assertEquals;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-
 import org.junit.jupiter.api.Test;
-
 import software.amazon.cloudformation.proxy.HandlerErrorCode;
 
 public class CfnThrottlingExceptionTests {
diff --git a/src/test/java/software/amazon/cloudformation/loggers/CloudWatchLogHelperTest.java b/src/test/java/software/amazon/cloudformation/loggers/CloudWatchLogHelperTest.java
index e1ea44ee..4aaceed0 100644
--- a/src/test/java/software/amazon/cloudformation/loggers/CloudWatchLogHelperTest.java
+++ b/src/test/java/software/amazon/cloudformation/loggers/CloudWatchLogHelperTest.java
@@ -22,17 +22,14 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
-
 import com.amazonaws.services.lambda.runtime.LambdaLogger;
 import com.google.common.collect.ImmutableList;
-
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
-
 import software.amazon.awssdk.services.cloudwatch.CloudWatchClient;
 import software.amazon.awssdk.services.cloudwatchlogs.CloudWatchLogsClient;
 import software.amazon.awssdk.services.cloudwatchlogs.model.CreateLogGroupRequest;
diff --git a/src/test/java/software/amazon/cloudformation/loggers/CloudWatchLogPublisherTest.java b/src/test/java/software/amazon/cloudformation/loggers/CloudWatchLogPublisherTest.java
index cf847470..0ec91e57 100644
--- a/src/test/java/software/amazon/cloudformation/loggers/CloudWatchLogPublisherTest.java
+++ b/src/test/java/software/amazon/cloudformation/loggers/CloudWatchLogPublisherTest.java
@@ -22,16 +22,13 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
-
 import com.amazonaws.services.lambda.runtime.LambdaLogger;
-
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
-
 import software.amazon.awssdk.services.cloudwatch.CloudWatchClient;
 import software.amazon.awssdk.services.cloudwatchlogs.CloudWatchLogsClient;
 import software.amazon.awssdk.services.cloudwatchlogs.model.PutLogEventsRequest;
diff --git a/src/test/java/software/amazon/cloudformation/metrics/MetricsPublisherImplTest.java b/src/test/java/software/amazon/cloudformation/metrics/MetricsPublisherImplTest.java
index 7fe8ccac..45521fa6 100644
--- a/src/test/java/software/amazon/cloudformation/metrics/MetricsPublisherImplTest.java
+++ b/src/test/java/software/amazon/cloudformation/metrics/MetricsPublisherImplTest.java
@@ -20,9 +20,7 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
-
 import java.time.Instant;
-
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -30,7 +28,6 @@
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
-
 import software.amazon.awssdk.services.cloudwatch.CloudWatchClient;
 import software.amazon.awssdk.services.cloudwatch.model.Dimension;
 import software.amazon.awssdk.services.cloudwatch.model.MetricDatum;
diff --git a/src/test/java/software/amazon/cloudformation/proxy/AmazonWebServicesClientProxyTest.java b/src/test/java/software/amazon/cloudformation/proxy/AmazonWebServicesClientProxyTest.java
index 74200e0d..5107840c 100644
--- a/src/test/java/software/amazon/cloudformation/proxy/AmazonWebServicesClientProxyTest.java
+++ b/src/test/java/software/amazon/cloudformation/proxy/AmazonWebServicesClientProxyTest.java
@@ -23,21 +23,17 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
-
 import com.amazonaws.auth.AWSStaticCredentialsProvider;
 import com.amazonaws.services.cloudformation.AmazonCloudFormation;
 import com.amazonaws.services.cloudformation.model.DescribeStackEventsRequest;
 import com.amazonaws.services.cloudformation.model.DescribeStackEventsResult;
-
 import java.time.Duration;
 import java.util.Collections;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
-
 import org.joda.time.Instant;
 import org.junit.jupiter.api.Test;
-
 import software.amazon.awssdk.auth.credentials.AwsSessionCredentials;
 import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
 import software.amazon.awssdk.awscore.AwsRequestOverrideConfiguration;
diff --git a/src/test/java/software/amazon/cloudformation/proxy/CloudFormationCallbackAdapterTest.java b/src/test/java/software/amazon/cloudformation/proxy/CloudFormationCallbackAdapterTest.java
index b1ea40ee..d7d578b8 100644
--- a/src/test/java/software/amazon/cloudformation/proxy/CloudFormationCallbackAdapterTest.java
+++ b/src/test/java/software/amazon/cloudformation/proxy/CloudFormationCallbackAdapterTest.java
@@ -26,18 +26,14 @@
 import static software.amazon.awssdk.services.cloudformation.model.OperationStatus.IN_PROGRESS;
 import static software.amazon.awssdk.services.cloudformation.model.OperationStatus.PENDING;
 import static software.amazon.awssdk.services.cloudformation.model.OperationStatus.SUCCESS;
-
 import com.fasterxml.jackson.core.JsonProcessingException;
-
 import java.util.UUID;
-
 import org.json.JSONObject;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
-
 import software.amazon.awssdk.services.cloudformation.CloudFormationClient;
 import software.amazon.awssdk.services.cloudformation.model.CloudFormationResponseMetadata;
 import software.amazon.awssdk.services.cloudformation.model.RecordHandlerProgressRequest;
diff --git a/src/test/java/software/amazon/cloudformation/proxy/DelayTest.java b/src/test/java/software/amazon/cloudformation/proxy/DelayTest.java
index c7a6c9d4..dab15f39 100644
--- a/src/test/java/software/amazon/cloudformation/proxy/DelayTest.java
+++ b/src/test/java/software/amazon/cloudformation/proxy/DelayTest.java
@@ -15,14 +15,11 @@
 package software.amazon.cloudformation.proxy;
 
 import static org.assertj.core.api.Assertions.*;
-
 import java.time.Duration;
 import java.util.concurrent.TimeUnit;
-
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.function.Executable;
-
 import software.amazon.cloudformation.proxy.delay.Blended;
 import software.amazon.cloudformation.proxy.delay.Constant;
 import software.amazon.cloudformation.proxy.delay.Exponential;
diff --git a/src/test/java/software/amazon/cloudformation/proxy/End2EndCallChainTest.java b/src/test/java/software/amazon/cloudformation/proxy/End2EndCallChainTest.java
index 11dec533..d63de52d 100644
--- a/src/test/java/software/amazon/cloudformation/proxy/End2EndCallChainTest.java
+++ b/src/test/java/software/amazon/cloudformation/proxy/End2EndCallChainTest.java
@@ -16,11 +16,9 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.*;
-
 import com.amazonaws.services.lambda.runtime.Context;
 import com.amazonaws.services.lambda.runtime.LambdaLogger;
 import com.fasterxml.jackson.core.type.TypeReference;
-
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
@@ -29,14 +27,12 @@
 import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 import java.util.UUID;
-
 import org.joda.time.Instant;
 import org.junit.jupiter.api.MethodOrderer;
 import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestMethodOrder;
 import org.mockito.stubbing.Answer;
-
 import software.amazon.awssdk.auth.credentials.AwsSessionCredentials;
 import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
 import software.amazon.awssdk.awscore.AwsRequestOverrideConfiguration;
diff --git a/src/test/java/software/amazon/cloudformation/proxy/ProgressEventTest.java b/src/test/java/software/amazon/cloudformation/proxy/ProgressEventTest.java
index a3761027..63b2356a 100644
--- a/src/test/java/software/amazon/cloudformation/proxy/ProgressEventTest.java
+++ b/src/test/java/software/amazon/cloudformation/proxy/ProgressEventTest.java
@@ -15,11 +15,8 @@
 package software.amazon.cloudformation.proxy;
 
 import static org.assertj.core.api.Assertions.assertThat;
-
 import com.fasterxml.jackson.core.JsonProcessingException;
-
 import org.junit.jupiter.api.Test;
-
 import software.amazon.cloudformation.TestContext;
 import software.amazon.cloudformation.TestModel;
 import software.amazon.cloudformation.exceptions.ResourceNotFoundException;
diff --git a/src/test/java/software/amazon/cloudformation/proxy/StdCallackContextTest.java b/src/test/java/software/amazon/cloudformation/proxy/StdCallackContextTest.java
index 7871f1bc..87ae0677 100644
--- a/src/test/java/software/amazon/cloudformation/proxy/StdCallackContextTest.java
+++ b/src/test/java/software/amazon/cloudformation/proxy/StdCallackContextTest.java
@@ -16,12 +16,10 @@
 
 import static org.assertj.core.api.AssertionsForClassTypes.*;
 import static org.junit.jupiter.api.Assertions.*;
-
 import com.fasterxml.jackson.core.JsonGenerationException;
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.JsonMappingException;
-
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -32,9 +30,7 @@
 import java.util.Map;
 import java.util.function.BiFunction;
 import java.util.function.Function;
-
 import org.junit.jupiter.api.Test;
-
 import software.amazon.cloudformation.resource.Serializer;
 
 public class StdCallackContextTest {
diff --git a/src/test/java/software/amazon/cloudformation/proxy/aws/AWSServiceSerdeTest.java b/src/test/java/software/amazon/cloudformation/proxy/aws/AWSServiceSerdeTest.java
index ba6d7ddb..70b2796d 100644
--- a/src/test/java/software/amazon/cloudformation/proxy/aws/AWSServiceSerdeTest.java
+++ b/src/test/java/software/amazon/cloudformation/proxy/aws/AWSServiceSerdeTest.java
@@ -15,11 +15,9 @@
 package software.amazon.cloudformation.proxy.aws;
 
 import static org.assertj.core.api.AssertionsForClassTypes.*;
-
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.JsonMappingException;
-
 import java.math.BigDecimal;
 import java.nio.charset.StandardCharsets;
 import java.time.Instant;
@@ -31,10 +29,8 @@
 import java.util.UUID;
 import java.util.function.BiConsumer;
 import java.util.function.Function;
-
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-
 import software.amazon.awssdk.core.SdkBytes;
 import software.amazon.awssdk.core.SdkField;
 import software.amazon.awssdk.core.SdkPojo;
diff --git a/src/test/java/software/amazon/cloudformation/proxy/handler/CreateHandler.java b/src/test/java/software/amazon/cloudformation/proxy/handler/CreateHandler.java
index ab77c5aa..20579059 100644
--- a/src/test/java/software/amazon/cloudformation/proxy/handler/CreateHandler.java
+++ b/src/test/java/software/amazon/cloudformation/proxy/handler/CreateHandler.java
@@ -15,7 +15,6 @@
 package software.amazon.cloudformation.proxy.handler;
 
 import java.time.Duration;
-
 import software.amazon.cloudformation.proxy.AmazonWebServicesClientProxy;
 import software.amazon.cloudformation.proxy.LoggerProxy;
 import software.amazon.cloudformation.proxy.ProgressEvent;
diff --git a/src/test/java/software/amazon/cloudformation/proxy/handler/Model.java b/src/test/java/software/amazon/cloudformation/proxy/handler/Model.java
index 27f91b13..466189f0 100644
--- a/src/test/java/software/amazon/cloudformation/proxy/handler/Model.java
+++ b/src/test/java/software/amazon/cloudformation/proxy/handler/Model.java
@@ -15,7 +15,6 @@
 package software.amazon.cloudformation.proxy.handler;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-
 import java.util.Date;
 import java.util.Set;
 
diff --git a/src/test/java/software/amazon/cloudformation/proxy/handler/ReadHandler.java b/src/test/java/software/amazon/cloudformation/proxy/handler/ReadHandler.java
index bb06c3f4..1609818f 100644
--- a/src/test/java/software/amazon/cloudformation/proxy/handler/ReadHandler.java
+++ b/src/test/java/software/amazon/cloudformation/proxy/handler/ReadHandler.java
@@ -15,7 +15,6 @@
 package software.amazon.cloudformation.proxy.handler;
 
 import java.time.Duration;
-
 import software.amazon.cloudformation.proxy.AmazonWebServicesClientProxy;
 import software.amazon.cloudformation.proxy.LoggerProxy;
 import software.amazon.cloudformation.proxy.ProgressEvent;
diff --git a/src/test/java/software/amazon/cloudformation/proxy/handler/ServiceHandlerWrapper.java b/src/test/java/software/amazon/cloudformation/proxy/handler/ServiceHandlerWrapper.java
index a5f27c67..315cd4cd 100644
--- a/src/test/java/software/amazon/cloudformation/proxy/handler/ServiceHandlerWrapper.java
+++ b/src/test/java/software/amazon/cloudformation/proxy/handler/ServiceHandlerWrapper.java
@@ -15,13 +15,10 @@
 package software.amazon.cloudformation.proxy.handler;
 
 import com.fasterxml.jackson.core.type.TypeReference;
-
 import java.util.Map;
-
 import org.json.JSONObject;
 import org.json.JSONTokener;
 import org.mockito.Mockito;
-
 import software.amazon.awssdk.http.SdkHttpClient;
 import software.amazon.cloudformation.Action;
 import software.amazon.cloudformation.LambdaWrapper;
diff --git a/src/test/java/software/amazon/cloudformation/proxy/service/CreateRequest.java b/src/test/java/software/amazon/cloudformation/proxy/service/CreateRequest.java
index ef77b2b8..dd47c57b 100644
--- a/src/test/java/software/amazon/cloudformation/proxy/service/CreateRequest.java
+++ b/src/test/java/software/amazon/cloudformation/proxy/service/CreateRequest.java
@@ -16,7 +16,6 @@
 
 import java.util.Collections;
 import java.util.List;
-
 import software.amazon.awssdk.awscore.AwsRequest;
 import software.amazon.awssdk.awscore.AwsRequestOverrideConfiguration;
 import software.amazon.awssdk.core.SdkField;
diff --git a/src/test/java/software/amazon/cloudformation/proxy/service/CreateResponse.java b/src/test/java/software/amazon/cloudformation/proxy/service/CreateResponse.java
index 60b26894..9be3a2da 100644
--- a/src/test/java/software/amazon/cloudformation/proxy/service/CreateResponse.java
+++ b/src/test/java/software/amazon/cloudformation/proxy/service/CreateResponse.java
@@ -16,7 +16,6 @@
 
 import java.util.Collections;
 import java.util.List;
-
 import software.amazon.awssdk.awscore.AwsResponse;
 import software.amazon.awssdk.core.SdkField;
 
diff --git a/src/test/java/software/amazon/cloudformation/proxy/service/DescribeRequest.java b/src/test/java/software/amazon/cloudformation/proxy/service/DescribeRequest.java
index f857fa0a..fe6ee132 100644
--- a/src/test/java/software/amazon/cloudformation/proxy/service/DescribeRequest.java
+++ b/src/test/java/software/amazon/cloudformation/proxy/service/DescribeRequest.java
@@ -16,7 +16,6 @@
 
 import java.util.Collections;
 import java.util.List;
-
 import software.amazon.awssdk.awscore.AwsRequest;
 import software.amazon.awssdk.awscore.AwsRequestOverrideConfiguration;
 import software.amazon.awssdk.core.SdkField;
diff --git a/src/test/java/software/amazon/cloudformation/proxy/service/DescribeResponse.java b/src/test/java/software/amazon/cloudformation/proxy/service/DescribeResponse.java
index cec95363..828e81ec 100644
--- a/src/test/java/software/amazon/cloudformation/proxy/service/DescribeResponse.java
+++ b/src/test/java/software/amazon/cloudformation/proxy/service/DescribeResponse.java
@@ -17,7 +17,6 @@
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
-
 import software.amazon.awssdk.awscore.AwsResponse;
 import software.amazon.awssdk.core.SdkField;
 
diff --git a/src/test/java/software/amazon/cloudformation/proxy/service/NotFoundException.java b/src/test/java/software/amazon/cloudformation/proxy/service/NotFoundException.java
index dfa0e247..5cb7b69d 100644
--- a/src/test/java/software/amazon/cloudformation/proxy/service/NotFoundException.java
+++ b/src/test/java/software/amazon/cloudformation/proxy/service/NotFoundException.java
@@ -15,7 +15,6 @@
 package software.amazon.cloudformation.proxy.service;
 
 import org.mockito.Mockito;
-
 import software.amazon.awssdk.awscore.exception.AwsErrorDetails;
 import software.amazon.awssdk.awscore.exception.AwsServiceException;
 import software.amazon.awssdk.http.SdkHttpResponse;
diff --git a/src/test/java/software/amazon/cloudformation/resource/IdentifierUtilsTest.java b/src/test/java/software/amazon/cloudformation/resource/IdentifierUtilsTest.java
index bc4f1070..7d94859b 100644
--- a/src/test/java/software/amazon/cloudformation/resource/IdentifierUtilsTest.java
+++ b/src/test/java/software/amazon/cloudformation/resource/IdentifierUtilsTest.java
@@ -15,7 +15,6 @@
 package software.amazon.cloudformation.resource;
 
 import static org.assertj.core.api.Assertions.assertThat;
-
 import org.junit.jupiter.api.Test;
 
 public class IdentifierUtilsTest {
diff --git a/src/test/java/software/amazon/cloudformation/resource/SerializerTest.java b/src/test/java/software/amazon/cloudformation/resource/SerializerTest.java
index a882025a..b0467701 100644
--- a/src/test/java/software/amazon/cloudformation/resource/SerializerTest.java
+++ b/src/test/java/software/amazon/cloudformation/resource/SerializerTest.java
@@ -16,19 +16,15 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.AssertionsForClassTypes.entry;
-
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
-
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
-
 import org.apache.commons.io.IOUtils;
 import org.junit.jupiter.api.Test;
-
 import software.amazon.cloudformation.Action;
 import software.amazon.cloudformation.TestContext;
 import software.amazon.cloudformation.TestModel;
diff --git a/src/test/java/software/amazon/cloudformation/scheduler/CloudWatchSchedulerTest.java b/src/test/java/software/amazon/cloudformation/scheduler/CloudWatchSchedulerTest.java
index 5c52dbb1..1e7a8b9e 100644
--- a/src/test/java/software/amazon/cloudformation/scheduler/CloudWatchSchedulerTest.java
+++ b/src/test/java/software/amazon/cloudformation/scheduler/CloudWatchSchedulerTest.java
@@ -21,17 +21,14 @@
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
-
 import java.util.Arrays;
 import java.util.List;
-
 import org.json.JSONObject;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
-
 import software.amazon.awssdk.services.cloudwatchevents.CloudWatchEventsClient;
 import software.amazon.awssdk.services.cloudwatchevents.model.DeleteRuleRequest;
 import software.amazon.awssdk.services.cloudwatchevents.model.RemoveTargetsRequest;
diff --git a/src/test/java/software/amazon/cloudformation/scheduler/CronHelperTest.java b/src/test/java/software/amazon/cloudformation/scheduler/CronHelperTest.java
index 4977d679..83b01ea5 100644
--- a/src/test/java/software/amazon/cloudformation/scheduler/CronHelperTest.java
+++ b/src/test/java/software/amazon/cloudformation/scheduler/CronHelperTest.java
@@ -17,12 +17,10 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
-
 import java.time.Clock;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 import java.time.format.DateTimeFormatter;
-
 import org.junit.jupiter.api.Test;
 
 public class CronHelperTest {
diff --git a/src/test/java/software/amazon/cloudformation/scheduler/PutRuleRequestMatcher.java b/src/test/java/software/amazon/cloudformation/scheduler/PutRuleRequestMatcher.java
index f3f13fb3..a54f834a 100644
--- a/src/test/java/software/amazon/cloudformation/scheduler/PutRuleRequestMatcher.java
+++ b/src/test/java/software/amazon/cloudformation/scheduler/PutRuleRequestMatcher.java
@@ -16,9 +16,7 @@
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
-
 import org.mockito.ArgumentMatcher;
-
 import software.amazon.awssdk.services.cloudwatchevents.model.PutRuleRequest;
 import software.amazon.awssdk.services.cloudwatchevents.model.RuleState;
 
diff --git a/src/test/java/software/amazon/cloudformation/scheduler/PutTargetsRequestMatcher.java b/src/test/java/software/amazon/cloudformation/scheduler/PutTargetsRequestMatcher.java
index 7e963fa0..52e10c0b 100644
--- a/src/test/java/software/amazon/cloudformation/scheduler/PutTargetsRequestMatcher.java
+++ b/src/test/java/software/amazon/cloudformation/scheduler/PutTargetsRequestMatcher.java
@@ -15,12 +15,9 @@
 package software.amazon.cloudformation.scheduler;
 
 import java.util.List;
-
 import lombok.AllArgsConstructor;
 import lombok.Data;
-
 import org.mockito.ArgumentMatcher;
-
 import software.amazon.awssdk.services.cloudwatchevents.model.PutTargetsRequest;
 import software.amazon.awssdk.services.cloudwatchevents.model.Target;
 
diff --git a/src/test/java/software/amazon/cloudformation/scheduler/TargetMatcher.java b/src/test/java/software/amazon/cloudformation/scheduler/TargetMatcher.java
index 8a6f4acb..c5ff9ea2 100644
--- a/src/test/java/software/amazon/cloudformation/scheduler/TargetMatcher.java
+++ b/src/test/java/software/amazon/cloudformation/scheduler/TargetMatcher.java
@@ -16,9 +16,7 @@
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
-
 import org.mockito.ArgumentMatcher;
-
 import software.amazon.awssdk.services.cloudwatchevents.model.Target;
 
 @Data
diff --git a/src/test/java/software/amazon/cloudformation/scheduler/TargetsListMatcher.java b/src/test/java/software/amazon/cloudformation/scheduler/TargetsListMatcher.java
index 27dac012..dc40eb0b 100644
--- a/src/test/java/software/amazon/cloudformation/scheduler/TargetsListMatcher.java
+++ b/src/test/java/software/amazon/cloudformation/scheduler/TargetsListMatcher.java
@@ -15,12 +15,9 @@
 package software.amazon.cloudformation.scheduler;
 
 import java.util.List;
-
 import lombok.AllArgsConstructor;
 import lombok.Data;
-
 import org.mockito.ArgumentMatcher;
-
 import software.amazon.awssdk.services.cloudwatchevents.model.Target;
 
 @Data