diff --git a/codegen-lite-maven-plugin/pom.xml b/codegen-lite-maven-plugin/pom.xml
index b2f7be3ca9bd..c791426b3dd7 100644
--- a/codegen-lite-maven-plugin/pom.xml
+++ b/codegen-lite-maven-plugin/pom.xml
@@ -74,10 +74,6 @@
maven-project
org.apache.maven
-
- plexus-utils
- org.codehaus.plexus
-
diff --git a/codegen-maven-plugin/pom.xml b/codegen-maven-plugin/pom.xml
index f515e900f11f..121770e30dc8 100644
--- a/codegen-maven-plugin/pom.xml
+++ b/codegen-maven-plugin/pom.xml
@@ -79,10 +79,6 @@
maven-project
org.apache.maven
-
- plexus-utils
- org.codehaus.plexus
-
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/builder/BaseClientBuilderInterface.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/builder/BaseClientBuilderInterface.java
index 78ec1bc7e301..76f54a666f7d 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/builder/BaseClientBuilderInterface.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/builder/BaseClientBuilderInterface.java
@@ -73,11 +73,14 @@ public TypeSpec poetSpec() {
builder.addMethod(serviceConfigurationConsumerBuilderMethod());
}
- if (hasClientContextParams() && endpointRulesSpecUtils.isEndpointRulesEnabled()) {
+ if (endpointRulesSpecUtils.isEndpointRulesEnabled()) {
builder.addMethod(endpointProviderMethod());
- model.getClientContextParams().forEach((n, m) -> {
- builder.addMethod(clientContextParamSetter(n, m));
- });
+
+ if (hasClientContextParams()) {
+ model.getClientContextParams().forEach((n, m) -> {
+ builder.addMethod(clientContextParamSetter(n, m));
+ });
+ }
}
if (generateTokenProviderMethod()) {
diff --git a/pom.xml b/pom.xml
index 7a692a47cf43..fee60d48d18a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -489,7 +489,9 @@
org.junit.vintage:*
software.amazon.awssdk:aws-sdk-java
- org.codehaus.plexus:plexus-utils
+ software.amazon.awssdk:json-utils
+ software.amazon.awssdk:endpoints-spi
+ software.amazon.awssdk:aws-sdk-java
diff --git a/services/eventbridge/pom.xml b/services/eventbridge/pom.xml
index 15ab3075cb38..5d53f8b3c62d 100644
--- a/services/eventbridge/pom.xml
+++ b/services/eventbridge/pom.xml
@@ -56,6 +56,16 @@
aws-json-protocol
${awsjavasdk.version}
+
+ software.amazon.awssdk
+ json-utils
+ ${awsjavasdk.version}
+
+
+ software.amazon.awssdk
+ endpoints-spi
+ ${awsjavasdk.version}
+
software.amazon.awssdk
diff --git a/services/pom.xml b/services/pom.xml
index 9dae8f53b04b..dfbe8b788157 100644
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -368,11 +368,6 @@
http-client-spi
${awsjavasdk.version}
-
- software.amazon.awssdk
- endpoints-spi
- ${awsjavasdk.version}
-
software.amazon.awssdk
regions
@@ -388,11 +383,6 @@
utils
${awsjavasdk.version}
-
- software.amazon.awssdk
- json-utils
- ${awsjavasdk.version}
-
aws-core
software.amazon.awssdk
diff --git a/services/s3/pom.xml b/services/s3/pom.xml
index e31ca32aced0..ebf70c1e6ee5 100644
--- a/services/s3/pom.xml
+++ b/services/s3/pom.xml
@@ -75,6 +75,16 @@
profiles
${awsjavasdk.version}
+
+ software.amazon.awssdk
+ json-utils
+ ${awsjavasdk.version}
+
+
+ software.amazon.awssdk
+ endpoints-spi
+ ${awsjavasdk.version}
+
software.amazon.awssdk.crt
aws-crt
diff --git a/services/s3control/pom.xml b/services/s3control/pom.xml
index 7a9050ce1096..bca0e0c7e93e 100644
--- a/services/s3control/pom.xml
+++ b/services/s3control/pom.xml
@@ -71,6 +71,16 @@
profiles
${awsjavasdk.version}
+
+ software.amazon.awssdk
+ json-utils
+ ${awsjavasdk.version}
+
+
+ software.amazon.awssdk
+ endpoints-spi
+ ${awsjavasdk.version}
+
commons-io