Skip to content
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

All: Wiremock 3.x #25

Merged
merged 1 commit into from
Sep 29, 2023
Merged

All: Wiremock 3.x #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ services:

wiremock:
container_name: wiremock
image: wiremock/wiremock:2.35.0
image: wiremock/wiremock:3.0.0-1
ports:
- "8888:8080"
command: [ "--async-response-enabled=true", "--no-request-journal" ]
Expand Down
4 changes: 2 additions & 2 deletions dropwizard-app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ dependencies {

testImplementation 'io.dropwizard:dropwizard-testing'
testImplementation project(":common-wiremock")
// TODO switch to wiremock 3 after https://github.com/wiremock/wiremock/issues/1967
testImplementation 'com.github.tomakehurst:wiremock-jre8-standalone:2.35.0'
testImplementation 'org.wiremock:wiremock:3.2.0'
testImplementation 'com.google.code.findbugs:jsr305:3.0.2' //TODO research - dep should be transitive from wiremock
testImplementation 'org.testcontainers:testcontainers:1.17.6'
testImplementation 'org.testcontainers:junit-jupiter:1.17.6'
testImplementation 'org.testcontainers:postgresql:1.17.6'
Expand Down
2 changes: 1 addition & 1 deletion dropwizard-app/src/test/java/bitxon/dropwizard/test/AbstractDropwizardTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ abstract class AbstractDropwizardTest {
.withUsername("postgres")
.withPassword("postgres")
.withInitScript("sql/db-test-data.sql");
static GenericContainer WIREMOCK = new GenericContainer("wiremock/wiremock:2.35.0")
static GenericContainer WIREMOCK = new GenericContainer("wiremock/wiremock:3.0.0-1")
.withExposedPorts(8080)
.withCopyFileToContainer(MountableFile.forClasspathResource("stubs"), "/home/wiremock")
.waitingFor(Wait
Expand Down
2 changes: 1 addition & 1 deletion micronaut-app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ dependencies {
testImplementation("org.testcontainers:postgresql")
testImplementation("org.testcontainers:testcontainers")
testImplementation project(":common-wiremock")
testImplementation("com.github.tomakehurst:wiremock-jre8:2.35.0")
testImplementation("org.wiremock:wiremock:3.2.0")
testImplementation("org.junit.jupiter:junit-jupiter-params")
}

Expand Down
2 changes: 1 addition & 1 deletion micronaut-app/src/test/java/bitxon/micronaut/test/AbstractMicronautTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ abstract class AbstractMicronautTest implements TestPropertyProvider {
.withUsername("postgres")
.withPassword("postgres")
.withInitScript("sql/db-test-data.sql");
static GenericContainer WIREMOCK = new GenericContainer("wiremock/wiremock:2.35.0")
static GenericContainer WIREMOCK = new GenericContainer("wiremock/wiremock:3.0.0-1")
.withExposedPorts(8080)
.withCopyFileToContainer(MountableFile.forClasspathResource("stubs"), "/home/wiremock")
.waitingFor(Wait
Expand Down
2 changes: 1 addition & 1 deletion quarkus-app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ dependencies {
testImplementation 'org.testcontainers:junit-jupiter'
testImplementation 'org.testcontainers:postgresql'
testImplementation 'org.testcontainers:testcontainers'
testImplementation 'com.github.tomakehurst:wiremock-jre8:2.35.0'
testImplementation 'org.wiremock:wiremock:3.2.0'
testImplementation project(":common-wiremock")
}

Expand Down
2 changes: 1 addition & 1 deletion quarkus-app/src/test/java/bitxon/quarkus/test/ext/WiremockTestResourceLifecycleManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public class WiremockTestResourceLifecycleManager implements QuarkusTestResource

@Override
public void init(Map<String, String> initArgs) {
wiremockContainer = new GenericContainer("wiremock/wiremock:2.35.0")
wiremockContainer = new GenericContainer("wiremock/wiremock:3.0.0-1")
.withExposedPorts(8080)
.withCopyFileToContainer(MountableFile.forClasspathResource("stubs"), "/home/wiremock")
.waitingFor(Wait
Expand Down
2 changes: 1 addition & 1 deletion spring-app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ dependencies {
testImplementation 'org.springframework.boot:spring-boot-starter-test'
testImplementation 'org.springframework.boot:spring-boot-testcontainers'
testImplementation project(":common-wiremock")
testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock'
testImplementation 'org.wiremock:wiremock:3.2.0'
testImplementation 'org.testcontainers:postgresql'
testImplementation 'io.rest-assured:rest-assured'
}
Expand Down
2 changes: 1 addition & 1 deletion spring-app/src/test/java/bitxon/spring/test/ext/TestcontainersConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public PostgreSQLContainer postgreSQLContainer() {

@Bean
public GenericContainer wiremockContainer(DynamicPropertyRegistry registry) {
var container = new GenericContainer("wiremock/wiremock:2.35.0")
var container = new GenericContainer("wiremock/wiremock:3.0.0-1")
.withExposedPorts(8080)
.withCopyFileToContainer(MountableFile.forClasspathResource("stubs"), "/home/wiremock")
.waitingFor(Wait
Expand Down
Loading