JettyUpgradeEE9 also upgrades the other Jetty dependencies, the servlet packages and the Java version

src/main/java/org/openrewrite/java/migrate/jakarta/HasJettyDependency.java

@@ -0,0 +1,91 @@
+/*
+ * Copyright 2025 the original author or authors.
+ * <p>
+ * 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
+ * <p>
+ * https://docs.moderne.io/licensing/moderne-source-available-license
+ * <p>
+ * 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 lombok.EqualsAndHashCode;
+import lombok.Value;
+import org.openrewrite.ExecutionContext;
+import org.openrewrite.ScanningRecipe;
+import org.openrewrite.Tree;
+import org.openrewrite.TreeVisitor;
+import org.openrewrite.gradle.marker.GradleProject;
+import org.openrewrite.marker.SearchResult;
+import org.openrewrite.maven.tree.MavenResolutionResult;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+@Value
+@EqualsAndHashCode(callSuper = false)
+public class HasJettyDependency extends ScanningRecipe<AtomicBoolean> {
+    String displayName = "Build uses Jetty before version 12";
+
+    String description = "Mark the source set when a Maven or Gradle module depends on servlet or WebSocket artifacts relocated by the Jetty 12 migration. " +
+            "This permits updating the Java baseline in parent build files as well as the module using Jetty.";
+
+    @Override
+    public AtomicBoolean getInitialValue(ExecutionContext ctx) {
+        return new AtomicBoolean();
+    }
+
+    @Override
+    public TreeVisitor<?, ExecutionContext> getScanner(AtomicBoolean usesJetty) {
+        return new TreeVisitor<Tree, ExecutionContext>() {
+            @Override
+            public Tree preVisit(Tree tree, ExecutionContext ctx) {
+                stopAfterPreVisit();
+                tree.getMarkers().findFirst(MavenResolutionResult.class).ifPresent(model -> {
+                    if (model.getDependencies().values().stream().flatMap(Collection::stream)
+                            .filter(d -> d.getDepth() == 0)
+                            .anyMatch(d -> isLegacyJetty(d.getGroupId(), d.getArtifactId(), d.getVersion()))) {
+                        usesJetty.set(true);
+                    }
+                });
+                tree.getMarkers().findFirst(GradleProject.class).ifPresent(model -> {
+                    if (model.getConfigurations().stream().flatMap(c -> c.getDirectResolved().stream())
+                            .anyMatch(d -> isLegacyJetty(d.getGroupId(), d.getArtifactId(), d.getVersion()))) {
+                        usesJetty.set(true);
+                    }
+                });
+                return tree;
+            }
+        };
+    }
+
+    private static boolean isLegacyJetty(String groupId, String artifactId, String version) {
+        if (version == null || !version.matches("(?:8|9|10|11)(?:\\..*)?")) {
+            return false;
+        }
+        return "org.eclipse.jetty".equals(groupId) && Arrays.asList(
+                "apache-jsp", "jetty-servlets", "jetty-servlet", "jetty-webapp", "jetty-security",
+                "jetty-proxy", "jetty-annotations").contains(artifactId) ||
+                "org.eclipse.jetty.websocket".equals(groupId) && Arrays.asList(
+                        "websocket-api", "websocket-server", "websocket-client",
+                        "javax-websocket-server-impl", "javax-websocket-client-impl").contains(artifactId);
+    }
+
+    @Override
+    public TreeVisitor<?, ExecutionContext> getVisitor(AtomicBoolean usesJetty) {
+        return new TreeVisitor<Tree, ExecutionContext>() {
+            @Override
+            public Tree preVisit(Tree tree, ExecutionContext ctx) {
+                stopAfterPreVisit();
+                return usesJetty.get() ? SearchResult.found(tree) : tree;
+            }
+        };
+    }
+}

src/main/java/org/openrewrite/java/migrate/jakarta/JettyConnectorGetPort.java

@@ -0,0 +1,58 @@
+/*
+ * Copyright 2025 the original author or authors.
+ * <p>
+ * 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
+ * <p>
+ * https://docs.moderne.io/licensing/moderne-source-available-license
+ * <p>
+ * 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 lombok.EqualsAndHashCode;
+import lombok.Value;
+import org.openrewrite.ExecutionContext;
+import org.openrewrite.Recipe;
+import org.openrewrite.TreeVisitor;
+import org.openrewrite.java.JavaIsoVisitor;
+import org.openrewrite.java.JavaParser;
+import org.openrewrite.java.JavaTemplate;
+import org.openrewrite.java.MethodMatcher;
+import org.openrewrite.java.tree.J;
+
+@Value
+@EqualsAndHashCode(callSuper = false)
+public class JettyConnectorGetPort extends Recipe {
+    String displayName = "Access Jetty connector ports through `NetworkConnector`";
+
+    String description = "Jetty 9 moved `getPort()` from `Connector` to `NetworkConnector`. " +
+            "Cast legacy connector receivers to the network connector interface when upgrading Jetty.";
+
+    @Override
+    public TreeVisitor<?, ExecutionContext> getVisitor() {
+        return new JavaIsoVisitor<ExecutionContext>() {
+            final MethodMatcher getPort = new MethodMatcher("org.eclipse.jetty.server.Connector getPort()");
+            final JavaTemplate template = JavaTemplate.builder("((NetworkConnector) #{any()}).getPort()")
+                    .imports("org.eclipse.jetty.server.NetworkConnector")
+                    .javaParser(JavaParser.fromJavaVersion().dependsOn(
+                            "package org.eclipse.jetty.server; public interface NetworkConnector { int getPort(); }"))
+                    .build();
+
+            @Override
+            public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx) {
+                J.MethodInvocation m = super.visitMethodInvocation(method, ctx);
+                if (m.getSelect() != null && getPort.matches(m)) {
+                    maybeAddImport("org.eclipse.jetty.server.NetworkConnector");
+                    return template.apply(getCursor(), m.getCoordinates().replace(), m.getSelect());
+                }
+                return m;
+            }
+        };
+    }
+}

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

@@ -1568,6 +1568,8 @@ description: Update Jetty dependencies from version 9 to version 12.
 preconditions:
   - org.openrewrite.Singleton
 recipeList:
+  - org.openrewrite.java.migrate.jakarta.UpgradeJavaForJetty12
+  - org.openrewrite.java.migrate.jakarta.JettyConnectorGetPort
   - org.openrewrite.java.dependencies.ChangeDependency:
       oldGroupId: org.eclipse.jetty.websocket
       oldArtifactId: websocket-api
@@ -1640,6 +1642,45 @@ recipeList:
       newGroupId: org.eclipse.jetty.ee9
       newArtifactId: jetty-ee9-annotations
       newVersion: 12.0.x
+  - org.openrewrite.java.migrate.jakarta.UpgradeJettyCoreDependencies
+  - org.openrewrite.java.ChangePackage:
+      oldPackageName: org.eclipse.jetty.servlet
+      newPackageName: org.eclipse.jetty.ee9.servlet
+      recursive: true
+  - org.openrewrite.java.ChangePackage:
+      oldPackageName: org.eclipse.jetty.servlets
+      newPackageName: org.eclipse.jetty.ee9.servlets
+      recursive: true
+  - org.openrewrite.java.ChangePackage:
+      oldPackageName: org.eclipse.jetty.webapp
+      newPackageName: org.eclipse.jetty.ee9.webapp
+      recursive: true
+  - org.openrewrite.java.ChangePackage:
+      oldPackageName: org.eclipse.jetty.annotations
+      newPackageName: org.eclipse.jetty.ee9.annotations
+      recursive: true
+---
+type: specs.openrewrite.org/v1beta/recipe
+name: org.openrewrite.java.migrate.jakarta.UpgradeJettyCoreDependencies
+displayName: Align legacy Jetty core dependencies with Jetty 12
+description: Upgrade explicitly declared Jetty core dependencies alongside the relocated servlet dependencies.
+preconditions:
+  - org.openrewrite.java.migrate.jakarta.HasJettyDependency
+recipeList:
+  - org.openrewrite.java.dependencies.UpgradeDependencyVersion:
+      groupId: org.eclipse.jetty
+      artifactId: '*'
+      newVersion: 12.0.x
+---
+type: specs.openrewrite.org/v1beta/recipe
+name: org.openrewrite.java.migrate.jakarta.UpgradeJavaForJetty12
+displayName: Use Java 17 for Jetty 12
+description: Update the Java baseline of builds using Jetty to the minimum required by Jetty 12.
+preconditions:
+  - org.openrewrite.java.migrate.jakarta.HasJettyDependency
+recipeList:
+  - org.openrewrite.java.migrate.UpgradeJavaVersion:
+      version: 17
 ---
 type: specs.openrewrite.org/v1beta/recipe
 name: org.openrewrite.java.migrate.jakarta.UpdateRestLet2_6