diff --git a/.changes/058bf26f-7f37-439a-9170-d0a2c9c84e3e.json b/.changes/058bf26f-7f37-439a-9170-d0a2c9c84e3e.json
new file mode 100644
index 00000000000..9dd46f72f00
--- /dev/null
+++ b/.changes/058bf26f-7f37-439a-9170-d0a2c9c84e3e.json
@@ -0,0 +1,5 @@
+{
+    "id": "058bf26f-7f37-439a-9170-d0a2c9c84e3e",
+    "type": "misc",
+    "description": "Upgrade to Gradle 9.0.0"
+}
\ No newline at end of file
diff --git a/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/config/auth/ResolveAuthSchemePreference.kt b/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/config/auth/ResolveAuthSchemePreference.kt
index 41071beb707..f06879eaf44 100644
--- a/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/config/auth/ResolveAuthSchemePreference.kt
+++ b/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/config/auth/ResolveAuthSchemePreference.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package aws.sdk.kotlin.runtime.config.auth
 
 import aws.sdk.kotlin.runtime.InternalSdkApi
diff --git a/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/config/checksums/ResolveFlexibleChecksumsConfig.kt b/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/config/checksums/ResolveFlexibleChecksumsConfig.kt
index 5925fb858f0..1859c5b43fe 100644
--- a/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/config/checksums/ResolveFlexibleChecksumsConfig.kt
+++ b/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/config/checksums/ResolveFlexibleChecksumsConfig.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package aws.sdk.kotlin.runtime.config.checksums
 
 import aws.sdk.kotlin.runtime.InternalSdkApi
diff --git a/aws-runtime/aws-config/common/test/aws/sdk/kotlin/runtime/util/AwsBusinessMetricsTestUtils.kt b/aws-runtime/aws-config/common/test/aws/sdk/kotlin/runtime/util/AwsBusinessMetricsTestUtils.kt
index 71467475b34..dbc213438f9 100644
--- a/aws-runtime/aws-config/common/test/aws/sdk/kotlin/runtime/util/AwsBusinessMetricsTestUtils.kt
+++ b/aws-runtime/aws-config/common/test/aws/sdk/kotlin/runtime/util/AwsBusinessMetricsTestUtils.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package aws.sdk.kotlin.runtime.util
 
 import aws.sdk.kotlin.runtime.http.interceptors.businessmetrics.AwsBusinessMetric
diff --git a/aws-runtime/aws-config/jvm/test/aws/sdk/kotlin/runtime/auth/credentials/ProfileCredentialsProviderTestJVM.kt b/aws-runtime/aws-config/jvm/test/aws/sdk/kotlin/runtime/auth/credentials/ProfileCredentialsProviderTestJVM.kt
index 802f8f253db..3cc0e2f5cd4 100644
--- a/aws-runtime/aws-config/jvm/test/aws/sdk/kotlin/runtime/auth/credentials/ProfileCredentialsProviderTestJVM.kt
+++ b/aws-runtime/aws-config/jvm/test/aws/sdk/kotlin/runtime/auth/credentials/ProfileCredentialsProviderTestJVM.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package aws.sdk.kotlin.runtime.auth.credentials
 
 import aws.sdk.kotlin.runtime.auth.credentials.internal.credentials
diff --git a/aws-runtime/aws-http/common/src/aws/sdk/kotlin/runtime/http/interceptors/IgnoreCompositeFlexibleChecksumResponseInterceptor.kt b/aws-runtime/aws-http/common/src/aws/sdk/kotlin/runtime/http/interceptors/IgnoreCompositeFlexibleChecksumResponseInterceptor.kt
index 75c70913894..dad6d3654e8 100644
--- a/aws-runtime/aws-http/common/src/aws/sdk/kotlin/runtime/http/interceptors/IgnoreCompositeFlexibleChecksumResponseInterceptor.kt
+++ b/aws-runtime/aws-http/common/src/aws/sdk/kotlin/runtime/http/interceptors/IgnoreCompositeFlexibleChecksumResponseInterceptor.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package aws.sdk.kotlin.runtime.http.interceptors
 
 import aws.smithy.kotlin.runtime.client.ProtocolResponseInterceptorContext
diff --git a/aws-runtime/aws-http/common/src/aws/sdk/kotlin/runtime/http/interceptors/businessmetrics/AwsBusinessMetricsUtils.kt b/aws-runtime/aws-http/common/src/aws/sdk/kotlin/runtime/http/interceptors/businessmetrics/AwsBusinessMetricsUtils.kt
index 56f88433456..239686ee3df 100644
--- a/aws-runtime/aws-http/common/src/aws/sdk/kotlin/runtime/http/interceptors/businessmetrics/AwsBusinessMetricsUtils.kt
+++ b/aws-runtime/aws-http/common/src/aws/sdk/kotlin/runtime/http/interceptors/businessmetrics/AwsBusinessMetricsUtils.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package aws.sdk.kotlin.runtime.http.interceptors.businessmetrics
 
 import aws.sdk.kotlin.runtime.http.BUSINESS_METRICS_MAX_LENGTH
