Skip to content

Commit eec04ab

Browse files
The quick fix for the tests for Jaxws Dependencies (#809)
* The quick fix for the tests for Jaxws Dependencies * Fixing separate test that broke when candidate were updated
1 parent 7137c0c commit eec04ab

3 files changed

Lines changed: 11 additions & 13 deletions

File tree

src/main/resources/META-INF/rewrite/java-version-11.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -138,12 +138,6 @@ recipeList:
138138
newGroupId: jakarta.xml.ws
139139
newArtifactId: jakarta.xml.ws-api
140140
newVersion: 2.3.x
141-
- org.openrewrite.maven.ChangeManagedDependencyGroupIdAndArtifactId:
142-
oldGroupId: javax.xml.ws
143-
oldArtifactId: jaxws-api
144-
newGroupId: jakarta.xml.ws
145-
newArtifactId: jakarta.xml.ws-api
146-
newVersion: 2.3.x
147141
# Add the jakarta JAXB artifact if it is missing but a project uses types in either javax.jws or javax.xml.ws
148142
- org.openrewrite.java.dependencies.AddDependency:
149143
groupId: jakarta.xml.ws
@@ -168,11 +162,11 @@ recipeList:
168162
- org.openrewrite.maven.RemoveRedundantDependencyVersions:
169163
groupPattern: jakarta.xml.ws
170164
artifactPattern: "*"
171-
onlyIfVersionsMatch: true
165+
onlyIfManagedVersionIs: EQ
172166
- org.openrewrite.maven.RemoveRedundantDependencyVersions:
173167
groupPattern: com.sun.xml.ws
174168
artifactPattern: "*"
175-
onlyIfVersionsMatch: true
169+
onlyIfManagedVersionIs: EQ
176170
---
177171
type: specs.openrewrite.org/v1beta/recipe
178172
name: org.openrewrite.java.migrate.InternalBindPackages

src/test/java/org/openrewrite/java/migrate/UpdateSdkManTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ void nonNumericalVersionPart() {
143143
java=11.0.25.fx-zulu
144144
""",
145145
"""
146-
java=17.0.15.fx-zulu
146+
java=17.0.16.fx-zulu
147147
""",
148148
spec -> spec.path(".sdkmanrc")
149149
)

src/test/java/org/openrewrite/java/migrate/javax/AddJaxwsDependenciesTest.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -198,11 +198,13 @@ void removeReferenceImplementationRuntime() {
198198
}
199199
200200
dependencies {
201-
implementation "com.sun.xml.ws:jaxws-rt:%s"
201+
compileOnly "com.sun.xml.ws:jaxws-rt:%s"
202202
203203
implementation "jakarta.xml.ws:jakarta.xml.ws-api:%s"
204+
205+
testImplementation "com.sun.xml.ws:jaxws-rt:%s"
204206
}
205-
""".formatted(rtVersion, wsApiVersion);
207+
""".formatted(rtVersion, wsApiVersion, rtVersion);
206208
})
207209
),
208210
pomXml(
@@ -299,11 +301,13 @@ void renameAndUpdateApiAndRuntime() {
299301
}
300302
301303
dependencies {
302-
implementation "com.sun.xml.ws:jaxws-rt:%s"
304+
compileOnly "com.sun.xml.ws:jaxws-rt:%s"
303305
304306
implementation "jakarta.xml.ws:jakarta.xml.ws-api:%s"
307+
308+
testImplementation "com.sun.xml.ws:jaxws-rt:%s"
305309
}
306-
""".formatted(rtVersion, wsApiVersion);
310+
""".formatted(rtVersion, wsApiVersion, rtVersion);
307311
})
308312
),
309313
pomXml(

0 commit comments

Comments
 (0)