From a2fb8592b3d100f6de4f1670ce8005cac7cfe9dd Mon Sep 17 00:00:00 2001 From: Steve Elliott Date: Tue, 5 Aug 2025 14:54:42 -0400 Subject: [PATCH 1/2] The quick fix for the tests for Jaxws Dependencies --- .../resources/META-INF/rewrite/java-version-11.yml | 10 ++-------- .../java/migrate/javax/AddJaxwsDependenciesTest.java | 12 ++++++++---- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/main/resources/META-INF/rewrite/java-version-11.yml b/src/main/resources/META-INF/rewrite/java-version-11.yml index 2a870d2f0f..250d4c4632 100644 --- a/src/main/resources/META-INF/rewrite/java-version-11.yml +++ b/src/main/resources/META-INF/rewrite/java-version-11.yml @@ -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 @@ -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 diff --git a/src/test/java/org/openrewrite/java/migrate/javax/AddJaxwsDependenciesTest.java b/src/test/java/org/openrewrite/java/migrate/javax/AddJaxwsDependenciesTest.java index daa7037ef4..ab2ac289fa 100644 --- a/src/test/java/org/openrewrite/java/migrate/javax/AddJaxwsDependenciesTest.java +++ b/src/test/java/org/openrewrite/java/migrate/javax/AddJaxwsDependenciesTest.java @@ -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( @@ -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( From ede0bd66d50538388135d14393a2dbab5169d25c Mon Sep 17 00:00:00 2001 From: Steve Elliott Date: Tue, 5 Aug 2025 15:07:32 -0400 Subject: [PATCH 2/2] Fixing separate test that broke when candidate were updated --- .../java/org/openrewrite/java/migrate/UpdateSdkManTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/org/openrewrite/java/migrate/UpdateSdkManTest.java b/src/test/java/org/openrewrite/java/migrate/UpdateSdkManTest.java index bb5579d60a..81e5865659 100644 --- a/src/test/java/org/openrewrite/java/migrate/UpdateSdkManTest.java +++ b/src/test/java/org/openrewrite/java/migrate/UpdateSdkManTest.java @@ -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") )