diff --git a/src/main/resources/META-INF/rewrite/jakarta-ee-10.yml b/src/main/resources/META-INF/rewrite/jakarta-ee-10.yml index d4addb7098..e1b27edd7b 100644 --- a/src/main/resources/META-INF/rewrite/jakarta-ee-10.yml +++ b/src/main/resources/META-INF/rewrite/jakarta-ee-10.yml @@ -24,6 +24,7 @@ tags: recipeList: - org.openrewrite.java.migrate.jakarta.JavaxMigrationToJakarta - org.openrewrite.java.migrate.jakarta.MigrationToJakarta10Apis + - org.openrewrite.java.migrate.jakarta.JettyUpgradeEE10 - org.openrewrite.java.migrate.jakarta.Faces3xMigrationToFaces4x - org.openrewrite.java.migrate.jakarta.RemovedIsParmetersProvidedMethod - org.openrewrite.java.migrate.jakarta.RemovedSOAPElementFactory @@ -523,3 +524,66 @@ recipeList: artifactId: yasson newVersion: 3.0.x --- +type: specs.openrewrite.org/v1beta/recipe +name: org.openrewrite.java.migrate.jakarta.JettyUpgradeEE10 +displayName: Update Jetty EE9 to Jetty EE10 +description: Update Jetty dependencies from EE9 to EE10, changing the groupId and artifactIds as needed. +recipeList: + - org.openrewrite.java.dependencies.ChangeDependency: + oldGroupId: org.eclipse.jetty.ee9.websocket + oldArtifactId: jetty-ee9-websocket-jetty-server + newGroupId: org.eclipse.jetty.ee10.websocket + newArtifactId: jetty-ee10-websocket-jetty-server + newVersion: 12.0.x + - org.openrewrite.java.dependencies.ChangeDependency: + oldGroupId: org.eclipse.jetty.ee9.websocket + oldArtifactId: jetty-ee9-websocket-jetty-client + newGroupId: org.eclipse.jetty.ee10.websocket + newArtifactId: jetty-ee10-websocket-jetty-client + newVersion: 12.0.x + - org.openrewrite.java.dependencies.ChangeDependency: + oldGroupId: org.eclipse.jetty.ee9 + oldArtifactId: jetty-ee9-apache-jsp + newGroupId: org.eclipse.jetty.ee10 + newArtifactId: jetty-ee10-apache-jsp + newVersion: 12.0.x + - org.openrewrite.java.dependencies.ChangeDependency: + oldGroupId: org.eclipse.jetty.ee9 + oldArtifactId: jetty-ee9-servlets + newGroupId: org.eclipse.jetty.ee10 + newArtifactId: jetty-ee10-servlets + newVersion: 12.0.x + - org.openrewrite.java.dependencies.ChangeDependency: + oldGroupId: org.eclipse.jetty.ee9 + oldArtifactId: jetty-ee9-servlet + newGroupId: org.eclipse.jetty.ee10 + newArtifactId: jetty-ee10-servlet + newVersion: 12.0.x + - org.openrewrite.java.dependencies.ChangeDependency: + oldGroupId: org.eclipse.jetty.ee9 + oldArtifactId: jetty-ee9-webapp + newGroupId: org.eclipse.jetty.ee10 + newArtifactId: jetty-ee10-webapp + newVersion: 12.0.x + - org.openrewrite.java.dependencies.ChangeDependency: + oldGroupId: org.eclipse.jetty.ee9 + oldArtifactId: jetty-ee9-security + newGroupId: org.eclipse.jetty.ee10 + newArtifactId: jetty-ee10-security + newVersion: 12.0.x + - org.openrewrite.java.dependencies.ChangeDependency: + oldGroupId: org.eclipse.jetty.ee9 + oldArtifactId: jetty-ee9-proxy + newGroupId: org.eclipse.jetty.ee10 + newArtifactId: jetty-ee10-proxy + newVersion: 12.0.x + - org.openrewrite.java.dependencies.ChangeDependency: + oldGroupId: org.eclipse.jetty.ee9 + oldArtifactId: jetty-ee9-annotations + newGroupId: org.eclipse.jetty.ee10 + newArtifactId: jetty-ee10-annotations + newVersion: 12.0.x + - org.openrewrite.java.ChangeType: + oldFullyQualifiedTypeName: org.eclipse.jetty.util.resource.ResourceCollection + newFullyQualifiedTypeName: org.eclipse.jetty.util.resource.Resource +--- diff --git a/src/test/java/org/openrewrite/java/migrate/jakarta/JakartaEE10Test.java b/src/test/java/org/openrewrite/java/migrate/jakarta/JakartaEE10Test.java new file mode 100644 index 0000000000..968283b439 --- /dev/null +++ b/src/test/java/org/openrewrite/java/migrate/jakarta/JakartaEE10Test.java @@ -0,0 +1,62 @@ +/* + * Copyright 2024 the original author or authors. + *
+ * Licensed under the Moderne Source Available License (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + *
+ * https://docs.moderne.io/licensing/moderne-source-available-license + *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.java.migrate.jakarta;
+
+import org.junit.jupiter.api.Test;
+import org.openrewrite.DocumentExample;
+import org.openrewrite.test.RecipeSpec;
+import org.openrewrite.test.RewriteTest;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.openrewrite.maven.Assertions.pomXml;
+
+class JakartaEE10Test implements RewriteTest {
+
+ @Override
+ public void defaults(RecipeSpec spec) {
+ spec.recipeFromResources("org.openrewrite.java.migrate.jakarta.JakartaEE10");
+ }
+
+ @DocumentExample
+ @Test
+ void chainedJettyUpgradeEE10() {
+ rewriteRun(
+ pomXml(
+ """
+