Bump org.mock-server:mockserver-netty from 3.10.8 to 5.15.0 (#2588)

* Bump org.mock-server:mockserver-netty from 3.10.8 to 5.15.0

Bumps [org.mock-server:mockserver-netty](https://github.com/jamesdbloom/mockservice) from 3.10.8 to 5.15.0.
- [Changelog](https://github.com/mock-server/mockserver/blob/master/changelog.md)
- [Commits](mock-server/mockserver-monorepo@mockserver-3.10.8...mockserver-5.15.0)

---
updated-dependencies:
- dependency-name: org.mock-server:mockserver-netty
  dependency-version: 5.15.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* Fix breaking change introduced by major version upgrade of mockserver

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Yefri Gaitan <34199474+yefrig@users.noreply.github.com>

Author: dependabot[bot]

gradle/libs.versions.toml

@@ -10,7 +10,7 @@ prettier4j = "0.3.0"
 maven-resolver-provider = "3.9.9"
 maven-resolver = "1.9.22"
 slf4j = "1.7.36"
-mockserver = "3.10.8"
+mockserver = "5.15.0"
 compile-testing = "0.21.0"
 json-schema = "1.12.1"
 shadow = "8.3.6"

smithy-cli/src/it/java/software/amazon/smithy/cli/MavenResolverTest.java

@@ -9,8 +9,6 @@
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.not;
-import static org.mockserver.integration.ClientAndProxy.startClientAndProxy;
-import static org.mockserver.integration.ClientAndServer.startClientAndServer;
 
 import java.io.File;
 import java.io.IOException;
@@ -19,7 +17,6 @@
 import java.util.Collections;
 import java.util.Map;
 import org.junit.jupiter.api.Test;
-import org.mockserver.integration.ClientAndProxy;
 import org.mockserver.integration.ClientAndServer;
 import org.mockserver.model.HttpRequest;
 import org.mockserver.model.HttpResponse;
@@ -77,7 +74,7 @@ public void failsWhenBadVersionRequested() {
     public void usesCustomRepoWithAuth() {
         ClientAndServer mockServer = null;
         try {
-            mockServer = startClientAndServer(1234);
+            mockServer = ClientAndServer.startClientAndServer(1234);
             mockServer.when(
                     HttpRequest
                             .request()
@@ -120,10 +117,10 @@ public void usesCustomRepoWithAuth() {
     @Test
     public void usesProxyConfiguration() {
         ClientAndServer mockServer = null;
-        ClientAndProxy proxyServer = null;
+        ClientAndServer proxyServer = null;
         try {
-            mockServer = startClientAndServer(1234);
-            proxyServer = startClientAndProxy(2323);
+            mockServer = ClientAndServer.startClientAndServer(1234);
+            proxyServer = ClientAndServer.startClientAndServer(2323);
 
             HttpRequest request = HttpRequest.request()
                     .withMethod("GET")
@@ -162,10 +159,10 @@ public void usesProxyConfiguration() {
     @Test
     public void usesProxyConfigurationFromEnv() {
         ClientAndServer mockServer = null;
-        ClientAndProxy proxyServer = null;
+        ClientAndServer proxyServer = null;
         try {
-            mockServer = startClientAndServer(1234);
-            proxyServer = startClientAndProxy(2323);
+            mockServer = ClientAndServer.startClientAndServer(1234);
+            proxyServer = ClientAndServer.startClientAndServer(2323);
 
             HttpRequest request = HttpRequest.request()
                     .withMethod("GET")