Skip to content

Commit

Permalink
Use wiremock-jetty12 thin JAR instead of the standalone JAR (#66)
Browse files Browse the repository at this point in the history
Switched to using wiremock-jetty12 instead of the standalone JAR
  • Loading branch information
tomakehurst authored Dec 2, 2024
1 parent dd1186e commit 4ed94e6
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 6 deletions.
17 changes: 12 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,25 @@ apply plugin: "org.wiremock.tools.gradle.wiremock-extension-convention"
group 'org.wiremock.integrations'

// Because older version is set in wiremock-extension-convention
def wiremockVersion = "3.9.2"
def wiremockVersion = "3.10.0"

configurations {
all*.exclude group: 'org.eclipse.jetty', module: 'jetty-servlet'
all*.exclude group: 'org.eclipse.jetty', module: 'jetty-servlets'
all*.exclude group: 'org.eclipse.jetty', module: 'jetty-webapp'
all*.exclude group: 'org.eclipse.jetty.http2', module: 'http2-server'
}

dependencies {
api "org.wiremock:wiremock-standalone:${wiremockVersion}"
compileOnly "org.wiremock:wiremock:${wiremockVersion}"
shadow "org.wiremock:wiremock:${wiremockVersion}"
implementation platform("org.eclipse.jetty:jetty-bom:12.0.15")
api "org.wiremock:wiremock-jetty12:${wiremockVersion}"

api "org.springframework.boot:spring-boot-test:3.3.4"
api "org.springframework:spring-test:6.1.13"
api "org.slf4j:slf4j-api:2.0.16"
api 'org.junit.jupiter:junit-jupiter-api:5.11.2'

testImplementation "org.wiremock:wiremock:${wiremockVersion}"
testImplementation "org.wiremock:wiremock-jetty12:${wiremockVersion}"
testImplementation "org.springframework.boot:spring-boot-starter-test:3.3.4"
testImplementation 'org.assertj:assertj-core:3.26.3'
testImplementation platform('org.junit:junit-bom:5.11.2')
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/usecases/NotEnabledTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
import static org.junit.jupiter.api.Assertions.assertThrows;

import com.github.tomakehurst.wiremock.client.WireMock;
import org.apache.hc.client5.http.HttpHostConnectException;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.core.env.Environment;
import wiremock.org.apache.hc.client5.http.HttpHostConnectException;

@SpringBootTest
class NotEnabledTest {
Expand Down

0 comments on commit 4ed94e6

Please sign in to comment.