Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yefrig merged 2 commits into from
Apr 17, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
22c31b5
Bump org.mock-server:mockserver-netty from 3.10.8 to 5.15.0
dependabot[bot] Apr 14, 2025
6261195
Fix breaking change introduced by major version upgrade of mockserver
yefrig Apr 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ prettier4j = "0.1.1"
maven-resolver-provider = "3.8.6"
maven-resolver = "1.9.2"
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.5"
Expand Down
17 changes: 7 additions & 10 deletions smithy-cli/src/it/java/software/amazon/smithy/cli/MavenResolverTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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")
Expand Down Expand Up @@ -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")
Expand Down
Loading