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
18 changes: 17 additions & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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())
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}

Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.