Skip to content

Commit

Permalink
Ensured that the shadow JAR is always built last. Relocated dependenc…
Browse files Browse the repository at this point in the history
…ies in webhooks. (#2344)
  • Loading branch information
tomakehurst committed Aug 30, 2023
1 parent 9eaaa69 commit ab05ee9
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 5 deletions.
2 changes: 2 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,8 @@ allprojects {
property "sonar.host.url", "https://sonarcloud.io"
}
}

shadowJar.dependsOn jar
}

java {
Expand Down
13 changes: 8 additions & 5 deletions wiremock-webhooks-extension/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@ dependencies {
implementation("com.github.jknack:handlebars-helpers:$versions.handlebars") {
exclude group: 'org.mozilla', module: 'rhino'
}
implementation "com.google.guava:guava:$versions.guava"
implementation "com.google.guava:guava:$versions.guava", {
exclude group: 'com.google.code.findbugs', module: 'jsr305'
}
implementation "org.apache.httpcomponents.client5:httpclient5:5.2.1"

testImplementation project(":")
Expand All @@ -47,10 +49,11 @@ shadowJar {
archiveClassifier.set('')

relocate "org.apache", 'wiremock.webhooks.org.apache'

dependencies {
exclude(dependency('org.slf4j:slf4j-api'))
}
relocate "org.slf4j", "wiremock.webhooks.org.slf4j"
relocate "com.google", 'wiremock.webhooks.com.google'
relocate "com.fasterxml.jackson", 'wiremock.webhooks.com.fasterxml.jackson'
relocate "org.checkerframework", "wiremock.webhooks.org.checkerframework"
relocate "com.github.jknack", "wiremock.webhooks.com.github.jknack"
}

task sourcesJar(type: Jar, dependsOn: classes) {
Expand Down

0 comments on commit ab05ee9

Please sign in to comment.