From cddce44c0ae724840b6d1d508e806ecca64c09ef Mon Sep 17 00:00:00 2001
From: Zoe Wang <33073555+zoewangg@users.noreply.github.com>
Date: Wed, 26 Oct 2022 21:43:26 -0700
Subject: [PATCH] Fix build

---
 .../poet/builder/BaseClientBuilderInterface.java      | 11 +++++++----
 pom.xml                                               |  4 +++-
 services/eventbridge/pom.xml                          | 10 ++++++++++
 services/pom.xml                                      | 10 ----------
 services/s3/pom.xml                                   | 10 ++++++++++
 services/s3control/pom.xml                            | 10 ++++++++++
 6 files changed, 40 insertions(+), 15 deletions(-)

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 @@
                         <ignoredUnusedDeclaredDependency>org.junit.vintage:*</ignoredUnusedDeclaredDependency>
                         <ignoredUnusedDeclaredDependency>software.amazon.awssdk:aws-sdk-java</ignoredUnusedDeclaredDependency>
                         <!-- Declared by the codegen maven plugins (lite and normal). Not used directly but used to override a transitive dependecy -->
-                        <ignoredUnusedDeclaredDependency>org.codehaus.plexus:plexus-utils</ignoredUnusedDeclaredDependency>
+                        <ignoredUnusedDeclaredDependency>software.amazon.awssdk:json-utils</ignoredUnusedDeclaredDependency>
+                        <ignoredUnusedDeclaredDependency>software.amazon.awssdk:endpoints-spi</ignoredUnusedDeclaredDependency>
+                        <ignoredUnusedDeclaredDependency>software.amazon.awssdk:aws-sdk-java</ignoredUnusedDeclaredDependency>
                     </ignoredUnusedDeclaredDependencies>
                 </configuration>
             </plugin>
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 @@
             <artifactId>aws-json-protocol</artifactId>
             <version>${awsjavasdk.version}</version>
         </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>json-utils</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>endpoints-spi</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
         <!-- Test Dependencies -->
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
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 @@
             <artifactId>http-client-spi</artifactId>
             <version>${awsjavasdk.version}</version>
         </dependency>
-        <dependency>
-            <groupId>software.amazon.awssdk</groupId>
-            <artifactId>endpoints-spi</artifactId>
-            <version>${awsjavasdk.version}</version>
-        </dependency>
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>regions</artifactId>
@@ -388,11 +383,6 @@
             <artifactId>utils</artifactId>
             <version>${awsjavasdk.version}</version>
         </dependency>
-        <dependency>
-            <groupId>software.amazon.awssdk</groupId>
-            <artifactId>json-utils</artifactId>
-            <version>${awsjavasdk.version}</version>
-        </dependency>
         <dependency>
             <artifactId>aws-core</artifactId>
             <groupId>software.amazon.awssdk</groupId>
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 @@
             <artifactId>profiles</artifactId>
             <version>${awsjavasdk.version}</version>
         </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>json-utils</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>endpoints-spi</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
         <dependency>
             <groupId>software.amazon.awssdk.crt</groupId>
             <artifactId>aws-crt</artifactId>
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 @@
             <artifactId>profiles</artifactId>
             <version>${awsjavasdk.version}</version>
         </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>json-utils</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>endpoints-spi</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
         <!-- Test Dependencies -->
         <dependency>
             <artifactId>commons-io</artifactId>