Skip to content

fix: Add Jakarta XML WS API when using javax.xml.ws #463

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

Merged
merged 3 commits into from
Apr 20, 2024
Merged

fix: Add Jakarta XML WS API when using javax.xml.ws #463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e6b5d77
fix: Add Jakarta XML WS API when using javax.xml.ws
darylrobbins Apr 20, 2024
b39297d
Remove all trailing whitespace in text blocks
timtebeek Apr 20, 2024
93d87a5
Merge comment lines
timtebeek Apr 20, 2024
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
8 changes: 7 additions & 1 deletion src/main/resources/META-INF/rewrite/java-version-11.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,13 +183,19 @@ recipeList:
newGroupId: jakarta.xml.ws
newArtifactId: jakarta.xml.ws-api
newVersion: 2.3.x
# Add the jakarta JAXB artifact if it is missing but a project uses types in java.xml.bind
# Add the jakarta JAXB artifact if it is missing but a project uses types in either javax.jws or javax.xml.ws
- org.openrewrite.java.dependencies.AddDependency:
groupId: jakarta.xml.ws
artifactId: jakarta.xml.ws-api
version: 2.3.x
onlyIfUsing: javax.jws..*
acceptTransitive: true
- org.openrewrite.java.dependencies.AddDependency:
groupId: jakarta.xml.ws
artifactId: jakarta.xml.ws-api
version: 2.3.x
onlyIfUsing: javax.xml.ws..*
acceptTransitive: true
# If a project already had the jakarta api, make sure it is at the latest version.
- org.openrewrite.java.dependencies.UpgradeDependencyVersion:
groupId: jakarta.xml.ws
Expand Down
14 changes: 4 additions & 10 deletions src/test/java/org/openrewrite/java/migrate/javax/AddJaxwsDependenciesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/
package org.openrewrite.java.migrate.javax;

import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.openrewrite.config.Environment;
import org.openrewrite.test.RecipeSpec;
Expand All @@ -29,7 +28,6 @@
import static org.openrewrite.gradle.toolingapi.Assertions.withToolingApi;
import static org.openrewrite.maven.Assertions.pomXml;

@Disabled
class AddJaxwsDependenciesTest implements RewriteTest {

@Override
Expand Down Expand Up @@ -173,13 +171,11 @@ void removeReferenceImplementationRuntime() {
}

dependencies {
compileOnly "com.sun.xml.ws:jaxws-rt:%s"
implementation "com.sun.xml.ws:jaxws-rt:%s"

implementation "jakarta.xml.ws:jakarta.xml.ws-api:%s"

testImplementation "com.sun.xml.ws:jaxws-rt:%s"
}
""".formatted(rtVersion, wsApiVersion, rtVersion);
""".formatted(rtVersion, wsApiVersion);
})
),
pomXml(
Expand Down Expand Up @@ -276,13 +272,11 @@ void renameAndUpdateApiAndRuntime() {
}

dependencies {
compileOnly "com.sun.xml.ws:jaxws-rt:%s"
implementation "com.sun.xml.ws:jaxws-rt:%s"

implementation "jakarta.xml.ws:jakarta.xml.ws-api:%s"

testImplementation "com.sun.xml.ws:jaxws-rt:%s"
}
""".formatted(rtVersion, wsApiVersion, rtVersion);
""".formatted(rtVersion, wsApiVersion);
})
),
pomXml(
Expand Down