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
20 changes: 12 additions & 8 deletions src/main/resources/META-INF/rewrite/jakarta-faces-3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,8 @@ tags:
- faces
- jsf
preconditions:
- org.openrewrite.FindSourceFiles:
filePattern: '**/web.xml'
- org.openrewrite.Singleton
recipeList:
- org.openrewrite.xml.ChangeTagAttribute:
Expand All @@ -215,14 +217,16 @@ recipeList:
oldValue: (?s).*xml/ns/javaee.*
newValue: https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd
regex: true
- org.openrewrite.text.FindAndReplace:
find: "javax."
replace: "jakarta."
filePattern: '**/web.xml'
- org.openrewrite.text.FindAndReplace:
find: "jakarta.sql."
replace: "javax.sql."
filePattern: '**/web.xml'
- org.openrewrite.xml.ChangeTagValue:
elementName: //*
oldValue: "javax\\."
newValue: "jakarta."
regex: true
- org.openrewrite.xml.ChangeTagValue:
elementName: //*
oldValue: "jakarta\\.sql\\."
newValue: "javax.sql."
regex: true
---
type: specs.openrewrite.org/v1beta/recipe
name: org.openrewrite.java.migrate.jakarta.JakartaFacesEcmaScript
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,43 @@ void migrateMultilineSchemaLocation() {
);
}

@Test
void jakartaEE10UpdatesWebXmlToVersion6AfterJavaxReplacement() {
rewriteRun(
spec -> spec.recipeFromResources("org.openrewrite.java.migrate.jakarta.JakartaEE10"),
//language=xml
xml(
"""
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"
version="4.0">
<display-name>example-project</display-name>
<context-param>
<param-name>javax.faces.PROJECT_STAGE</param-name>
<param-value>Production</param-value>
</context-param>
</web-app>
""",
"""
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"
version="6.0">
<display-name>example-project</display-name>
<context-param>
<param-name>jakarta.faces.PROJECT_STAGE</param-name>
<param-value>Production</param-value>
</context-param>
</web-app>
""",
sourceSpecs -> sourceSpecs.path("src/main/webapp/WEB-INF/web.xml")
)
);
}

@Nested
class NoChanges {
@Test
Expand Down
Loading