Skip to content

Commit

Permalink
Merge pull request #929 from newrelic/spring-ws-jakarta
Browse files Browse the repository at this point in the history
Update spring-ws dependencies and verifier
  • Loading branch information
jasonjkeller authored Jul 12, 2022
2 parents 191d1c6 + e8e21e3 commit c761de7
Showing 1 changed file with 5 additions and 7 deletions.
12 changes: 5 additions & 7 deletions instrumentation/spring-ws-2.0/build.gradle
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
dependencies {
implementation(project(":agent-bridge"))
implementation("org.springframework.ws:spring-ws-core:2.2.0.RELEASE")
implementation("org.apache.ws.commons.axiom:axiom-api:1.2.14")
implementation("org.springframework.ws:spring-ws-core:3.1.3")
implementation("org.apache.ws.commons.axiom:axiom-api:1.4.0")

// This is needed to allow tests to run on JDK 11 (since javax.xml was removed in JDK 11)
testImplementation("javax.xml.soap:javax.xml.soap-api:1.4.0")

testImplementation("jakarta.xml.soap:jakarta.xml.soap-api:1.4.2")
}

jar {
Expand All @@ -14,11 +13,10 @@ jar {

verifyInstrumentation {
passesOnly('org.springframework.ws:spring-ws-core:[1.5.7,)'){
compile("org.apache.ws.commons.axiom:axiom-api:1.2.14")
compile("org.apache.ws.commons.axiom:axiom-api:1.4.0")
}
// version 3.1.0 fails but then 3.1.1 passes again
exclude('org.springframework.ws:spring-ws-core:3.1.0')

// instrumentation does not work in 3.0.11. It was likely a bad release, 3.0.12 was released 2 days later.
exclude('org.springframework.ws:spring-ws-core:3.0.11.RELEASE')
}
Expand All @@ -32,4 +30,4 @@ test {
site {
title 'Spring Web Services'
type 'Framework'
}
}

0 comments on commit c761de7

Please sign in to comment.