Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 2 additions & 8 deletions src/main/resources/META-INF/rewrite/java-version-11.yml
Original file line number Diff line number Diff line change
Expand Up @@ -138,12 +138,6 @@ recipeList:
newGroupId: jakarta.xml.ws
newArtifactId: jakarta.xml.ws-api
newVersion: 2.3.x
- org.openrewrite.maven.ChangeManagedDependencyGroupIdAndArtifactId:
oldGroupId: javax.xml.ws
oldArtifactId: jaxws-api
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 either javax.jws or javax.xml.ws
- org.openrewrite.java.dependencies.AddDependency:
groupId: jakarta.xml.ws
Expand All @@ -168,11 +162,11 @@ recipeList:
- org.openrewrite.maven.RemoveRedundantDependencyVersions:
groupPattern: jakarta.xml.ws
artifactPattern: "*"
onlyIfVersionsMatch: true
onlyIfManagedVersionIs: EQ
- org.openrewrite.maven.RemoveRedundantDependencyVersions:
groupPattern: com.sun.xml.ws
artifactPattern: "*"
onlyIfVersionsMatch: true
onlyIfManagedVersionIs: EQ
---
type: specs.openrewrite.org/v1beta/recipe
name: org.openrewrite.java.migrate.InternalBindPackages
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ void nonNumericalVersionPart() {
java=11.0.25.fx-zulu
""",
"""
java=17.0.15.fx-zulu
java=17.0.16.fx-zulu
""",
spec -> spec.path(".sdkmanrc")
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -198,11 +198,13 @@ void removeReferenceImplementationRuntime() {
}

dependencies {
implementation "com.sun.xml.ws:jaxws-rt:%s"
compileOnly "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);
""".formatted(rtVersion, wsApiVersion, rtVersion);
})
),
pomXml(
Expand Down Expand Up @@ -299,11 +301,13 @@ void renameAndUpdateApiAndRuntime() {
}

dependencies {
implementation "com.sun.xml.ws:jaxws-rt:%s"
compileOnly "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);
""".formatted(rtVersion, wsApiVersion, rtVersion);
})
),
pomXml(
Expand Down