@@ -26,7 +31,9 @@ internal fun formatMetrics(metrics: MutableSet<BusinessMetric>, logger: Logger):
             true
         }
     }
-    if (allowedMetrics.isEmpty()) return ""
+    if (allowedMetrics.isEmpty()) {
+        return ""
+    }
     val metricsString = allowedMetrics.joinToString(",", "m/") { it.identifier }
     val metricsByteArray = metricsString.encodeToByteArray()
 
diff --git a/build.gradle.kts b/build.gradle.kts
index e027ebcf246..b586dc2c034 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -14,6 +14,18 @@ buildscript {
         // Add our custom gradle build logic to buildscript classpath
         classpath(libs.aws.kotlin.repo.tools.build.support)
     }
+
+    configurations.classpath {
+        resolutionStrategy {
+            /*
+            Version bumping the SDK to 1.5.x in repo tools broke our buildscript classpath:
+            java.lang.NoSuchMethodError: 'void kotlinx.coroutines.CancellableContinuation.resume(java.lang.Object, kotlin.jvm.functions.Function3)
+
+            FIXME: Figure out what broke our buildscipt classpath, this is a temporary fix
+             */
+            force("com.squareup.okhttp3:okhttp-coroutines:5.0.0-alpha.14")
+        }
+    }
 }
 
 plugins {
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index ea81e7825a9..60e7ba27f4f 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -1,3 +1,8 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 plugins {
     alias(libs.plugins.kotlin.jvm)
     `kotlin-dsl`
diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts
index 62991c1ef50..fa909303793 100644
--- a/buildSrc/settings.gradle.kts
+++ b/buildSrc/settings.gradle.kts
@@ -1,3 +1,8 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 rootProject.name = "buildSrc"
 
 dependencyResolutionManagement {
diff --git a/buildSrc/src/main/kotlin/aws/sdk/kotlin/tests/codegen/CodegenTest.kt b/buildSrc/src/main/kotlin/aws/sdk/kotlin/tests/codegen/CodegenTest.kt
index 764e0abc44b..9facb987866 100644
--- a/buildSrc/src/main/kotlin/aws/sdk/kotlin/tests/codegen/CodegenTest.kt
+++ b/buildSrc/src/main/kotlin/aws/sdk/kotlin/tests/codegen/CodegenTest.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package aws.sdk.kotlin.tests.codegen
 
 /**
diff --git a/buildSrc/src/main/kotlin/dokka-convention.gradle.kts b/buildSrc/src/main/kotlin/dokka-convention.gradle.kts
index 15605bcb111..b7bca271f10 100644
--- a/buildSrc/src/main/kotlin/dokka-convention.gradle.kts
+++ b/buildSrc/src/main/kotlin/dokka-convention.gradle.kts
@@ -1,3 +1,8 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 import org.jsoup.Jsoup
 import kotlin.io.path.ExperimentalPathApi
 import kotlin.io.path.PathWalkOption
diff --git a/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/ModuleDocumentationIntegration.kt b/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/ModuleDocumentationIntegration.kt
index 433cfb0d492..a559d714c0b 100644
--- a/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/ModuleDocumentationIntegration.kt
+++ b/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/ModuleDocumentationIntegration.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package aws.sdk.kotlin.codegen
 
 import software.amazon.smithy.aws.traits.ServiceTrait
diff --git a/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/businessmetrics/CredentialsBusinessMetricsIntegration.kt b/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/businessmetrics/CredentialsBusinessMetricsIntegration.kt
index 162c12dbb09..ea240f5f5cf 100644
--- a/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/businessmetrics/CredentialsBusinessMetricsIntegration.kt
+++ b/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/businessmetrics/CredentialsBusinessMetricsIntegration.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package aws.sdk.kotlin.codegen.businessmetrics
 
 import aws.sdk.kotlin.codegen.AwsRuntimeTypes
diff --git a/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/businessmetrics/EndpointBusinessMetricsIntegration.kt b/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/businessmetrics/EndpointBusinessMetricsIntegration.kt
index 8641a8ac634..ef59d7bf05a 100644
--- a/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/businessmetrics/EndpointBusinessMetricsIntegration.kt
+++ b/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/businessmetrics/EndpointBusinessMetricsIntegration.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package aws.sdk.kotlin.codegen.businessmetrics
 
 import aws.sdk.kotlin.codegen.AwsRuntimeTypes
diff --git a/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/model/traits/testing/SmokeTestTraits.kt b/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/model/traits/testing/SmokeTestTraits.kt
index 6805c3bad1f..4d67c7549b3 100644
--- a/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/model/traits/testing/SmokeTestTraits.kt
+++ b/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/model/traits/testing/SmokeTestTraits.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package aws.sdk.kotlin.codegen.model.traits.testing
 
 import software.amazon.smithy.model.node.ObjectNode
diff --git a/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/smoketests/AwsSmokeTestsRunnerGeneratorIntegration.kt b/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/smoketests/AwsSmokeTestsRunnerGeneratorIntegration.kt
index 1e694ae4bbc..da154161601 100644
--- a/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/smoketests/AwsSmokeTestsRunnerGeneratorIntegration.kt
+++ b/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/smoketests/AwsSmokeTestsRunnerGeneratorIntegration.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package aws.sdk.kotlin.codegen.smoketests
 
 import aws.sdk.kotlin.codegen.AwsRuntimeTypes
diff --git a/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/smoketests/SmokeTestsDenyListIntegration.kt b/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/smoketests/SmokeTestsDenyListIntegration.kt
index 06222e6c603..500cb2ea183 100644
--- a/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/smoketests/SmokeTestsDenyListIntegration.kt
+++ b/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/smoketests/SmokeTestsDenyListIntegration.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package aws.sdk.kotlin.codegen.smoketests
 
 import software.amazon.smithy.kotlin.codegen.KotlinSettings
diff --git a/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/smoketests/testing/SmokeTestFailHttpEngineIntegration.kt b/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/smoketests/testing/SmokeTestFailHttpEngineIntegration.kt
index ad6bd0ee95e..fb718146311 100644
--- a/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/smoketests/testing/SmokeTestFailHttpEngineIntegration.kt
+++ b/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/smoketests/testing/SmokeTestFailHttpEngineIntegration.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package aws.sdk.kotlin.codegen.smoketests.testing
 
 import aws.sdk.kotlin.codegen.model.traits.testing.TestFailedResponseTrait
diff --git a/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/smoketests/testing/SmokeTestSuccessHttpEngineIntegration.kt b/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/smoketests/testing/SmokeTestSuccessHttpEngineIntegration.kt
index 03077a4cd5a..a31744be236 100644
--- a/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/smoketests/testing/SmokeTestSuccessHttpEngineIntegration.kt
+++ b/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/smoketests/testing/SmokeTestSuccessHttpEngineIntegration.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package aws.sdk.kotlin.codegen.smoketests.testing
 
 import aws.sdk.kotlin.codegen.model.traits.testing.TestFailedResponseTrait
diff --git a/codegen/aws-sdk-codegen/src/test/kotlin/aws/sdk/kotlin/codegen/ModuleDocumentationIntegrationTest.kt b/codegen/aws-sdk-codegen/src/test/kotlin/aws/sdk/kotlin/codegen/ModuleDocumentationIntegrationTest.kt
index cd288b5782d..bbd3ce3d751 100644
--- a/codegen/aws-sdk-codegen/src/test/kotlin/aws/sdk/kotlin/codegen/ModuleDocumentationIntegrationTest.kt
+++ b/codegen/aws-sdk-codegen/src/test/kotlin/aws/sdk/kotlin/codegen/ModuleDocumentationIntegrationTest.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package aws.sdk.kotlin.codegen
 
 import software.amazon.smithy.build.MockManifest
diff --git a/codegen/aws-sdk-codegen/src/test/kotlin/aws/sdk/kotlin/codegen/endpoints/BindAwsEndpointBuiltinsTest.kt b/codegen/aws-sdk-codegen/src/test/kotlin/aws/sdk/kotlin/codegen/endpoints/BindAwsEndpointBuiltinsTest.kt
index 2fa1877fe52..e1d08153704 100644
--- a/codegen/aws-sdk-codegen/src/test/kotlin/aws/sdk/kotlin/codegen/endpoints/BindAwsEndpointBuiltinsTest.kt
+++ b/codegen/aws-sdk-codegen/src/test/kotlin/aws/sdk/kotlin/codegen/endpoints/BindAwsEndpointBuiltinsTest.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package aws.sdk.kotlin.codegen.endpoints
 
 import software.amazon.smithy.kotlin.codegen.core.KotlinWriter
diff --git a/codegen/protocol-tests/build.gradle.kts b/codegen/protocol-tests/build.gradle.kts
index 7064d116b31..06b31a2ef6c 100644
--- a/codegen/protocol-tests/build.gradle.kts
+++ b/codegen/protocol-tests/build.gradle.kts
@@ -73,63 +73,38 @@ dependencies {
     codegen(libs.smithy.aws.protocol.tests)
 }
 
-abstract class ProtocolTestTask @Inject constructor(private val project: Project) : DefaultTask() {
-    /**
-     * The projection
-     */
-    @get:Input
-    abstract val projectionName: Property<String>
-
-    /**
-     * The projection root directory
-     */
-    @get:Input
-    abstract val projectionRootDirectory: Property<String>
-
-    @TaskAction
-    fun runTests() {
-        val projectionRootDir = project.file(projectionRootDirectory.get())
-        println("[$projectionName] buildDir: $projectionRootDir")
-        if (!projectionRootDir.exists()) {
-            throw GradleException("$projectionRootDir does not exist")
-        }
-        val wrapper = if (System.getProperty("os.name").lowercase().contains("windows")) "gradlew.bat" else "gradlew"
-        val gradlew = project.rootProject.file(wrapper).absolutePath
-
-        // NOTE - this still requires us to publish to maven local.
-        project.exec {
-            workingDir = projectionRootDir
-            executable = gradlew
-            args = listOf("test")
-        }
-    }
-}
-
 smithyBuild.projections.forEach {
     val protocolName = it.name
 
-    tasks.register<ProtocolTestTask>("testProtocol-$protocolName") {
-        dependsOn(tasks.generateSmithyProjections)
-        group = "Verification"
-        projectionName.set(it.name)
-        projectionRootDirectory.set(smithyBuild.smithyKotlinProjectionPath(it.name).map { it.toString() })
-    }
+    val dirProvider = smithyBuild
+        .smithyKotlinProjectionPath(protocolName)
+        .map { file(it.toString()) }
 
-    // FIXME This is a hack to work around how protocol tests aren't in the actual service model and thus codegen
-    // separately from service customizations.
     val copyStaticFiles = tasks.register<Copy>("copyStaticFiles-$protocolName") {
         group = "codegen"
         from(rootProject.projectDir.resolve("services/$protocolName/common/src"))
-        into(smithyBuild.smithyKotlinProjectionSrcDir(it.name))
+        into(smithyBuild.smithyKotlinProjectionSrcDir(protocolName))
     }
 
-    tasks.generateSmithyProjections.configure {
-        finalizedBy(copyStaticFiles)
+    tasks.register<Exec>("testProtocol-$protocolName") {
+        group = "Verification"
+        dependsOn(tasks.generateSmithyProjections, copyStaticFiles)
+
+        doFirst {
+            val dir = dirProvider.get()
+            require(dir.exists()) { "$dir does not exist" }
+
+            val wrapper = if (System.getProperty("os.name").lowercase().contains("windows")) "gradlew.bat" else "gradlew"
+            val gradlew = rootProject.layout.projectDirectory.file(wrapper).asFile.absolutePath
+
+            workingDir = dir
+            executable = gradlew
+            args = listOf("test")
+        }
     }
 }
 
 tasks.register("testAllProtocols") {
     group = "Verification"
-    val allTests = tasks.withType<ProtocolTestTask>()
-    dependsOn(allTests)
+    dependsOn(tasks.matching { it.name.startsWith("testProtocol-") })
 }
diff --git a/examples/cloudwatch-logs-graalvm/src/main/kotlin/Main.kt b/examples/cloudwatch-logs-graalvm/src/main/kotlin/Main.kt
index 1b23bd43e36..5375a73eee5 100644
--- a/examples/cloudwatch-logs-graalvm/src/main/kotlin/Main.kt
+++ b/examples/cloudwatch-logs-graalvm/src/main/kotlin/Main.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package aws.sdk.kotlin.example
 
 import aws.sdk.kotlin.services.cloudwatchlogs.CloudWatchLogsClient
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index a3698519dff..7dc204bb4a1 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -4,7 +4,7 @@ ksp-version = "2.2.0-2.0.2" # Keep in sync with kotlin-version
 
 dokka-version = "2.0.0"
 
-aws-kotlin-repo-tools-version = "0.4.36"
+aws-kotlin-repo-tools-version = "0.4.49"
 
 # libs
 coroutines-version = "1.10.2"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index bf3beeb7dd3..4ba2524eb95 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https://services.gradle.org/distributions/gradle-8.14.2-bin.zip
+distributionUrl=https://services.gradle.org/distributions/gradle-9.0.0-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/hll/dynamodb-mapper/dynamodb-mapper-codegen/src/main/kotlin/aws/sdk/kotlin/hll/dynamodbmapper/codegen/model/MapperTypes.kt b/hll/dynamodb-mapper/dynamodb-mapper-codegen/src/main/kotlin/aws/sdk/kotlin/hll/dynamodbmapper/codegen/model/MapperTypes.kt
index 6b8d38c2fca..06860dbf113 100644
--- a/hll/dynamodb-mapper/dynamodb-mapper-codegen/src/main/kotlin/aws/sdk/kotlin/hll/dynamodbmapper/codegen/model/MapperTypes.kt
+++ b/hll/dynamodb-mapper/dynamodb-mapper-codegen/src/main/kotlin/aws/sdk/kotlin/hll/dynamodbmapper/codegen/model/MapperTypes.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package aws.sdk.kotlin.hll.dynamodbmapper.codegen.model
 
 import aws.sdk.kotlin.hll.codegen.model.Type
diff --git a/hll/dynamodb-mapper/dynamodb-mapper-ops-codegen/build.gradle.kts b/hll/dynamodb-mapper/dynamodb-mapper-ops-codegen/build.gradle.kts
index 32160f166e1..6806b439851 100644
--- a/hll/dynamodb-mapper/dynamodb-mapper-ops-codegen/build.gradle.kts
+++ b/hll/dynamodb-mapper/dynamodb-mapper-ops-codegen/build.gradle.kts
@@ -1,3 +1,8 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 /*
 * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
diff --git a/hll/dynamodb-mapper/dynamodb-mapper-schema-codegen/build.gradle.kts b/hll/dynamodb-mapper/dynamodb-mapper-schema-codegen/build.gradle.kts
index b5a14e2a01e..202f5a60899 100644
--- a/hll/dynamodb-mapper/dynamodb-mapper-schema-codegen/build.gradle.kts
+++ b/hll/dynamodb-mapper/dynamodb-mapper-schema-codegen/build.gradle.kts
@@ -1,3 +1,8 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 /*
 * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
diff --git a/hll/dynamodb-mapper/dynamodb-mapper-schema-codegen/src/main/kotlin/aws/sdk/kotlin/hll/dynamodbmapper/codegen/annotations/AnnotationsProcessorOptions.kt b/hll/dynamodb-mapper/dynamodb-mapper-schema-codegen/src/main/kotlin/aws/sdk/kotlin/hll/dynamodbmapper/codegen/annotations/AnnotationsProcessorOptions.kt
index aa8954422a9..308e29e4ff9 100644
--- a/hll/dynamodb-mapper/dynamodb-mapper-schema-codegen/src/main/kotlin/aws/sdk/kotlin/hll/dynamodbmapper/codegen/annotations/AnnotationsProcessorOptions.kt
+++ b/hll/dynamodb-mapper/dynamodb-mapper-schema-codegen/src/main/kotlin/aws/sdk/kotlin/hll/dynamodbmapper/codegen/annotations/AnnotationsProcessorOptions.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package aws.sdk.kotlin.hll.dynamodbmapper.codegen.annotations
 
 import aws.smithy.kotlin.runtime.collections.AttributeKey
diff --git a/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/main/kotlin/aws/sdk/kotlin/hll/dynamodbmapper/plugins/SchemaGeneratorPluginExtension.kt b/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/main/kotlin/aws/sdk/kotlin/hll/dynamodbmapper/plugins/SchemaGeneratorPluginExtension.kt
index 590d848e463..ba317f015e9 100644
--- a/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/main/kotlin/aws/sdk/kotlin/hll/dynamodbmapper/plugins/SchemaGeneratorPluginExtension.kt
+++ b/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/main/kotlin/aws/sdk/kotlin/hll/dynamodbmapper/plugins/SchemaGeneratorPluginExtension.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package aws.sdk.kotlin.hll.dynamodbmapper.plugins
 
 import aws.sdk.kotlin.hll.codegen.rendering.Visibility
diff --git a/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/kotlin/aws/sdk/kotlin/hll/dynamodbmapper/plugins/SchemaGeneratorPluginTest.kt b/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/kotlin/aws/sdk/kotlin/hll/dynamodbmapper/plugins/SchemaGeneratorPluginTest.kt
index 42601bebbeb..ac261b9fb4f 100644
--- a/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/kotlin/aws/sdk/kotlin/hll/dynamodbmapper/plugins/SchemaGeneratorPluginTest.kt
+++ b/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/kotlin/aws/sdk/kotlin/hll/dynamodbmapper/plugins/SchemaGeneratorPluginTest.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package aws.sdk.kotlin.hll.dynamodbmapper.plugins
 
 import org.gradle.testkit.runner.GradleRunner
diff --git a/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/resources/BuilderNotRequired.kt b/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/resources/BuilderNotRequired.kt
index 2861b2c8f6d..b4901ccc67a 100644
--- a/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/resources/BuilderNotRequired.kt
+++ b/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/resources/BuilderNotRequired.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package org.example
 
 import aws.sdk.kotlin.hll.dynamodbmapper.DynamoDbAttribute
diff --git a/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/resources/IgnoredProperty.kt b/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/resources/IgnoredProperty.kt
index ff9c091258a..28a3a5b7500 100644
--- a/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/resources/IgnoredProperty.kt
+++ b/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/resources/IgnoredProperty.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package org.example
 
 import aws.sdk.kotlin.hll.dynamodbmapper.DynamoDbAttribute
diff --git a/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/resources/RenamedPartitionKey.kt b/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/resources/RenamedPartitionKey.kt
index e507c9af815..78a04a2cd49 100644
--- a/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/resources/RenamedPartitionKey.kt
+++ b/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/resources/RenamedPartitionKey.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package org.example
 
 import aws.sdk.kotlin.hll.dynamodbmapper.DynamoDbAttribute
diff --git a/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/resources/User.kt b/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/resources/User.kt
index 65cbdea0620..1dfbc76281b 100644
--- a/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/resources/User.kt
+++ b/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/resources/User.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package org.example
 
 import aws.sdk.kotlin.hll.dynamodbmapper.DynamoDbAttribute
diff --git a/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/resources/custom-item-converter/CustomItemConverter.kt b/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/resources/custom-item-converter/CustomItemConverter.kt
index abe58305992..0cbe80001a2 100644
--- a/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/resources/custom-item-converter/CustomItemConverter.kt
+++ b/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/resources/custom-item-converter/CustomItemConverter.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package my.custom.item.converter
 
 import aws.sdk.kotlin.hll.dynamodbmapper.items.AttributeDescriptor
diff --git a/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/resources/custom-item-converter/CustomUser.kt b/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/resources/custom-item-converter/CustomUser.kt
index 75fe3234cdb..b47aca28c04 100644
--- a/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/resources/custom-item-converter/CustomUser.kt
+++ b/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/resources/custom-item-converter/CustomUser.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package org.example
 
 import aws.sdk.kotlin.hll.dynamodbmapper.DynamoDbItem
diff --git a/hll/dynamodb-mapper/dynamodb-mapper/build.gradle.kts b/hll/dynamodb-mapper/dynamodb-mapper/build.gradle.kts
index 53ad4cd2875..a8f3af51954 100644
--- a/hll/dynamodb-mapper/dynamodb-mapper/build.gradle.kts
+++ b/hll/dynamodb-mapper/dynamodb-mapper/build.gradle.kts
@@ -113,7 +113,7 @@ if (project.NATIVE_ENABLED) {
         }
     }
 
-    listOf("jvmSourcesJar", "metadataSourcesJar").forEach {
+    listOf("jvmSourcesJar", "metadataSourcesJar", "jvmProcessResources").forEach {
         tasks.named(it) {
             dependsOn(moveGenSrc)
         }
diff --git a/hll/dynamodb-mapper/dynamodb-mapper/jvm/test/aws/sdk/kotlin/hll/dynamodbmapper/operations/PaginatedScanTest.kt b/hll/dynamodb-mapper/dynamodb-mapper/jvm/test/aws/sdk/kotlin/hll/dynamodbmapper/operations/PaginatedScanTest.kt
index 17870798ee9..71acfb4034d 100644
--- a/hll/dynamodb-mapper/dynamodb-mapper/jvm/test/aws/sdk/kotlin/hll/dynamodbmapper/operations/PaginatedScanTest.kt
+++ b/hll/dynamodb-mapper/dynamodb-mapper/jvm/test/aws/sdk/kotlin/hll/dynamodbmapper/operations/PaginatedScanTest.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package aws.sdk.kotlin.hll.dynamodbmapper.operations
 
 import aws.sdk.kotlin.hll.dynamodbmapper.items.*
diff --git a/hll/hll-codegen/build.gradle.kts b/hll/hll-codegen/build.gradle.kts
index 12769452a1f..19c65cade4b 100644
--- a/hll/hll-codegen/build.gradle.kts
+++ b/hll/hll-codegen/build.gradle.kts
@@ -30,11 +30,7 @@ dependencies {
     api(project(":aws-runtime:aws-core"))
     implementation(libs.ksp.api)
     implementation(libs.smithy.kotlin.runtime.core)
-
-    testImplementation(libs.junit.jupiter)
-    testImplementation(libs.junit.jupiter.params)
-    testImplementation(libs.kotest.assertions.core.jvm)
-    testImplementation(libs.kotlin.test.junit5)
+    testImplementation(kotlin("test"))
 }
 
 val sourcesJar by tasks.creating(Jar::class) {
diff --git a/hll/hll-codegen/src/main/kotlin/aws/sdk/kotlin/hll/codegen/model/Types.kt b/hll/hll-codegen/src/main/kotlin/aws/sdk/kotlin/hll/codegen/model/Types.kt
index 64400b17a79..ec38a7405f3 100644
--- a/hll/hll-codegen/src/main/kotlin/aws/sdk/kotlin/hll/codegen/model/Types.kt
+++ b/hll/hll-codegen/src/main/kotlin/aws/sdk/kotlin/hll/codegen/model/Types.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package aws.sdk.kotlin.hll.codegen.model
 
 import aws.sdk.kotlin.runtime.InternalSdkApi
diff --git a/hll/hll-codegen/src/main/kotlin/aws/sdk/kotlin/hll/codegen/rendering/BuilderRenderer.kt b/hll/hll-codegen/src/main/kotlin/aws/sdk/kotlin/hll/codegen/rendering/BuilderRenderer.kt
index d14733105f4..0bf676c1fb6 100644
--- a/hll/hll-codegen/src/main/kotlin/aws/sdk/kotlin/hll/codegen/rendering/BuilderRenderer.kt
+++ b/hll/hll-codegen/src/main/kotlin/aws/sdk/kotlin/hll/codegen/rendering/BuilderRenderer.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package aws.sdk.kotlin.hll.codegen.rendering
 
 import aws.sdk.kotlin.hll.codegen.core.CodeGenerator
@@ -65,7 +70,9 @@ public class BuilderRenderer(
     private fun renderProperty(member: Member) {
         val dslInfo = member.dslInfo
 
-        if (dslInfo != null) blankLine()
+        if (dslInfo != null) {
+            blankLine()
+        }
 
         write("#Lvar #L: #T = null", ctx.attributes.visibility, member.name, member.type.nullable())
 
diff --git a/hll/hll-codegen/src/main/kotlin/aws/sdk/kotlin/hll/codegen/rendering/RenderOptions.kt b/hll/hll-codegen/src/main/kotlin/aws/sdk/kotlin/hll/codegen/rendering/RenderOptions.kt
index 514988feee5..fa062084e59 100644
--- a/hll/hll-codegen/src/main/kotlin/aws/sdk/kotlin/hll/codegen/rendering/RenderOptions.kt
+++ b/hll/hll-codegen/src/main/kotlin/aws/sdk/kotlin/hll/codegen/rendering/RenderOptions.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package aws.sdk.kotlin.hll.codegen.rendering
 
 import aws.smithy.kotlin.runtime.collections.AttributeKey
diff --git a/hll/hll-codegen/src/test/kotlin/aws/sdk/kotlin/hll/codegen/core/TemplateEngineTest.kt b/hll/hll-codegen/src/test/kotlin/aws/sdk/kotlin/hll/codegen/core/TemplateEngineTest.kt
index c853b989f7f..d4c87b7ca40 100644
--- a/hll/hll-codegen/src/test/kotlin/aws/sdk/kotlin/hll/codegen/core/TemplateEngineTest.kt
+++ b/hll/hll-codegen/src/test/kotlin/aws/sdk/kotlin/hll/codegen/core/TemplateEngineTest.kt
@@ -4,8 +4,8 @@
  */
 package aws.sdk.kotlin.hll.codegen.core
 
-import org.junit.jupiter.api.Assertions.assertEquals
-import org.junit.jupiter.api.Test
+import kotlin.test.Test
+import kotlin.test.assertEquals
 import kotlin.test.assertFailsWith
 
 class TemplateEngineTest {
diff --git a/hll/hll-codegen/src/test/kotlin/aws/sdk/kotlin/hll/codegen/core/TemplateProcessorTest.kt b/hll/hll-codegen/src/test/kotlin/aws/sdk/kotlin/hll/codegen/core/TemplateProcessorTest.kt
index ffc793866f7..36beab13464 100644
--- a/hll/hll-codegen/src/test/kotlin/aws/sdk/kotlin/hll/codegen/core/TemplateProcessorTest.kt
+++ b/hll/hll-codegen/src/test/kotlin/aws/sdk/kotlin/hll/codegen/core/TemplateProcessorTest.kt
@@ -6,9 +6,9 @@ package aws.sdk.kotlin.hll.codegen.core
 
 import aws.sdk.kotlin.hll.codegen.model.TypeRef
 import aws.sdk.kotlin.hll.codegen.model.TypeVar
-import org.junit.jupiter.api.Assertions.assertEquals
-import org.junit.jupiter.api.Test
+import kotlin.test.Test
 import kotlin.test.assertContains
+import kotlin.test.assertEquals
 
 class TemplateProcessorTest {
     @Test
diff --git a/hll/hll-codegen/src/test/kotlin/aws/sdk/kotlin/hll/codegen/util/StringsTest.kt b/hll/hll-codegen/src/test/kotlin/aws/sdk/kotlin/hll/codegen/util/StringsTest.kt
index c2f85036c6d..b630ce18956 100644
--- a/hll/hll-codegen/src/test/kotlin/aws/sdk/kotlin/hll/codegen/util/StringsTest.kt
+++ b/hll/hll-codegen/src/test/kotlin/aws/sdk/kotlin/hll/codegen/util/StringsTest.kt
@@ -4,8 +4,8 @@
  */
 package aws.sdk.kotlin.hll.codegen.util
 
-import org.junit.jupiter.api.Assertions.assertEquals
-import org.junit.jupiter.api.Test
+import kotlin.test.Test
+import kotlin.test.assertEquals
 
 class StringsTest {
     @Test
diff --git a/hll/hll-mapping-core/build.gradle.kts b/hll/hll-mapping-core/build.gradle.kts
index b7c2dc41027..7f3f61454d1 100644
--- a/hll/hll-mapping-core/build.gradle.kts
+++ b/hll/hll-mapping-core/build.gradle.kts
@@ -1,3 +1,8 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 import aws.sdk.kotlin.gradle.kmp.kotlin
 
 /*
diff --git a/services/bedrock/common/test/aws/sdk/kotlin/services/bedrock/BedrockEnvironmentBearerTokenTest.kt b/services/bedrock/common/test/aws/sdk/kotlin/services/bedrock/BedrockEnvironmentBearerTokenTest.kt
index 19a2a351c11..28b12cb9bf4 100644
--- a/services/bedrock/common/test/aws/sdk/kotlin/services/bedrock/BedrockEnvironmentBearerTokenTest.kt
+++ b/services/bedrock/common/test/aws/sdk/kotlin/services/bedrock/BedrockEnvironmentBearerTokenTest.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package aws.sdk.kotlin.services.bedrock
 
 import aws.sdk.kotlin.services.bedrock.auth.finalizeBearerTokenConfig
@@ -25,8 +30,8 @@ import kotlin.test.assertNotNull
 import kotlin.test.assertTrue
 
 class BedrockEnvironmentBearerTokenTest {
-    private fun mockHttpClient(handler: (HttpRequest) -> HttpResponse): HttpClientEngine {
-        return object : HttpClientEngineBase("test engine") {
+    private fun mockHttpClient(handler: (HttpRequest) -> HttpResponse): HttpClientEngine =
+        object : HttpClientEngineBase("test engine") {
             override val config: HttpClientEngineConfig = HttpClientEngineConfig.Default
 
             override suspend fun roundTrip(context: ExecutionContext, request: HttpRequest): HttpCall {
@@ -34,7 +39,6 @@ class BedrockEnvironmentBearerTokenTest {
                 return HttpCall(request, response, Instant.now(), Instant.now())
             }
         }
-    }
 
     private val mockPlatformProvider = TestPlatformProvider(
         env = mapOf("AWS_BEARER_TOKEN_BEDROCK" to "bedrock-token"),
diff --git a/services/route53/e2eTest/src/Route53UriTest.kt b/services/route53/e2eTest/src/Route53UriTest.kt
index 6ec9e6ac25d..0d9de9b4a66 100644
--- a/services/route53/e2eTest/src/Route53UriTest.kt
+++ b/services/route53/e2eTest/src/Route53UriTest.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package aws.sdk.kotlin.services.route53
 
 import aws.sdk.kotlin.runtime.auth.credentials.StaticCredentialsProvider
diff --git a/services/s3/e2eTest/src/S3ChecksumTest.kt b/services/s3/e2eTest/src/S3ChecksumTest.kt
index cf0df9ba826..e5814d2dcc8 100644
--- a/services/s3/e2eTest/src/S3ChecksumTest.kt
+++ b/services/s3/e2eTest/src/S3ChecksumTest.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package aws.sdk.kotlin.e2etest
 
 import aws.sdk.kotlin.e2etest.S3TestUtils.deleteBucketContents
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 6dc165db0f0..826adedd84d 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -30,6 +30,13 @@ dependencyResolutionManagement {
     repositories {
         mavenLocal()
         mavenCentral()
+        maven {
+            name = "kotlinRepoTools"
+            url = java.net.URI("https://d2gys1nrxnjnyg.cloudfront.net/releases")
+            content {
+                includeGroupByRegex("""aws\.sdk\.kotlin.*""")
+            }
+        }
     }
 }
 
@@ -80,7 +87,6 @@ if ("dynamodb".isBootstrappedService) {
     include(":hll:dynamodb-mapper:dynamodb-mapper-schema-codegen")
     include(":hll:dynamodb-mapper:dynamodb-mapper-annotations")
     include(":hll:dynamodb-mapper:dynamodb-mapper-schema-generator-plugin")
-    include(":hll:dynamodb-mapper:tests:dynamodb-mapper-schema-generator-plugin-test")
 } else {
     logger.warn(":services:dynamodb is not bootstrapped, skipping :hll:dynamodb-mapper and subprojects")
 }
diff --git a/tests/codegen/build.gradle.kts b/tests/codegen/build.gradle.kts
index ecdae5f6ccc..c193c20c26d 100644
--- a/tests/codegen/build.gradle.kts
+++ b/tests/codegen/build.gradle.kts
@@ -1,3 +1,8 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 import aws.sdk.kotlin.gradle.codegen.dsl.generateSmithyProjections
 
 plugins {
diff --git a/tests/codegen/checksums/build.gradle.kts b/tests/codegen/checksums/build.gradle.kts
index 6e7795fe4a6..a15cd29fe02 100644
--- a/tests/codegen/checksums/build.gradle.kts
+++ b/tests/codegen/checksums/build.gradle.kts
@@ -1,3 +1,7 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 import aws.sdk.kotlin.gradle.codegen.dsl.smithyKotlinPlugin
 import aws.sdk.kotlin.gradle.codegen.smithyKotlinProjectionSrcDir
@@ -6,12 +10,10 @@ import aws.sdk.kotlin.tests.codegen.Model
 
 description = "AWS SDK for Kotlin's checksums codegen test suite"
 
-val tests = listOf(
-    CodegenTest("checksums", Model("checksums.smithy"), "aws.sdk.kotlin.test#TestService"),
-)
-
 smithyBuild {
-    this@Build_gradle.tests.forEach { test ->
+    listOf(
+        CodegenTest("checksums", Model("checksums.smithy"), "aws.sdk.kotlin.test#TestService"),
+    ).forEach { test ->
         projections.register(test.name) {
             imports = listOf(layout.projectDirectory.file(test.model.path + test.model.fileName).asFile.absolutePath)
             smithyKotlinPlugin {