diff --git a/build.gradle.kts b/build.gradle.kts index 36c9c04058..f543c37cc7 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -15,6 +15,23 @@ recipeDependencies { parserClasspath("javax.annotation:javax.annotation-api:1.3.2") parserClasspath("com.google.guava:guava:33.5.0-jre") parserClasspath("com.google.errorprone:error_prone_core:2.+") + + testParserClasspath("com.sun.faces:jsf-api:2.1.29-11") + testParserClasspath("jakarta.el:jakarta.el-api:4.0.0") + testParserClasspath("jakarta.enterprise:jakarta.enterprise.cdi-api:4.0.1") + testParserClasspath("jakarta.faces:jakarta.faces-api:3.0.0") + testParserClasspath("jakarta.faces:jakarta.faces-api:4.0.0-M6") + testParserClasspath("jakarta.faces:jakarta.faces-api:4.0.1") + testParserClasspath("jakarta.servlet:jakarta.servlet-api:4.0.2") + testParserClasspath("jakarta.servlet:jakarta.servlet-api:5.0.0") + testParserClasspath("jakarta.ws.rs:jakarta.ws.rs-api:3.1.0") + testParserClasspath("jakarta.xml.soap:jakarta.xml.soap-api:2.0.1") + testParserClasspath("javax.enterprise:cdi-api:2.0.SP1") + testParserClasspath("javax.servlet:javax.servlet-api:4.0.1") + testParserClasspath("org.apache.ws.security:wss4j:1.6.19") + testParserClasspath("org.apache.wss4j:wss4j-ws-security-common:2.0.0") + testParserClasspath("org.glassfish:jakarta.faces:2.3.19") + testParserClasspath("org.glassfish:jakarta.faces:3.0.3") } val rewriteVersion = rewriteRecipe.rewriteVersion.get() @@ -76,7 +93,6 @@ dependencies { testRuntimeOnly("com.google.code.findbugs:jsr305:3.0.2") testRuntimeOnly("javax.mail:mail:1.4.7") testRuntimeOnly("javax.mail:javax.mail-api:1.6.2") - testRuntimeOnly("javax.servlet:javax.servlet-api:4.0.1") testRuntimeOnly("javax.ws.rs:javax.ws.rs-api:2.1.1") testRuntimeOnly(gradleApi()) } diff --git a/src/test/java/org/openrewrite/java/migrate/jakarta/JavaxServletToJakartaServletTest.java b/src/test/java/org/openrewrite/java/migrate/jakarta/JavaxServletToJakartaServletTest.java index 6e2ccc090e..37e6a2447e 100644 --- a/src/test/java/org/openrewrite/java/migrate/jakarta/JavaxServletToJakartaServletTest.java +++ b/src/test/java/org/openrewrite/java/migrate/jakarta/JavaxServletToJakartaServletTest.java @@ -16,6 +16,7 @@ package org.openrewrite.java.migrate.jakarta; import org.junit.jupiter.api.Test; +import org.openrewrite.InMemoryExecutionContext; import org.openrewrite.java.JavaParser; import org.openrewrite.test.RecipeSpec; import org.openrewrite.test.RewriteTest; @@ -28,7 +29,7 @@ class JavaxServletToJakartaServletTest implements RewriteTest { @Override public void defaults(RecipeSpec spec) { spec.parser(JavaParser.fromJavaVersion() - .classpath("javax.servlet-api-4.0.1")) + .classpathFromResources(new InMemoryExecutionContext(), "javax.servlet-api-4.0.1")) .recipeFromResource( "/META-INF/rewrite/jakarta-ee-9.yml", "org.openrewrite.java.migrate.jakarta.JavaxServletToJakartaServlet"); diff --git a/src/test/java/org/openrewrite/java/migrate/jakarta/RemovalsServletJakarta10Test.java b/src/test/java/org/openrewrite/java/migrate/jakarta/RemovalsServletJakarta10Test.java index e3de98dcb5..55a1330e0f 100644 --- a/src/test/java/org/openrewrite/java/migrate/jakarta/RemovalsServletJakarta10Test.java +++ b/src/test/java/org/openrewrite/java/migrate/jakarta/RemovalsServletJakarta10Test.java @@ -29,9 +29,7 @@ class RemovalsServletJakarta10Test implements RewriteTest { public void defaults(RecipeSpec spec) { spec.parser(JavaParser.fromJavaVersion() .classpathFromResources(new InMemoryExecutionContext(), - "javax.servlet-api-4.0.0", - "jakarta.servlet-api-5.0.0", - "jakarta.servlet-api-6.0.0")) + "jakarta.servlet-api-5.0")) .recipeFromResource("/META-INF/rewrite/jakarta-ee-10.yml", "org.openrewrite.java.migrate.jakarta.RemovalsServletJakarta10"); } diff --git a/src/test/resources/META-INF/rewrite/classpath.tsv.gz b/src/test/resources/META-INF/rewrite/classpath.tsv.gz new file mode 100644 index 0000000000..a313412c76 Binary files /dev/null and b/src/test/resources/META-INF/rewrite/classpath.tsv.gz differ diff --git a/src/test/resources/META-INF/rewrite/classpath/cdi-api-2.0.SP1.jar b/src/test/resources/META-INF/rewrite/classpath/cdi-api-2.0.SP1.jar deleted file mode 100644 index b432e9fae3..0000000000 Binary files a/src/test/resources/META-INF/rewrite/classpath/cdi-api-2.0.SP1.jar and /dev/null differ diff --git a/src/test/resources/META-INF/rewrite/classpath/jakarta.el-api-4.0.0.jar b/src/test/resources/META-INF/rewrite/classpath/jakarta.el-api-4.0.0.jar deleted file mode 100644 index 97754067a1..0000000000 Binary files a/src/test/resources/META-INF/rewrite/classpath/jakarta.el-api-4.0.0.jar and /dev/null differ diff --git a/src/test/resources/META-INF/rewrite/classpath/jakarta.enterprise.cdi-api-4.0.1.jar b/src/test/resources/META-INF/rewrite/classpath/jakarta.enterprise.cdi-api-4.0.1.jar deleted file mode 100644 index dc7ae1c557..0000000000 Binary files a/src/test/resources/META-INF/rewrite/classpath/jakarta.enterprise.cdi-api-4.0.1.jar and /dev/null differ diff --git a/src/test/resources/META-INF/rewrite/classpath/jakarta.faces-2.3.19.jar b/src/test/resources/META-INF/rewrite/classpath/jakarta.faces-2.3.19.jar deleted file mode 100644 index 3fb8fbb07a..0000000000 Binary files a/src/test/resources/META-INF/rewrite/classpath/jakarta.faces-2.3.19.jar and /dev/null differ diff --git a/src/test/resources/META-INF/rewrite/classpath/jakarta.faces-3.0.3.jar b/src/test/resources/META-INF/rewrite/classpath/jakarta.faces-3.0.3.jar deleted file mode 100644 index 6fc6eb6c3b..0000000000 Binary files a/src/test/resources/META-INF/rewrite/classpath/jakarta.faces-3.0.3.jar and /dev/null differ diff --git a/src/test/resources/META-INF/rewrite/classpath/jakarta.faces-api-3.0.0.jar b/src/test/resources/META-INF/rewrite/classpath/jakarta.faces-api-3.0.0.jar deleted file mode 100644 index beb88cc584..0000000000 Binary files a/src/test/resources/META-INF/rewrite/classpath/jakarta.faces-api-3.0.0.jar and /dev/null differ diff --git a/src/test/resources/META-INF/rewrite/classpath/jakarta.faces-api-4.0.0-M6.jar b/src/test/resources/META-INF/rewrite/classpath/jakarta.faces-api-4.0.0-M6.jar deleted file mode 100644 index 25d4e01195..0000000000 Binary files a/src/test/resources/META-INF/rewrite/classpath/jakarta.faces-api-4.0.0-M6.jar and /dev/null differ diff --git a/src/test/resources/META-INF/rewrite/classpath/jakarta.faces-api-4.0.1.jar b/src/test/resources/META-INF/rewrite/classpath/jakarta.faces-api-4.0.1.jar deleted file mode 100644 index 53567273a2..0000000000 Binary files a/src/test/resources/META-INF/rewrite/classpath/jakarta.faces-api-4.0.1.jar and /dev/null differ diff --git a/src/test/resources/META-INF/rewrite/classpath/jakarta.servlet-api-4.0.2.jar b/src/test/resources/META-INF/rewrite/classpath/jakarta.servlet-api-4.0.2.jar deleted file mode 100644 index 3558f8cdb3..0000000000 Binary files a/src/test/resources/META-INF/rewrite/classpath/jakarta.servlet-api-4.0.2.jar and /dev/null differ diff --git a/src/test/resources/META-INF/rewrite/classpath/jakarta.servlet-api-5.0.0.jar b/src/test/resources/META-INF/rewrite/classpath/jakarta.servlet-api-5.0.0.jar deleted file mode 100644 index 88b788a0bf..0000000000 Binary files a/src/test/resources/META-INF/rewrite/classpath/jakarta.servlet-api-5.0.0.jar and /dev/null differ diff --git a/src/test/resources/META-INF/rewrite/classpath/jakarta.ws.rs-api-3.1.0.jar b/src/test/resources/META-INF/rewrite/classpath/jakarta.ws.rs-api-3.1.0.jar deleted file mode 100644 index 80670a1b87..0000000000 Binary files a/src/test/resources/META-INF/rewrite/classpath/jakarta.ws.rs-api-3.1.0.jar and /dev/null differ diff --git a/src/test/resources/META-INF/rewrite/classpath/jakarta.xml.soap-api-2.0.1.jar b/src/test/resources/META-INF/rewrite/classpath/jakarta.xml.soap-api-2.0.1.jar deleted file mode 100644 index 995972ef8c..0000000000 Binary files a/src/test/resources/META-INF/rewrite/classpath/jakarta.xml.soap-api-2.0.1.jar and /dev/null differ diff --git a/src/test/resources/META-INF/rewrite/classpath/javax.servlet-api-4.0.0.jar b/src/test/resources/META-INF/rewrite/classpath/javax.servlet-api-4.0.0.jar deleted file mode 100644 index 9c9f4b7f6a..0000000000 Binary files a/src/test/resources/META-INF/rewrite/classpath/javax.servlet-api-4.0.0.jar and /dev/null differ diff --git a/src/test/resources/META-INF/rewrite/classpath/jsf-api-2.1.29-11.jar b/src/test/resources/META-INF/rewrite/classpath/jsf-api-2.1.29-11.jar deleted file mode 100644 index 413ee323ee..0000000000 Binary files a/src/test/resources/META-INF/rewrite/classpath/jsf-api-2.1.29-11.jar and /dev/null differ diff --git a/src/test/resources/META-INF/rewrite/classpath/wss4j-1.6.19.jar b/src/test/resources/META-INF/rewrite/classpath/wss4j-1.6.19.jar deleted file mode 100644 index 38e71086fd..0000000000 Binary files a/src/test/resources/META-INF/rewrite/classpath/wss4j-1.6.19.jar and /dev/null differ diff --git a/src/test/resources/META-INF/rewrite/classpath/wss4j-ws-security-common-2.0.0.jar b/src/test/resources/META-INF/rewrite/classpath/wss4j-ws-security-common-2.0.0.jar deleted file mode 100644 index ec694a2b09..0000000000 Binary files a/src/test/resources/META-INF/rewrite/classpath/wss4j-ws-security-common-2.0.0.jar and /dev/null differ