Skip to content

Commit b9375e4

Browse files
authored
Fix Jetty EE10 duplicate oldArtifactId on ChangeDependencies. Reorder and bring in line with Jetty EE9 list (#1017)
1 parent fd968d3 commit b9375e4

File tree

1 file changed

+18
-6
lines changed

1 file changed

+18
-6
lines changed

src/main/resources/META-INF/rewrite/jakarta-ee-10.yml

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -613,6 +613,12 @@ description: Update Jetty dependencies from EE9 to EE10, changing the groupId an
613613
preconditions:
614614
- org.openrewrite.Singleton
615615
recipeList:
616+
- org.openrewrite.java.dependencies.ChangeDependency:
617+
oldGroupId: org.eclipse.jetty.ee9.websocket
618+
oldArtifactId: jetty-ee9-websocket-jetty-api
619+
newGroupId: org.eclipse.jetty.ee10.websocket
620+
newArtifactId: jetty-ee10-websocket-jetty-api
621+
newVersion: 12.0.x
616622
- org.openrewrite.java.dependencies.ChangeDependency:
617623
oldGroupId: org.eclipse.jetty.ee9.websocket
618624
oldArtifactId: jetty-ee9-websocket-jetty-server
@@ -625,6 +631,18 @@ recipeList:
625631
newGroupId: org.eclipse.jetty.ee10.websocket
626632
newArtifactId: jetty-ee10-websocket-jetty-client
627633
newVersion: 12.0.x
634+
- org.openrewrite.java.dependencies.ChangeDependency:
635+
oldGroupId: org.eclipse.jetty.ee9.websocket
636+
oldArtifactId: jetty-ee9-websocket-jakarta-server
637+
newGroupId: org.eclipse.jetty.ee10.websocket
638+
newArtifactId: jetty-ee10-websocket-jakarta-server
639+
newVersion: 12.x
640+
- org.openrewrite.java.dependencies.ChangeDependency:
641+
oldGroupId: org.eclipse.jetty.ee9.websocket
642+
oldArtifactId: jetty-ee9-websocket-jakarta-client
643+
newGroupId: org.eclipse.jetty.ee10.websocket
644+
newArtifactId: jetty-ee10-websocket-jakarta-client
645+
newVersion: 12.x
628646
- org.openrewrite.java.dependencies.ChangeDependency:
629647
oldGroupId: org.eclipse.jetty.ee9
630648
oldArtifactId: jetty-ee9-apache-jsp
@@ -667,12 +685,6 @@ recipeList:
667685
newGroupId: org.eclipse.jetty.ee10
668686
newArtifactId: jetty-ee10-annotations
669687
newVersion: 12.0.x
670-
- org.openrewrite.java.dependencies.ChangeDependency:
671-
oldGroupId: org.eclipse.jetty.ee9.websocket
672-
oldArtifactId: jetty-ee9-websocket-jetty-server
673-
newGroupId: org.eclipse.jetty.ee10.websocket
674-
newArtifactId: jetty-ee10-websocket-jakarta-server
675-
newVersion: 12.x
676688
- org.openrewrite.java.ChangeType:
677689
oldFullyQualifiedTypeName: org.eclipse.jetty.util.resource.ResourceCollection
678690
newFullyQualifiedTypeName: org.eclipse.jetty.util.resource.Resource

0 commit comments

Comments
 (0)